4/26

RMS/src/main/java/cn/cslg/report/entity/ImportTask.java

@@ -19,7 +19,6 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = "IMPORT_TASK")
 public class ImportTask extends BaseEntity<ImportTask> {
-
     /**
      * 文件名
      */
@@ -60,7 +59,6 @@ public class ImportTask extends BaseEntity<ImportTask> {
      */
     @TableField(value = "CREATE_USER_NAME")
     private String createUserName;
-
     /**
      * 文件路径
      */

RMS/src/main/java/cn/cslg/report/service/business/ImportTaskService.java

@@ -40,6 +40,7 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
      */
     private final ImportTaskMapper mapper;
     private final OutInterfaceService outInterfaceService;
+
     public String reImportTask(ImportTask importTask) throws IOException {
         LambdaQueryWrapper<ImportTask> queryWrapper = new LambdaQueryWrapper<>();
         if (importTask.getReportId() != null) {
@@ -50,9 +51,13 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
             List<Integer> createIds = JSONArray.parseArray(res, Integer.class);
             //当未查询到时直接返回空页
             if (createIds == null || createIds.size() == 0) {
-                createIds=new ArrayList<>(Arrays.asList(-1));
+                createIds = new ArrayList<>(Arrays.asList(-1));
             }
-            queryWrapper.in(ImportTask::getCreateUserId,createIds);
+            queryWrapper.in(ImportTask::getCreateUserId, createIds);
+        }
+        //根据状态查询报告
+        if(importTask.getState()!=null){
+            queryWrapper.eq(ImportTask::getState,importTask.getState());
         }
         queryWrapper.orderByDesc(ImportTask::getCreateDate);
         if (importTask.getCurrent() != null && importTask.getSize() != null) {