2/8

.idea/workspace.xml

@@ -5,33 +5,34 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e7cd156b-23fc-410f-9ecc-be34a2e87174" name="Default Changelist" comment="12chenyi">
+      <change afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/config/WebMvcConfig.java" afterDir="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/TaskVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/vo/TaskVO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/AssoTaskPersonelService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/AssoTaskPersonelService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/config/WebSocketConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/config/WebSocketConfig.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/vo/PatentVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/vo/PatentVO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/CompareController.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/CompareController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/OutInterfaceService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/OutInterfaceService.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/CompareScenariosService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/CompareScenariosService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/FeatureService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/FeatureService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ImportTaskService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ImportTaskService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ReportDocumentService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ReportDocumentService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ReportReferencesService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ReportReferencesService.java" 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/src/main/java/cn/cslg/report/service/business/asso/SyneryCCService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/asso/SyneryCCService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/asso/SyneryCodeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/asso/SyneryCodeService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/TaskVO$personPatents.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/TaskVO$personPatents.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/TaskVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/TaskVO.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/OutInterfaceService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/OutInterfaceService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/resources/mapper/AssoTaskPersonelMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/resources/mapper/AssoTaskPersonelMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/config/WebSocketConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/config/WebSocketConfig.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PatentVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PatentVO.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/AvoidDesignDirectionController.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/AvoidDesignDirectionController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/CompareMessageMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/CompareMessageMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/IAvoidDesignDirectionService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/IAvoidDesignDirectionService.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/FeatureService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/FeatureService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ImportTaskService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ImportTaskService.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportDocumentService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportDocumentService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportReferencesService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportReferencesService.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/mapper/TaskMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/mapper/TaskMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/rms/rms-debug.2022-12-14.0.log" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/rms/rms-debug.2022-12-15.0.log" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/rms/rms-debug.2022-12-16.0.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/impl/AvoidDesignDirectionServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/impl/AvoidDesignDirectionServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/mapper/AssoTaskPersonelMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/mapper/AssoTaskPersonelMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/mapper/CompareMessageMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/mapper/CompareMessageMapper.xml" 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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -41,8 +42,8 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="Class" />
         <option value="Interface" />
+        <option value="Class" />
       </list>
     </option>
   </component>
@@ -54,13 +55,33 @@
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="GitSEFilterConfiguration">
+    <file-type-list>
+      <filtered-out-file-type name="LOCAL_BRANCH" />
+      <filtered-out-file-type name="REMOTE_BRANCH" />
+      <filtered-out-file-type name="TAG" />
+      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
+    </file-type-list>
+  </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/AssoTaskPersonelService.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/resources/application.yml" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/BaseController.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/config/InnerInterceptor/LizzMybatisIntercepts.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ReportService.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/utils/auth/TreeUtils.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/BaseService.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/vo/PersonnelVO.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/resources/application-dev.yml" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/OutInterfaceService.java" root0="FORCE_HIGHLIGHTING" />
+  </component>
   <component name="ProjectId" id="2JADGkpubIwxnMp31DlLxSpGoB3" />
   <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="1" id="Add" />
+    <ConfirmationsSetting value="2" id="Remove" />
   </component>
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showExcludedFiles" value="false" />
     <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
@@ -94,11 +115,23 @@
       <recent name="E:\IDEAProject\RMS_Backend\RMS\src\main\resources\mapper" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="cn.cslg.report.common.model.dto" />
       <recent name="cn.cslg.report.pojo.vo" />
       <recent name="cn.cslg.report.common.config" />
     </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" />
@@ -124,6 +157,9 @@
       <workItem from="1673400625616" duration="625000" />
       <workItem from="1673486700261" duration="13352000" />
       <workItem from="1673573452163" duration="5664000" />
+      <workItem from="1675647264099" duration="26450000" />
+      <workItem from="1675732443639" duration="22610000" />
+      <workItem from="1675819315507" duration="11585000" />
     </task>
     <task id="LOCAL-00001" summary="12.20 陈宇">
       <created>1671533439152</created>
@@ -195,7 +231,21 @@
       <option name="project" value="LOCAL" />
       <updated>1673573541746</updated>
     </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary=" 2/6 lrj">
+      <created>1675667280728</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1675667280728</updated>
+    </task>
+    <task id="LOCAL-00012" summary="2/6 lrj">
+      <created>1675672469033</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1675672469033</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -217,6 +267,24 @@
     <MESSAGE value="12.20 陈宇" />
     <MESSAGE value="12.20 chenyi" />
     <MESSAGE value="12chenyi" />
-    <option name="LAST_COMMIT_MESSAGE" value="12chenyi" />
+    <MESSAGE value=" 2/6 lrj" />
+    <MESSAGE value="2/6 lrj" />
+    <option name="LAST_COMMIT_MESSAGE" value="2/6 lrj" />
+  </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/TaskService.java</url>
+          <line>788</line>
+          <option name="timeStamp" value="20" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+    <pin-to-top-manager>
+      <pinned-members>
+        <PinnedItemInfo parentTag="cn.cslg.report.common.model.vo.SplitVO" memberName="ReportId" />
+      </pinned-members>
+    </pin-to-top-manager>
   </component>
 </project>

RMS/src/main/java/cn/cslg/report/common/config/WebMvcConfig.java

@@ -0,0 +1,18 @@
+package cn.cslg.report.common.config;
+
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+    public class WebMvcConfig  implements WebMvcConfigurer {
+        @Override
+        public void addResourceHandlers(ResourceHandlerRegistry registry) {
+            // /images/**是静态映射， file:/root/images/是文件在服务器的路径
+            registry.addResourceHandler("/file/**")
+                    .addResourceLocations("file:D:/RMS/RMS/target/file/");
+        }
+    }
+
+

RMS/src/main/java/cn/cslg/report/common/config/WebSocketConfig.java

@@ -1,11 +1,12 @@
 package cn.cslg.report.common.config;
 
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 @Configuration
 public class WebSocketConfig {
-    //@Bean
+    @Bean
     public ServerEndpointExporter serverEndpointExporter() {
         return new ServerEndpointExporter();
     }

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

@@ -84,6 +84,9 @@ public class PatentVO extends BaseVO {
     @Schema(description = "标题")
     private String patentName;
 
+    private String orderType;
+
+    private String orderItem;
     @Data
     public  static class taskSource{
         private  List<Integer> taskIds;

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

@@ -72,5 +72,4 @@ public class CompareController {
     public String reTaskStateCount(Integer reportId) throws ParseException, IOException {
         return Response.success(compareFilesService.reTaskStateCount(reportId));
     }
-
 }

RMS/src/main/java/cn/cslg/report/service/OutInterfaceService.java

@@ -361,6 +361,8 @@ public class OutInterfaceService {
         map.put("numberUpc",patentVO.getNumberUpc());
         map.put("startNumber", patentVO.getStartNumber());
         map.put("endNumber", patentVO.getEndNumber());
+        map.put("orderType",patentVO.getOrderType());
+        map.put("orderItem",patentVO.getOrderItem());
         JSONObject json = new JSONObject(map);
         RequestBody requestBody = RequestBody.create(JSON, String.valueOf(json));
         OkHttpClient okHttpClient = new OkHttpClient();

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

@@ -210,41 +210,75 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
         List<String> patentNos = new ArrayList<>();
         LambdaQueryWrapper<CompareFiles> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(CompareFiles::getReportId, patentVO.getReportId());
+
+if(patentVO.getOrderItem()!=null&&patentVO.getOrderType()!=null&&patentVO.getOrderItem().equals("SysOrder")&&patentVO.getOrderType().equals("desc"))
+{
+    queryWrapper .last("ORDER BY IF(isnull(SYS_ORDER),0,1), SYS_ORDER DESC");
+}
+else if(patentVO.getOrderItem()!=null&&patentVO.getOrderItem().equals("SysOrder")){
+    queryWrapper .last("ORDER BY IF(isnull(SYS_ORDER),1,0), SYS_ORDER ASC");
+}
         List<CompareFiles> compareFiles = this.list(queryWrapper);
         List<String> AllpatentNos = compareFiles.stream().map(CompareFiles::getPatentNo).collect(Collectors.toList());
         //无查询条件
         if (patentVO.getFiledOptions() == null || patentVO.getFiledOptions().size() == 0) {
-            patentNos = AllpatentNos;
+            patentNos = new ArrayList<>(AllpatentNos);
         }
         //有查询条件时，自定义字段的专利号和任务的专利号取交集
         else {
             patentNos = reportFieldService.getPatentNo1(patentVO.getFiledOptions(), patentVO.getReportId(), patentVO.getTaskId(), patentVO.getTaskStatus());
         }
         //如果有任务过滤条件
-        List<String> patentNosTask =new ArrayList<>();
-         if(patentVO.getTaskSources()!=null&&patentVO.getTaskSources().size()!=0)
-         { patentNosTask =assoTaskPersonelService.getBaseMapper().getPatents(patentVO.getTaskSources());
+        List<String> patentNosTask = new ArrayList<>();
+        if (patentVO.getTaskSources() != null && patentVO.getTaskSources().size() != 0) {
+            patentNosTask = assoTaskPersonelService.getBaseMapper().getPatents(patentVO.getTaskSources());
+        }
+        List<String> allPatentsCopy = new ArrayList<>();
+        if (patentVO.getNotAssignTypes() != null && patentVO.getNotAssignTypes().size() != 0) {
+            for(Integer types :patentVO.getNotAssignTypes())
+            {
+           List<String>  PatentsCopy = new ArrayList<>(AllpatentNos);
+                LambdaQueryWrapper<AssoTaskPersonel> assoWrapper = new LambdaQueryWrapper<>();
+                assoWrapper.eq(AssoTaskPersonel::getReportId, patentVO.getReportId())
+                        .eq(AssoTaskPersonel::getTaskType, types);
+                List<AssoTaskPersonel> assoTaskPersonels = assoTaskPersonelService.list(assoWrapper);
+                List<String> tem = assoTaskPersonels.stream().map(AssoTaskPersonel::getPatentNo).collect(Collectors.toList());
+                PatentsCopy.removeAll(tem);
+                allPatentsCopy.addAll(PatentsCopy);
+            }
 
-         }
-         List<String> allPatentsCopy =new ArrayList<>();
-         if (patentVO.getNotAssignTypes()!=null&&patentVO.getNotAssignTypes().size()!=0)
-         {
-             allPatentsCopy =new ArrayList<>(AllpatentNos);
-             LambdaQueryWrapper<AssoTaskPersonel> assoWrapper = new LambdaQueryWrapper<>();
-             assoWrapper.eq(AssoTaskPersonel::getReportId,patentVO.getReportId() )
-                     .in(AssoTaskPersonel::getTaskType,patentVO.getNotAssignTypes()) ;
-             List<AssoTaskPersonel> assoTaskPersonels = assoTaskPersonelService.list(assoWrapper);
-             allPatentsCopy.removeAll(assoTaskPersonels);
-         }
-         if((patentVO.getTaskSources()!=null&&patentVO.getTaskSources().size()!=0)||(patentVO.getNotAssignTypes()!=null&&patentVO.getNotAssignTypes().size()!=0))
-         {
-             patentNosTask.addAll(allPatentsCopy);
-             patentNos =  new ArrayList<>(CollectionUtils.intersection(patentNosTask,patentNos));
-         }
+        }
+        if ((patentVO.getTaskSources() != null && patentVO.getTaskSources().size() != 0) || (patentVO.getNotAssignTypes() != null && patentVO.getNotAssignTypes().size() != 0)) {
+            patentNosTask.addAll(allPatentsCopy);
+            patentNos = new ArrayList<>(CollectionUtils.intersection(patentNosTask, patentNos));
+        }
+        if (patentVO.getOrderItem()!=null&&patentVO.getOrderItem().equals("SysOrder")) {
+            List<String> noCopy = new ArrayList<>();
+            for (CompareFiles item : compareFiles) {
+                if (patentNos.contains(item.getPatentNo()))
+                {  noCopy.add(item.getPatentNo());}
+            }
+            patentNos = noCopy;
+        }
         patentVO.setPatentNos(patentNos);
         //详情见outInterfaceService.getPatentFromPAS 接口
         String res = outInterfaceService.getPatentFromPAS(patentVO, 1);
-        return res;
+        JSONObject jsonObject = JSONObject.parseObject(res);
+        JSONObject jsonObject1 = JSONObject.parseObject(jsonObject.get("data").toString());
+        List<JSONObject> jsonObjects = JSONArray.parseArray(jsonObject1.get("records").toString(), JSONObject.class);
+        List<JSONObject> jsonObjects2 = new ArrayList<>();
+        for (JSONObject jsonObject2 : jsonObjects) {
+            for(CompareFiles com:compareFiles){
+                if(jsonObject2.get("publicNo").toString().equals(com.getPatentNo()))
+                {
+                    jsonObject2.put("SysOrder",com.getSysOrder());
+                }
+            }
+            jsonObjects2.add(jsonObject2);
+        }
+        jsonObject1.put("records", jsonObjects2);
+        jsonObject.put("data", jsonObject1);
+        return jsonObject.toString();
     }
 
     public String getCompareNos(Integer reportId) throws IOException {
@@ -284,13 +318,11 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
         //根据专利号删除
         if (patentNos.size() != 0) {
             LambdaQueryWrapper<CompareFiles> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-
             lambdaQueryWrapper.in(CompareFiles::getPatentNo, patentNos);
             this.remove(lambdaQueryWrapper);
         }
         return Response.success();
     }
-
     /**
      * @param id
      * @return
@@ -399,7 +431,7 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
         return Response.success();
     }
 
-    public Integer addOrder( CompareOrderDTO compareOrderDTO) {
+    public Integer addOrder(CompareOrderDTO compareOrderDTO) {
         //根据报告ID 和专利号 查询对比文件
         LambdaQueryWrapper<CompareFiles> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CompareFiles::getReportId, compareOrderDTO.getReport());
@@ -409,19 +441,19 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
             return -1;
         }
         // 判断该顺序是否被使用过
-      compareFiles.forEach(item->{
-          compareOrderDTO.getOrders().forEach(
-                  item2->{
-                    if(item2.getPatentNO().equals(item.getPatentNo()))
-                    {
-                        item.setSysOrder(item2.getOrder());
+        compareFiles.forEach(item -> {
+            compareOrderDTO.getOrders().forEach(
+                    item2 -> {
+                        if (item2.getPatentNO().equals(item.getPatentNo())) {
+                            item.setSysOrder(item2.getOrder());
+                        }
                     }
-                  }
-          );
-      });
+            );
+        });
         this.saveOrUpdateBatch(compareFiles);
         return 1;
     }
+
     public List<Integer> getOrder(Integer reportId) {
         List<Integer> orders = new ArrayList<>();
         int i = 1;

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

@@ -363,9 +363,13 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
                 List<String> attrs = Arrays.asList(sectences.get(t).split(flags.get(i)));
                 for (int v = 0; v < attrs.size(); v++) {
                     if (v < attrs.size() - 1) {
-                        attrs.set(v,attrs.get(v)+flags.get(i));
+                        attrs.set(v, attrs.get(v) + flags.get(i));
+                    }
+                    if (attrs.get(v).equals("其特征在于" + flags.get(i))) {
+                        tem.set(tem.size() - 1,tem.get(tem.size() - 1)+attrs.get(v));
+                    } else {
+                        tem.add(attrs.get(v));
                     }
-                    tem.add(attrs.get(v));
                 }
             }
             sectences = tem;

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

@@ -315,9 +315,7 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
                    Map<String, Object> map = new LinkedHashMap<>();
                    map.put("featureContent", tem.getContent());
                    List<Map<String,Object>>  temMap1=new ArrayList<>();
-                   for (AssoRecordsFeature assoRecordsFeature : assoRecordsFeatures2) {
-                       Map<String,Object> map1 =new LinkedHashMap<>();
-                       map.put("compareResult", assoRecordsFeature.getComResult() != null ? assoRecordsFeature.getComResult() : "不公开");
+                   AssoRecordsFeature assoRecordsFeature =assoRecordsFeatures2.get(0);
                        CompareRecords record = records.stream().filter(item -> item.getId().equals(assoRecordsFeature.getRecordsId())).findFirst().orElse(new CompareRecords());
                        String compareContent = "";
                        //获取对比内容
@@ -333,6 +331,25 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
                        String paresingProcess = record.getParesingProcess() != null ? "(" + record.getParesingProcess() + ")" : "";
                        compareContent = patentNo + content + paresingProcess;
                        //获取对比专利号
+                   if(maps.size()>0) {
+                       Map<String, Object> lastMap = maps.get(maps.size() - 1);
+                       if (lastMap.get("compareContent").toString().equals(compareContent)) {
+                           lastMap.put("featureContent", lastMap.get("featureContent") + tem.getContent());
+                       }
+                       else{
+                           map.put("compareResult", assoRecordsFeature.getComResult() != null ? assoRecordsFeature.getComResult() : "不公开");
+                           map.put("compareContent", compareContent);
+                           map.put("figure", fileUtils.getSystemPath() + record.getFilePath());
+                           if (record.getFields() == null && record.getPosition() == null) {
+                               map.put("position", "");
+                           } else {
+                               map.put("position", "\r" + "(" + record.getFields() + "[" + record.getPosition() + "]" + ")");
+                           }
+                           maps.add(map);
+                       }
+                   }
+                   else{
+                       map.put("compareResult", assoRecordsFeature.getComResult() != null ? assoRecordsFeature.getComResult() : "不公开");
                        map.put("compareContent", compareContent);
                        map.put("figure", fileUtils.getSystemPath() + record.getFilePath());
                        if (record.getFields() == null && record.getPosition() == null) {
@@ -340,10 +357,9 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
                        } else {
                            map.put("position", "\r" + "(" + record.getFields() + "[" + record.getPosition() + "]" + ")");
                        }
-                       temMap1.add(map);
+                       maps.add(map);
                    }
-                   map.put("crs",temMap1);
-                   maps.add(map);
+
                }
                else{
                    Map<String, Object> map = new LinkedHashMap<>();

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

@@ -631,14 +631,25 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(Task::getReportId, taskVO.getReportId());
         if(taskVO.getTaskName()!=null){
-            lambdaQueryWrapper.eq(Task::getTaskName,taskVO.getTaskName());
+            lambdaQueryWrapper.like(Task::getTaskName,taskVO.getTaskName());
         }
-        if(taskVO.getTaskStatus()!=null){
-            lambdaQueryWrapper.eq(Task::getTaskStatus,taskVO.getTaskStatus());
-        }
-        if(taskVO.getTaskStatus()!=null){
-            lambdaQueryWrapper.eq(Task::getTaskStatus,taskVO.getTaskStatus());
+        if(taskVO.getType()!=null){
+            lambdaQueryWrapper.eq(Task::getType,taskVO.getType());
+        }//当查询使用处理人名称时
+        if (taskVO.getHandlePersonName() != null && taskVO.getHandlePersonName() != "") {
+            String res = outInterfaceService.getPersonIdByNamePCS(taskVO.getHandlePersonName());
+            List<Integer> handleIds = JSONArray.parseArray(res, Integer.class);
+            //当未查询到时直接返回空页
+            if (handleIds != null && handleIds.size() != 0) {
+                lambdaQueryWrapper.in(Task::getHandlePersonId,handleIds);
+            }
+            else{
+                lambdaQueryWrapper.in(Task::getHandlePersonId,Arrays.asList(-1));
+            }
+
         }
+
+
         List<Task> records = this.page(new Page<>(taskVO.getCurrent(), taskVO.getSize()), lambdaQueryWrapper).getRecords();
         for (Task task : records) {
             Integer createID = task.getCreateID();
@@ -646,10 +657,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
             PersonnelVO loginUser = cacheUtils.getLoginUser(createID);
             task.setCreateName(loginUser.getName());
             PersonnelVO loginUser1 = cacheUtils.getLoginUser(handlePersonId);
-
             task.setHandlePersonName(loginUser1.getName());
-
-
         }
         Long count = this.count(lambdaQueryWrapper);
         return Response.success(records, DataUtils.setPageColumn(taskVO.getSize(), taskVO.getCurrent(), Math.toIntExact(count)));
@@ -764,7 +772,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         queryCMVO.setCompareResult(syneryVO.getCompareResult());
         List<String> patentNos = new ArrayList<>();
         //无查询条件,单个专利
-        if (syneryVO.getPatentNos() != null) {
+        if (syneryVO.getPatentNos() != null&&syneryVO.getPatentNos().size()!=0) {
             patentNos =syneryVO.getPatentNos();
         }
         //无查询条件并且是对比过的专利
@@ -878,7 +886,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         List<Integer> typeFlag = new ArrayList<>();
         //根据报告id获得所有对比文件
         LambdaQueryWrapper<CompareFiles> comWrapper = new LambdaQueryWrapper<>();
-        comWrapper.select()
+        comWrapper.select(CompareFiles::getPatentNo)
                 .eq(CompareFiles::getReportId, reportId);
         Function<Object, String> f = (o -> o.toString());
         List<String> comPatentNos = compareFilesService.listObjs(comWrapper, f);
@@ -898,7 +906,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
             List<String> comPatentNosCopy = new ArrayList<>(comPatentNos);
             TaskSourceVO vo = new TaskSourceVO();
             if (type.equals(2)) {
-                vo.setTaskType("分配任务");
+                vo.setTaskType("对比任务");
             } else if (type.equals(3)) {
                 vo.setTaskType("初筛任务");
             }

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

@@ -5,13 +5,12 @@
         select PATENT_NO  from ASSO_TASK_PERSONEL
        where PERSON_ID=#{personelId} and STATE=#{state} and TASK_ID=#{taskId}
     </select>
-
     <select id="getSplitMessage" resultType="cn.cslg.report.entity.asso.AssoTaskPatentSplit">
         select b.* from ASSO_TASK_PATENT a left join ASSO_TASK_PATENT_SPLIT as b on a.id=b.TASK_PATENT_ID
         where a.PATENT_NO=#{patentNo} and a.TASK_ID=#{taskId} limit 1;
     </select>
     <select id="getPatents" resultType="java.lang.String">
-        select distinct  PATENT_NO  from ASSO_TASK_PERSONEL
+        select distinct  PATENT_NO  from ASSO_TASK_PATENT
       <where>
             <foreach collection="params" index="index" item="item" open="(" separator=" or " close=")">
           PERSON_ID=#{item.personId} and STATE=#{item.state} and TASK_ID in
@@ -20,8 +19,5 @@
                 </foreach>
             </foreach>
       </where>
-
     </select>
-
-
 </mapper>

RMS/target/classes/mapper/AssoTaskPersonelMapper.xml

@@ -5,10 +5,19 @@
         select PATENT_NO  from ASSO_TASK_PERSONEL
        where PERSON_ID=#{personelId} and STATE=#{state} and TASK_ID=#{taskId}
     </select>
-
     <select id="getSplitMessage" resultType="cn.cslg.report.entity.asso.AssoTaskPatentSplit">
         select b.* from ASSO_TASK_PATENT a left join ASSO_TASK_PATENT_SPLIT as b on a.id=b.TASK_PATENT_ID
         where a.PATENT_NO=#{patentNo} and a.TASK_ID=#{taskId} limit 1;
     </select>
-
+    <select id="getPatents" resultType="java.lang.String">
+        select distinct  PATENT_NO  from ASSO_TASK_PATENT
+      <where>
+            <foreach collection="params" index="index" item="item" open="(" separator=" or " close=")">
+          PERSON_ID=#{item.personId} and STATE=#{item.state} and TASK_ID in
+                <foreach collection="item.taskIds" index="index" item="item1" open="(" separator="," close=")">
+                    #{item1}
+                </foreach>
+            </foreach>
+      </where>
+    </select>
 </mapper>

RMS/target/classes/mapper/CompareMessageMapper.xml

@@ -7,13 +7,15 @@
     </select>
 
     <select id="getComparedMessage" resultType="java.lang.String">
-        select DISTINCT f.SIGN_PATENT_NO from RMS_TEST.FEATURES f left join RMS_TEST.COMPARE_MESSAGE cm on f.ID =cm.FEATURE_ID
+        select DISTINCT f.SIGN_PATENT_NO from FEATURES f left join COMPARE_MESSAGE cm on f.ID =cm.FEATURE_ID
         <where>
             and f.REPORT_ID=#{params.reportId}
             and cm.ID is not null
             <if test="params.compareResult !=null">
              and   cm.COMPARE_RESULT=#{params.compareResult}
-
+            </if>
+            <if test="params.compareResult !=null">
+                and   cm.COMPARE_RESULT=#{params.compareResult}
             </if>
         </where>
 
@@ -31,7 +33,5 @@
                 and   cm.COMPARE_RESULT=#{params.compareResult}
             </if>
         </where>
-
-
     </select>
 </mapper>