1.3 陈宇

RMS/src/main/java/cn/cslg/report/common/model/vo/CompareMessageVO.java

@@ -76,5 +76,7 @@ public class CompareMessageVO {
     private Integer taskId;
     @Schema(description = "权要ID")
     private Integer rightId;
+    @Schema(description = "对比记录Id")
+    private Integer CMid;
 
 }

RMS/src/main/java/cn/cslg/report/controller/CompareMessageController.java

@@ -34,7 +34,7 @@ public class CompareMessageController {
 
     @PostMapping("updateCompareMessage")
     @Operation(summary = "更新FTO对比记录")
-    public String updateCompareMessage(List<CompareMessage> compareMessages) throws IOException {
+    public String updateCompareMessage(@RequestBody List<CompareMessage> compareMessages) throws IOException {
         if(compareMessageService.updateCompareMessage(compareMessages))
         {
             return Response.success("更新成功");
@@ -76,5 +76,9 @@ public class CompareMessageController {
     public String queryComparedMessage(@RequestBody QueryCMVO queryCMVO) throws IOException {
         return Response.success(compareMessageService.queryComparedMessage(queryCMVO));
     }
-
+    @GetMapping("queryAllCompareMessage")
+    @Operation(summary = "查找对比结果（带协同结果）")
+    public String queryAllCompareMessage(Integer reportId,String patentNo) throws IOException {
+        return Response.success(compareMessageService.queryAllCompareMessage(patentNo,reportId));
+    }
 }

RMS/src/main/java/cn/cslg/report/controller/TaskController.java

@@ -122,6 +122,7 @@ public class TaskController {
     private String ReviewTheTasks(@RequestBody TaskTDO taskVO){
         return taskService.ReviewTheTasks(taskVO) ;
     }
+
     @RequestMapping(value = "/progress", method = RequestMethod.GET)
     @Operation(summary = "任务进度")
     private String progress(int id){

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

@@ -97,7 +97,24 @@ public class CompareMessageService extends ServiceImpl<CompareMessageMapper, Com
     }
 
     public Boolean updateCompareMessage(List<CompareMessage> compareMessageList) {
-        return this.saveOrUpdateBatch(compareMessageList);
+        List<Integer> ids =compareMessageList.stream().map(CompareMessage::getId).collect(Collectors.toList());
+        if(ids.size()!=0){
+            LambdaQueryWrapper<CompareMessage> queryWrapper =new LambdaQueryWrapper<CompareMessage>();
+            queryWrapper.in(CompareMessage::getId,ids);
+            List<CompareMessage> compareMessages =this.list(queryWrapper);
+            compareMessages.forEach(item->{
+                compareMessageList.forEach(tem->{
+                    if(item.getId().equals(tem.getId())){
+                        item.setCompareResult(tem.getCompareResult());
+                        item.setCompareDescription(tem.getCompareDescription());
+                        item.setTargetDescription(tem.getTargetDescription());
+                    }
+                });
+            });
+
+           return this.saveOrUpdateBatch(compareMessages);
+        }
+        return true;
     }
 
     public Boolean removeCompareMessage(List<Integer> ids) {
@@ -105,6 +122,10 @@ public class CompareMessageService extends ServiceImpl<CompareMessageMapper, Com
     }
 
     public Map<String, Object> queryCompareMessage(Integer taskId, String patentNo, Integer reportId) throws IOException {
+        if(taskId!=null){
+            Task task =taskService.getById(taskId);
+            reportId =task.getReportId();
+        }
         List<PatentRightVo> patentRightVos = new ArrayList<>();
         String resBody = outInterfaceService.getPatentRightFromPAS(patentNo);
         JSONObject jsonObject = JSONObject.parseObject(resBody);
@@ -117,9 +138,6 @@ public class CompareMessageService extends ServiceImpl<CompareMessageMapper, Com
         if (reportId != null && reportId != 0) {
             queryWrapper.eq(Features::getReportId, reportId);
         }
-        if (taskId != null) {
-            queryWrapper.eq(Features::getTaskId, taskId);
-        }
         queryWrapper.eq(Features::getSignPatentNo, patentNo);
         List<Features> features = featureService.list(queryWrapper);
         List<Integer> featureIds = features.stream().map(Features::getId).collect(Collectors.toList());
@@ -220,8 +238,15 @@ public class CompareMessageService extends ServiceImpl<CompareMessageMapper, Com
      */
     public Map<String, Object> querySynery(Integer taskId, String patentNo) throws IOException {
         Task task =taskService.getById(taskId);
+        //根据 reportId 和 专利号查询特征Id
+        LambdaQueryWrapper<Features>  wrapper =new LambdaQueryWrapper<>();
+        wrapper.eq(Features::getReportId,task.getReportId())
+                .eq(Features::getSignPatentNo,patentNo);
+        List<Features> features =featureService.list(wrapper);
+        List<Integer> featureIds =features.stream().map(Features::getId).collect(Collectors.toList());
         LambdaQueryWrapper<CompareMessage> queryWrapper =new LambdaQueryWrapper<>();
-        queryWrapper.eq(CompareMessage::getTaskId,taskId);
+        queryWrapper.eq(CompareMessage::getTaskId,taskId)
+        .in(CompareMessage::getFeatureId,featureIds);
         List<CompareMessage> compareMessages =this.list(queryWrapper);
         if(compareMessages.size()==0){
             Map<String, Object> map = this.queryCompareMessage(null, patentNo, task.getReportId());
@@ -259,10 +284,11 @@ public class CompareMessageService extends ServiceImpl<CompareMessageMapper, Com
                 List<CompareMessage> compareMessageList = compareMessages.stream().filter(tem -> tem.getFeatureId().equals(item.getId())).collect(Collectors.toList());
                 compareMessageList.forEach(
                         tem->{
-                            if(tem.getTaskType().equals(null)){
+                            if(tem.getTaskType()==null){
                                 compareMessageVO.setCompareResult(tem.getCompareResult());
                                 compareMessageVO.setCompareDescription(tem.getCompareDescription());
                                 compareMessageVO.setTargetDescription(tem.getTargetDescription());
+                                compareMessageVO.setCMid(tem.getId());
                             }
                             else  if(tem.getTaskType().equals(1)){
                                 compareMessageVO.setCompareResult2(tem.getCompareResult());

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

@@ -66,7 +66,8 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
             } else {
                 if (retList.size() != 0) {
                     retList.get(retList.size() - 1).setContent(retList.get(retList.size() - 1).getContent() + patentRights.get(i).getContent());
-                    retList.get(retList.size() - 1).setContentOut(retList.get(retList.size() - 1).getContentOut() + patentRights.get(i).getContentOut());
+                    if(patentRights.get(i).getContentOut()!=null){
+                    retList.get(retList.size() - 1).setContentOut(retList.get(retList.size() - 1).getContentOut() + patentRights.get(i).getContentOut());}
                 }
 
             }

RMS/src/main/resources/mapper/TaskMapper.xml

@@ -11,11 +11,11 @@
 and a.TASK_STATUS=#{param.taskStatus}
 
         </if>
-        <if test="param.createName !=null">
+        <if test="param.createName !=null and param.createName !='' ">
 and a.CREATE_NAME like concat('%', #{param.createName}, '%')
 
         </if>
-        <if test="param.taskName !=null">
+        <if test="param.taskName !=null and param.taskName !=''">
 and a.TASK_NAME  like concat('%', #{param.taskName}, '%')
 
         </if>

RMS/target/classes/mapper/TaskMapper.xml

@@ -11,11 +11,11 @@
 and a.TASK_STATUS=#{param.taskStatus}
 
         </if>
-        <if test="param.createName !=null">
+        <if test="param.createName !=null and param.createName !='' ">
 and a.CREATE_NAME like concat('%', #{param.createName}, '%')
 
         </if>
-        <if test="param.taskName !=null">
+        <if test="param.taskName !=null and param.taskName !=''">
 and a.TASK_NAME  like concat('%', #{param.taskName}, '%')
 
         </if>