422 保存无效证据

src/main/java/cn/cslg/pas/common/vo/business/ImportTaskVO.java

@@ -72,6 +72,8 @@ public class ImportTaskVO {
     private String name;
 
     private Integer projectId;
-    private Integer projectType;
     private Integer productId;
+    private Integer importToType;
+    private String importToName;
+    private Integer importToId;
 }

src/main/java/cn/cslg/pas/service/business/AvoidDesignService.java

@@ -84,6 +84,10 @@ public class AvoidDesignService extends ServiceImpl<AvoidDesignMapper, AvoidDesi
                 .eq(PatentSplitMessage::getProjectId, projectId);
         PatentSplitMessage patentSplitMessage = patentSplitMessageService.getOne(splitWrapper, false);
 
+        LambdaQueryWrapper<Feature> queryWrapper1 =new LambdaQueryWrapper<>();
+        queryWrapper1.eq(Feature::getSplitMessageId,patentSplitMessage.getId());
+        List<Feature> features =featureService.list(queryWrapper1);
+        List<Integer> featureIds =features.stream().map(Feature::getId).collect(Collectors.toList());
         //根据projectId删除回避设计方向数据
         LambdaQueryWrapper<AvoidDesign> deleteWrapper2 = new LambdaQueryWrapper<>();
         deleteWrapper2.eq(AvoidDesign::getProjectId, projectId);
@@ -119,9 +123,10 @@ public class AvoidDesignService extends ServiceImpl<AvoidDesignMapper, AvoidDesi
             feature.setSplitMessageId(patentSplitMessage.getId());
             feature.setId(avoidDesignDTO.getFeatureId());
             feature.setSysOrder(order);
-            if (avoidDesignDTO.getFeatureId() == null) {
+            if (avoidDesignDTO.getFeatureId() == null||!featureIds.contains(avoidDesignDTO.getFeatureId())) {
                 feature.insert();
             } else {
+                featureIds.remove(avoidDesignDTO.getFeatureId());
                 feature.updateById();
             }
 
@@ -138,6 +143,10 @@ public class AvoidDesignService extends ServiceImpl<AvoidDesignMapper, AvoidDesi
             }
             order++;
         }
+        if(featureIds!=null&&featureIds.size()>0){
+            featureService.removeBatchByIds(featureIds);
+
+        }
         List<Integer> ids = new ArrayList<>();
         if (!avoidDesignList.isEmpty()) {
             this.saveBatch(avoidDesignList);

src/main/java/cn/cslg/pas/service/business/ImportTaskService.java

@@ -82,7 +82,7 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
     @Override
     public Object queryMessage(QueryRequest queryRequest) throws Exception {
         List<String> sqls = formatQueryService.reSqls(queryRequest, "importTask");
-       this.loadSearchSql(sqls,queryRequest.getProjectId());
+        this.loadSearchSql(sqls, queryRequest.getProjectId());
         //根据sql查询事件信息
         List<ImportTaskVO> importTaskVOS = importTaskMapper.getImportTask(sqls.get(0), sqls.get(1), sqls.get(2));
         //查询总数
@@ -280,10 +280,19 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
             importTaskAMVOS = new ArrayList<>();
         }
         List<String> createIds = new ArrayList<>();
+
+        List<Integer> projectIds = new ArrayList<>();
+        List<Integer> productIds =new ArrayList<>();
         importTaskVOS.forEach(item -> {
             if (item.getCreateId() != null) {
                 createIds.add(item.getCreateId());
             }
+            if(item.getProductId()!=null){
+                productIds.add(item.getProductId());
+            }
+            if(item.getProjectId()!=null){
+                projectIds.add(item.getProjectId());
+            }
         });
         List<Personnel> personnels = new ArrayList<>();
         List<Product> products = new ArrayList<>();
@@ -295,6 +304,19 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
             personnels = JSONObject.parseArray(jsonObject.getString("data"), Personnel.class);
         }
 
+        //查询项目名称
+        if (projectIds.size() != 0) {
+            LambdaQueryWrapper<Project> queryWrapper =new LambdaQueryWrapper<>();
+            queryWrapper.in(Project::getId,projectIds);
+            projects =projectService.list(queryWrapper);
+        }
+
+        //查询产品名称
+        if (productIds.size() != 0) {
+            LambdaQueryWrapper<Product> queryWrapper =new LambdaQueryWrapper<>();
+            queryWrapper.in(Product::getId,productIds);
+            products =productService.list(queryWrapper);
+        }
 
         LambdaQueryWrapper<SystemDict> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(SystemDict::getGroupType, "IMPORT_TASK");
@@ -329,6 +351,27 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
             }
             long percentage = (long) Math.floor((importTaskVO.getDoneNum() + 0D) / importTaskVO.getAllNum() * 100D);
             importTaskVO.setPercentage(percentage);
+
+
+            //装载目标名称
+          if(projects.size()>0&&importTaskVO.getProjectId()!=null){
+          Project project =projects.stream().filter(item->item.getId().equals(importTaskVO.getProjectId())).findFirst().orElse(null);
+          if(project!=null){
+              importTaskVO.setImportToId(project.getId());
+              importTaskVO.setImportToType(project.getType()-1);
+              importTaskVO.setImportToName(project.getName());
+          }
+          }
+          else if(products.size()>0&&importTaskVO.getProductId()!=null){
+           Product product =products.stream().filter(item->item.getId().equals(importTaskVO.getProductId())).findFirst().orElse(null);
+           if(product!=null){
+               importTaskVO.setImportToId(product.getId());
+               importTaskVO.setImportToType(2);
+               importTaskVO.setImportToName(product.getName());
+           }
+
+          }
+
         }
 
     }
@@ -455,21 +498,21 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
 
 
     //装载查询语句
-    private List<String> loadSearchSql(List<String> sqls,Integer projectId) {
+    private List<String> loadSearchSql(List<String> sqls, Integer projectId) {
         PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
         String id = personnelVO.getId();
         String rootSql = "";
 
-        if (sqls.get(0) == null || projectId==null) {
+        if (sqls.get(0) == null || projectId == null) {
             rootSql = "it.create_id=" + id;
         } else {
-            Project project =projectService.getById(projectId);
-            if(project==null){
+            Project project = projectService.getById(projectId);
+            if (project == null) {
                 throw new XiaoShiException("未查询到专题库");
             }
-            String createId =project.getCreateId();
-            String headId =project.getHeadId();
-            if(createId!=id&&headId!=id){
+            String createId = project.getCreateId();
+            String headId = project.getHeadId();
+            if (createId != id && headId != id) {
                 rootSql = "it.create_id=" + id;
             }
         }