12.20 chenyi

.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18__Default_Changelist_.xml

@@ -1,79 +0,0 @@
-<changelist name="Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]" date="1671614308671" recycled="true" deleted="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/shelved.patch" />
-  <option name="DESCRIPTION" value="Uncommitted changes before Update at 2022/12/21 17:18 [Default Changelist]" />
-  <binary>
-    <option name="BEFORE_PATH" />
-    <option name="AFTER_PATH" value="RMS/target/file/20221221/7e9c8204c71f4862b0f49b6713271856.jpg" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/7e9c8204c71f4862b0f49b6713271856.jpg" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" />
-    <option name="AFTER_PATH" value="RMS/target/file/20221221/b55744b79ef14779b32b4ba7fd6ea0f7.png" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/b55744b79ef14779b32b4ba7fd6ea0f7.png" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" />
-    <option name="AFTER_PATH" value="RMS/target/file/20221221/14fed836f00f4725a1aaf61f7494c7a6.png" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/14fed836f00f4725a1aaf61f7494c7a6.png" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/service/IProductService.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/service/IProductService.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/IProductService.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/service/IAssoProductFileService.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/service/IAssoProductFileService.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/IAssoProductFileService.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" />
-    <option name="AFTER_PATH" value="RMS/target/file/20221221/244ca18d2d2f447381ed3a8235f57a84.jpg" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/244ca18d2d2f447381ed3a8235f57a84.jpg" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/controller/ProductController.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/controller/ProductController.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/ProductController.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/mapper/AssoProductFileMapper.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/mapper/AssoProductFileMapper.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/AssoProductFileMapper.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/service/impl/AssoProductFileServiceImpl.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/service/impl/AssoProductFileServiceImpl.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/AssoProductFileServiceImpl.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" />
-    <option name="AFTER_PATH" value="RMS/target/file/20221221/7738d41e149e4addab9a88b2bd6051a8.png" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/7738d41e149e4addab9a88b2bd6051a8.png" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/common/model/dto/ProductDTO.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/common/model/dto/ProductDTO.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/ProductDTO.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/service/business/ReportService.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/service/business/ReportService.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/ReportService.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/service/impl/ProductServiceImpl.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/service/impl/ProductServiceImpl.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/ProductServiceImpl.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" />
-    <option name="AFTER_PATH" value="RMS/target/file/20221221/bb7df77ef6d64e8e84e539d24adc25e1.png" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/bb7df77ef6d64e8e84e539d24adc25e1.png" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/entity/Product.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/entity/Product.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/Product.class" />
-  </binary>
-</changelist>

.idea/workspace.xml

@@ -5,18 +5,22 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e7cd156b-23fc-410f-9ecc-be34a2e87174" name="Default Changelist" comment="12.20 陈宇">
-      <change afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/vo/AddSyneryVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18__Default_Changelist_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18__Default_Changelist_.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/shelved.patch" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18__Default_Changelist_.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/vo/CompareMessageVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/vo/CompareMessageVO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/CompareMessageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/CompareMessageController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/FeatureController.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/FeatureController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/TaskController.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/TaskController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/AssoTaskPatentSplitService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/AssoTaskPatentSplitService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/CompareFilesService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/CompareFilesService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/CompareMessageService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/CompareMessageService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ReportService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ReportService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/CompareMessageVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/CompareMessageVO.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/CompareMessageController.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/CompareMessageController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/ProductController.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/ProductController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/TaskService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/TaskService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/TaskController.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/TaskController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareFilesService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareFilesService.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareMessageService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareMessageService.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/TaskService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/TaskService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/impl/AssoProductFileServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/impl/AssoProductFileServiceImpl.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/logs/rms/rms-debug.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/rms/rms-debug.log" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/logs/rms/rms-error.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/rms/rms-error.log" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/logs/rms/rms-info.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/rms/rms-info.log" afterDir="false" />
@@ -68,6 +72,7 @@
     <property name="node.js.selected.package.eslint" value="(autodetect)" />
     <property name="node.js.selected.package.tslint" value="(autodetect)" />
     <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
+    <property name="vue.rearranger.settings.migration" value="true" />
   </component>
   <component name="ReactorSettings">
     <option name="notificationShown" value="true" />
@@ -85,17 +90,6 @@
     </key>
   </component>
   <component name="RunManager">
-    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="TEST_OBJECT" value="class" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="Application" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="RMS" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="cn.cslg.report.Application" />
@@ -115,6 +109,7 @@
       <workItem from="1671511902044" duration="19866000" />
       <workItem from="1671539384819" duration="6630000" />
       <workItem from="1671585394564" duration="1889000" />
+      <workItem from="1673232805752" duration="11563000" />
     </task>
     <task id="LOCAL-00001" summary="12.20 陈宇">
       <created>1671533439152</created>
@@ -159,15 +154,4 @@
     <MESSAGE value="12.20 陈宇" />
     <option name="LAST_COMMIT_MESSAGE" value="12.20 陈宇" />
   </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/CompareMessageService.java</url>
-          <line>114</line>
-          <option name="timeStamp" value="18" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
 </project>

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

@@ -61,7 +61,7 @@ public class FeatureController {
 
     @RequestMapping(value = "/getSplitMessage", method = RequestMethod.GET)
     @Operation(summary = "根据专利号和任务Id获得拆分信息")
-    public String getSplitMessage(Integer taskId,String patentNo) throws IOException {
-        return Response.success(assoTaskPatentSplitService.getSplitMessage(taskId,patentNo));
+    public String getSplitMessage(Integer taskId,String patentNo,Integer reportId) throws IOException {
+        return Response.success(assoTaskPatentSplitService.getSplitMessage(taskId,patentNo,reportId));
     }
 }

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

@@ -130,14 +130,14 @@ public class TaskController {
 
     @RequestMapping(value = "/read", method = RequestMethod.GET)
     @Operation(summary = "未读变成已读")
-    private String read(int taskID,String patentNo ){
-        return taskService.read(taskID,patentNo);
+    private String read(Integer taskID,String patentNo,Integer reportId ){
+        return taskService.read(taskID,patentNo,reportId);
     }
 
     @RequestMapping(value = "/look", method = RequestMethod.GET)
     @Operation(summary = "查看某个专利的状态")
-    private String look(int taskID,String patentNo){
-        return taskService.look(taskID,patentNo);
+    private String look(Integer taskID,String patentNo,Integer reportId){
+        return taskService.look(taskID,patentNo,reportId);
     }
 
         @RequestMapping(value = "/addSyneryTask", method = RequestMethod.POST)

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

@@ -1,6 +1,7 @@
 package cn.cslg.report.service.business;
 
 import cn.cslg.report.entity.AssoComapareFiel;
+import cn.cslg.report.entity.Features;
 import cn.cslg.report.entity.asso.AssoTaskPatentSplit;
 import cn.cslg.report.entity.asso.AssoTaskPersonel;
 import cn.cslg.report.mapper.AssoComapareFielMapper;
@@ -24,6 +25,7 @@ import java.util.Map;
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class AssoTaskPatentSplitService extends ServiceImpl<AssoTaskPatentSplitMapper, AssoTaskPatentSplit> {
  private final AssoTaskPersonelService assoTaskPersonelService;
+ private final FeatureService featureService;
 
     /**
      *
@@ -34,18 +36,33 @@ public class AssoTaskPatentSplitService extends ServiceImpl<AssoTaskPatentSplitM
      * @description 查找任务专利的拆分详情
      */
     @Transactional(rollbackFor = Exception.class)
-    public Map<String,Object> getSplitMessage(Integer taskId, String patentNo) {
-        Map<String,Object> map =new HashMap<>();
-       AssoTaskPatentSplit assoTaskPatentSplit = assoTaskPersonelService.getBaseMapper().getSplitMessage(patentNo,taskId);
-       if(assoTaskPatentSplit!=null){
-           map.put("splitBy",assoTaskPatentSplit.getSplitBy());
-           map.put("splitType",assoTaskPatentSplit.getSplitType());
-       }
-       else {
-           map.put("splitBy",null);
-           map.put("splitType",null);
-       }
-        return map;
+    public Map<String,Object> getSplitMessage(Integer taskId, String patentNo,Integer reportId) {
+        if (taskId != null) {
+            Map<String, Object> map = new HashMap<>();
+            AssoTaskPatentSplit assoTaskPatentSplit = assoTaskPersonelService.getBaseMapper().getSplitMessage(patentNo, taskId);
+            if (assoTaskPatentSplit != null) {
+                map.put("splitBy", assoTaskPatentSplit.getSplitBy());
+                map.put("splitType", assoTaskPatentSplit.getSplitType());
+            } else {
+                map.put("splitBy", null);
+                map.put("splitType", null);
+            }
+            return map;
+        }else {
+            Map<String, Object> map = new HashMap<>();
+            LambdaQueryWrapper<Features> queryWrapper=new LambdaQueryWrapper<>();
+            queryWrapper.eq(Features::getReportId,reportId).eq(Features::getSignPatentNo,patentNo);
+            Features features = featureService.list(queryWrapper).get(0);
+            if (features != null) {
+                map.put("splitBy", features.getSplitBy());
+                map.put("splitType", features.getSplitType());
+            } else {
+                map.put("splitBy", null);
+                map.put("splitType", null);
+            }
+
+            return map;
+        }
     }
 
 }

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

@@ -319,8 +319,11 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
             params.setReportId(task.getReportId());
             reportFieldPatentLinkService.updatePatentIndexSetting(params);
             LambdaQueryWrapper<AssoTaskPersonel> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(AssoTaskPersonel::getTaskId, params.getTaskID())
+            queryWrapper
                     .eq(AssoTaskPersonel::getPatentNo, params.getPatentNo());
+            if(params.getTaskID()!=null){
+                queryWrapper.eq(AssoTaskPersonel::getTaskId,params.getTaskID());
+            }
             AssoTaskPersonel assoTaskPersonel = assoTaskPersonelService.list(queryWrapper).get(0);
             assoTaskPersonel.setState(1);
             assoTaskPersonel.updateById();
@@ -361,6 +364,9 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
         reMap.put("read", assoRead.size());
         return reMap;
     }
+    public void add(CompareFiles compareFiles){
+        compareFiles.insert();
+    }
 
 
 }

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

@@ -49,12 +49,18 @@ public class CompareMessageService extends ServiceImpl<CompareMessageMapper, Com
         // 获取登录人信息
         PersonnelVO personnelVO = cacheUtils.getLoginUser(StpUtil.getLoginIdAsInt());
         List<CompareMessage> compareMessages = new ArrayList<>();
+        Features feature=new Features();
         //根据登录人Id,报告Id,标的专利号查询特征
         LambdaQueryWrapper<Features> wrapper = new LambdaQueryWrapper<>();
         if (vos.get(0).getTaskId() != null && vos.get(0).getSignPatentNo() != null) {
             wrapper.eq(Features::getTaskId, vos.get(0).getTaskId())
                     .eq(Features::getSignPatentNo, vos.get(0).getSignPatentNo());
-            Features feature = featureService.list(wrapper).get(0);
+            feature = featureService.list(wrapper).get(0);
+        }if(vos.get(0).getReportId()!=null &&  vos.get(0).getSignPatentNo() != null ){
+            wrapper.eq(Features::getReportId, vos.get(0).getReportId())
+                    .eq(Features::getSignPatentNo, vos.get(0).getSignPatentNo());
+             feature = featureService.list(wrapper).get(0);
+        }
             //根据特征Id删除对比记录
             List<Features> features = featureService.list(wrapper);
             if (features != null && features.size() > 0) {
@@ -70,7 +76,9 @@ public class CompareMessageService extends ServiceImpl<CompareMessageMapper, Com
                 Features features1 = new Features();
                 features1.setContent(vos.get(i).getContent());
                 features1.setFeaturesOrder(order);
-                features1.setTaskId(vos.get(i).getTaskId());
+                if(vos.get(i).getTaskId()!=null) {
+                    features1.setTaskId(vos.get(i).getTaskId());
+                }
                 features1.setSplitType(feature.getSplitType());
                 features1.setSplitBy(feature.getSplitBy());
                 features1.setPartnerId(personnelVO.getId());
@@ -88,11 +96,13 @@ public class CompareMessageService extends ServiceImpl<CompareMessageMapper, Com
                 compareMessage.setTargetDescription(vos.get(i).getTargetDescription());
                 compareMessage.setCompareDescription(vos.get(i).getCompareDescription());
                 compareMessage.setReportId(feature.getReportId());
-                compareMessage.setTaskId(feature.getTaskId());
+                if(feature.getTaskId()!=null) {
+                    compareMessage.setTaskId(feature.getTaskId());
+                }
                 compareMessages.add(compareMessage);
                 order += 1;
             }
-        }
+
         return this.saveBatch(compareMessages);
     }
 
@@ -192,7 +202,7 @@ public class CompareMessageService extends ServiceImpl<CompareMessageMapper, Com
             patentRightVo.setSignPatentNo(patentNo);
             patentRightVos.add(patentRightVo);
         }
-        Map<String, Object> map1 = assoTaskPatentSplitService.getSplitMessage(taskId, patentNo);
+        Map<String, Object> map1 = assoTaskPatentSplitService.getSplitMessage(taskId, patentNo,reportId);
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("patentRightVos", patentRightVos);
         map.put("splitBy", map1.get("splitBy"));
@@ -322,7 +332,7 @@ public class CompareMessageService extends ServiceImpl<CompareMessageMapper, Com
             patentRightVo.setSignPatentNo(patentNo);
             patentRightVos.add(patentRightVo);
         }
-        Map<String, Object> map1 = assoTaskPatentSplitService.getSplitMessage(null, patentNo);
+        Map<String, Object> map1 = assoTaskPatentSplitService.getSplitMessage(null, patentNo,reportId);
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("patentRightVos", patentRightVos);
         map.put("splitBy", map1.get("splitBy"));

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

@@ -6,6 +6,7 @@ import cn.cslg.report.common.model.vo.ReportVO;
 import cn.cslg.report.common.model.vo.SystemDictVO;
 import cn.cslg.report.common.utils.*;
 import cn.cslg.report.common.utils.SecurityUtils.LoginUtils;
+import cn.cslg.report.entity.CompareFiles;
 import cn.cslg.report.entity.Personnel;
 import cn.cslg.report.entity.Report;
 
@@ -55,6 +56,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
     private final FeatureService featureService;
     private final CompareScenariosService compareScenariosService;
     private final IProductService productService;
+    private final CompareFilesService compareFilesService;
 
     /**
      * @param report 报告类
@@ -80,10 +82,16 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
                 List<Integer> fileIds = reportFileService.uploadFiles(files);
                 assoReportFileService.addAsso(report.getId(), fileIds);
 
+
+
             }
             //如果报告生成成功，给报告添加默认自定义字段
             if (addFlag) {
                 reportFieldService.addDefaultField(report.getId(), report.getType());
+                CompareFiles compareFiles = new CompareFiles();
+                compareFiles.setReportId(report.getId());
+                compareFiles.setPatentNo(report.getSignPatentNo());
+                compareFilesService.add(compareFiles);
                 return report.getId();
             } else {
                 return 0;

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

@@ -59,6 +59,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
     private final LoginUtils loginUtils;
     private final SyneryCCService syneryCCService;
 
+
     private final CompareMessageService compareMessageService;
 
     /**
@@ -681,24 +682,50 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
      * @author ：cj
      */
     @Transactional
-    public String read(int taskID, String patentNo) {
-        LambdaQueryWrapper<AssoTaskPersonel> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(AssoTaskPersonel::getTaskId, taskID).eq(AssoTaskPersonel::getPatentNo, patentNo);
-        AssoTaskPersonel assoTaskPersonel = assoTaskPersonelService.list(queryWrapper).get(0);
-        if (assoTaskPersonel.getState().equals(1)) {
-            assoTaskPersonel.setState(0);
-        } else {
-            assoTaskPersonel.setState(1);
+    public String read(Integer taskID, String patentNo,Integer reportId) {
+
+        if(taskID!=null) {
+            LambdaQueryWrapper<AssoTaskPersonel> queryWrapper = new LambdaQueryWrapper<>();
+
+            queryWrapper.eq(AssoTaskPersonel::getPatentNo, patentNo);
+            queryWrapper.eq(AssoTaskPersonel::getTaskId, taskID);
+
+            AssoTaskPersonel assoTaskPersonel = assoTaskPersonelService.list(queryWrapper).get(0);
+            if (assoTaskPersonel.getState().equals(1)) {
+                assoTaskPersonel.setState(0);
+            } else {
+                assoTaskPersonel.setState(1);
+            }
+            assoTaskPersonel.updateById();
+        }else {
+            LambdaQueryWrapper<CompareFiles> queryWrapper=new LambdaQueryWrapper<>();
+            queryWrapper.eq(CompareFiles::getReportId,reportId).eq(CompareFiles::getPatentNo,patentNo);
+            CompareFiles compareFiles = compareFilesService.list(queryWrapper).get(0);
+            compareFiles.setState(1);
+            compareFiles.updateById();
+
+
+
         }
-        assoTaskPersonel.updateById();
-        return Response.success();
+            return Response.success();
+
     }
 
-    public String look(int taskID, String patentNo) {
-        LambdaQueryWrapper<AssoTaskPersonel> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(AssoTaskPersonel::getTaskId, taskID).eq(AssoTaskPersonel::getPatentNo, patentNo);
-        AssoTaskPersonel assoTaskPersonel = assoTaskPersonelService.list(queryWrapper).get(0);
-        return Response.success(assoTaskPersonel.getState());
+    public String look( Integer taskID, String patentNo,Integer reoportId) {
+        if (taskID != null) {
+            LambdaQueryWrapper<AssoTaskPersonel> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(AssoTaskPersonel::getPatentNo, patentNo);
+            queryWrapper.eq(AssoTaskPersonel::getTaskId, taskID);
+            AssoTaskPersonel assoTaskPersonel = assoTaskPersonelService.list(queryWrapper).get(0);
+            return Response.success(assoTaskPersonel.getState());
+        }
+        else {
+            LambdaQueryWrapper<CompareFiles> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(CompareFiles::getPatentNo,patentNo).eq(CompareFiles::getReportId,reoportId);
+            List<CompareFiles> list = compareFilesService.list(queryWrapper);
+            return Response.success(list.get(0).getState());
+
+        }
     }
 
     @Transactional(rollbackFor = Exception.class)