对比文件修改

.idea/workspace.xml

@@ -6,11 +6,9 @@
   <component name="ChangeListManager">
     <list default="true" id="e7cd156b-23fc-410f-9ecc-be34a2e87174" name="Default Changelist" comment="12chenyi">
       <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/PASPatentVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/PASPatentVO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/BaseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/BaseController.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/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/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/resources/application.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/target/classes/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/application-dev.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/target/classes/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/application-prod.yml" afterDir="false" />
@@ -21,24 +19,32 @@
       <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/PASPatentVO$Sort.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/PASPatentVO$Sort.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/PASPatentVO$Tree.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/PASPatentVO$Tree.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/PASPatentVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/PASPatentVO.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/dto/ProductDTO.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/dto/ProductDTO.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/SystemMO.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/SystemMO.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/AvoidDesignRightVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/AvoidDesignRightVO.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/common/model/vo/PersonnelVO$DP.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PersonnelVO$DP.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PersonnelVO$PerRole.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PersonnelVO$PerRole.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PersonnelVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PersonnelVO.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/BaseController.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/BaseController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/CompareController.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/CompareController.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/target/classes/cn/cslg/report/entity/AssoProductFile.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/AssoProductFile.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/ReportDocumentController.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/ReportDocumentController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/Report.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/Report.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/AvoidDesignLittleDirectionMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/AvoidDesignLittleDirectionMapper.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/BaseService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/BaseService.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/CompareScenariosService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareScenariosService.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/ReportFieldPatentLinkService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportFieldPatentLinkService.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/business/TemplateService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/TemplateService.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$/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/cn/cslg/report/service/impl/ProductServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/impl/ProductServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/mapper/AvoidDesignLittleDirectionMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/mapper/AvoidDesignLittleDirectionMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/target/test-classes/cn/cslg/report/mapper/AssoAvoidDesignWholeLittleDirectionMapperTests.class" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/target/test-classes/cn/cslg/report/mapper/AvoidDesignLittleDirectionMapperTests.class" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/target/test-classes/cn/cslg/report/mapper/AvoidDesignWholeDirectionMapperTests.class" beforeDir="false" />
@@ -135,6 +141,19 @@
     </key>
   </component>
   <component name="RunManager">
+    <configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true">
+      <option name="arquillianRunConfiguration">
+        <value>
+          <option name="containerStateName" value="" />
+        </value>
+      </option>
+      <option name="TEST_OBJECT" value="CLASS" />
+      <properties />
+      <listeners />
+      <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" />
@@ -262,6 +281,16 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ID_ORDER">
+      <list>
+        <option value="Default.Root" />
+        <option value="Default.Author" />
+        <option value="Default.Date" />
+        <option value="Default.Subject" />
+      </list>
+    </option>
+  </component>
   <component name="Vcs.Log.Tabs.Properties">
     <option name="TAB_STATES">
       <map>

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

@@ -62,8 +62,8 @@ public class CompareController {
 
     @RequestMapping(value = "/deleteCompareNo", method = RequestMethod.POST)
     @Operation(summary = "删除多个对比专利")
-    public String deleteCompareNo(@RequestBody  CompareFilesVO compareFilesVO) throws IOException {
-        String res = compareFilesService.deletePatentNo(compareFilesVO);
+    public String deleteCompareNo(@RequestBody PatentVO patentVO) throws IOException {
+        String res = compareFilesService.deletePatentNo(patentVO);
         return res;
     }
 

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

@@ -428,15 +428,15 @@ public class OutInterfaceService {
   }
 
     public String getComPatentNos(PatentVO patentVO) throws IOException {
-        LambdaQueryWrapper<ImportTask> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(ImportTask::getReportId, patentVO.getReportId());
-        Map<String, Object> map = new HashMap<>();
-        Report report = reportService.getById(patentVO.getReportId());
-        map.put("projectId", report.getProjectId());
-        List<ImportTask> importTasks = importTaskService.list(queryWrapper);
-        List<Integer> taskIds = importTasks.stream().map(ImportTask::getId).collect(Collectors.toList());
-        patentVO.setProjectId(report.getProjectId());
-        patentVO.setImportTaskId(taskIds);
+        if(patentVO.getReportId()!=null) {
+            LambdaQueryWrapper<ImportTask> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(ImportTask::getReportId, patentVO.getReportId());
+            Report report = reportService.getById(patentVO.getReportId());
+            List<ImportTask> importTasks = importTaskService.list(queryWrapper);
+            List<Integer> taskIds = importTasks.stream().map(ImportTask::getId).collect(Collectors.toList());
+            patentVO.setProjectId(report.getProjectId());
+            patentVO.setImportTaskId(taskIds);
+        }
         String param = new Gson().toJson(patentVO);
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
         OkHttpClient okHttpClient = new OkHttpClient();

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

@@ -313,29 +313,38 @@ else if(patentVO.getOrderItem()!=null&&patentVO.getOrderItem().equals("SysOrder"
      * @function 删除单个对比专利
      */
 
-    public String deletePatentNo(CompareFilesVO compareFilesVO) throws IOException {
+    public String deletePatentNo(PatentVO patentVO) throws IOException {
         List<String> patentNos = new ArrayList<>();
-        //是否根据范围删除
-        if (compareFilesVO.getStartNumber() != null && compareFilesVO.getEndNumber() != null && compareFilesVO.getEndNumber() > compareFilesVO.getStartNumber()) {
+Integer reportId = patentVO.getReportId();
             LambdaQueryWrapper<CompareFiles> wrapper = new LambdaQueryWrapper<>();
             wrapper.select(CompareFiles::getPatentNo)
-                    .eq(CompareFiles::getReportId, compareFilesVO.getReportId()).orderByAsc(CompareFiles::getPatentNo)
-                    //分页查询 传的起始条数和结束条数
-                    .last("limit " + (compareFilesVO.getStartNumber() - 1) + "," + (compareFilesVO.getEndNumber()-compareFilesVO.getStartNumber()+1));
-            patentNos = this.list(wrapper).stream().map(CompareFiles::getPatentNo).collect(Collectors.toList());
-        }
-        //减少的专利号
-        if (compareFilesVO.getIsDelete() != null) {
-            patentNos.removeAll(compareFilesVO.getIsDelete());
-        }
+                    .eq(CompareFiles::getReportId, patentVO.getReportId()).orderByAsc(CompareFiles::getPatentNo);
+
+        // 见outInterfaceService getComPatentNos接口
+if(patentVO.getStartNumber()<patentVO.getEndNumber()) {
+    patentNos = this.list(wrapper).stream().map(CompareFiles::getPatentNo).collect(Collectors.toList());
+    patentVO.setPatentNos(patentNos);
+    patentVO.setStartNumber(patentVO.getStartNumber() - 1);
+    patentVO.setEndNumber(patentVO.getEndNumber()-patentVO.getStartNumber());
+    patentVO.setReportId(null);
+    String res = outInterfaceService.getComPatentNos(patentVO);
+    JSONObject jsonObject = JSONObject.parseObject(res);
+    patentNos = JSONArray.parseArray(jsonObject.get("data").toString(), String.class);
+    //减少的专利号
+    if (patentVO.getIsDelete() != null) {
+        patentNos.removeAll(patentVO.getIsDelete());
+    }
+}
+
         //增加的专利号
-        if (compareFilesVO.getIsAdd() != null) {
-            patentNos.addAll(compareFilesVO.getIsAdd());
+        if (patentVO.getIsAdd() != null) {
+            patentNos.addAll(patentVO.getIsAdd());
         }
         //根据专利号删除
         if (patentNos.size() != 0) {
             LambdaQueryWrapper<CompareFiles> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.in(CompareFiles::getPatentNo, patentNos);
+            lambdaQueryWrapper.eq(CompareFiles::getReportId,reportId);
             this.remove(lambdaQueryWrapper);
         }
         return Response.success();