Merge remote-tracking branch 'origin/dev' into dev

.idea/workspace.xml

@@ -4,7 +4,35 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e7cd156b-23fc-410f-9ecc-be34a2e87174" name="Default Changelist" comment="12chenyi" />
+    <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/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/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/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$/logs/rms/rms-debug.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/rms/rms-debug.log" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -95,6 +123,7 @@
       <workItem from="1673314631144" duration="15878000" />
       <workItem from="1673400625616" duration="625000" />
       <workItem from="1673486700261" duration="13352000" />
+      <workItem from="1673573452163" duration="5664000" />
     </task>
     <task id="LOCAL-00001" summary="12.20 陈宇">
       <created>1671533439152</created>
@@ -159,7 +188,14 @@
       <option name="project" value="LOCAL" />
       <updated>1673519516759</updated>
     </task>
-    <option name="localTasksCounter" value="10" />
+    <task id="LOCAL-00010" summary="12chenyi">
+      <created>1673573541746</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1673573541746</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

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

@@ -81,4 +81,6 @@ public class TaskReportVO extends BaseVO {
      */
     @Schema(description = "结果")
     private Integer result;
+    @Schema(description = "任务备注")
+    private String remark;
 }

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

@@ -74,4 +74,6 @@ public class TaskVO extends BaseVO {
         @Schema(description = "专题号列表")
         private List<String> patentNos;
     }
+    @Schema(description = "任务备注")
+    private String remark;
 }

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

@@ -22,6 +22,7 @@ import okhttp3.MediaType;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 
 import java.io.IOException;
@@ -52,6 +53,7 @@ public class AssoTaskPersonelService extends ServiceImpl<AssoTaskPersonelMapper,
      * @return
      * @throws IOException
      */
+    @Transactional(rollbackFor = Exception.class)
     public String deleAssoTaskPersonel(Integer reportId) throws IOException{
         LambdaQueryWrapper<AssoTaskPersonel> wrappers =new LambdaQueryWrapper();
         wrappers.eq(AssoTaskPersonel::getReportId,reportId);

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

@@ -365,6 +365,7 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
      * function : 在删除报告的时候删除对比文件
      *
      */
+    @Transactional(rollbackFor = Exception.class)
     public String delete(Integer id){
         LambdaQueryWrapper<CompareFiles> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(CompareFiles::getReportId,id);

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

@@ -441,9 +441,13 @@ List<Integer> Ids =features.stream().map(Features::getId).collect(Collectors.toL
     /**
      * funtion:删除报告时删除
      */
-    public String deleteByFeatureId(List<Integer> list){
+    public String deleteByreportID(Integer repotID){
         LambdaQueryWrapper<CompareMessage> queryWrapper =new LambdaQueryWrapper<>();
-        queryWrapper.in(CompareMessage ::getFeatureId,list);
+        queryWrapper.eq(CompareMessage::getReportId,repotID);
+        List<CompareMessage> list = this.list(queryWrapper);
+        if(list==null||list.size()==0){
+            return Response.success();
+        }
         remove(queryWrapper);
         return Response.success();
 

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

@@ -13,6 +13,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
 
@@ -154,6 +155,7 @@ public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper,
      * @param reportId 报告ID
      * @return
      */
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteByReportId(Integer reportId){
          LambdaQueryWrapper<CompareScenarios> queryWrapper =new LambdaQueryWrapper<>();
          queryWrapper.eq(CompareScenarios::getReportId,reportId);

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

@@ -480,7 +480,7 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
             compareRecords =compareRecordsService.list(queryWrapper2);
         }
         //装载信息
-List<Map<String,Object>> mapList =new ArrayList<Map<String,Object>>();
+         List<Map<String,Object>> mapList =new ArrayList<Map<String,Object>>();
         //装载特征对应划出的话
         while (featuresList.size()>0) {
             Map<String,Object> map =new HashMap<>();
@@ -532,9 +532,6 @@ List<Map<String,Object>> mapList =new ArrayList<Map<String,Object>>();
     public Integer delByReportId(int reportId) {
         LambdaQueryWrapper<Features> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(Features::getReportId, reportId);
-        List<Features> features = this.list(queryWrapper);
-        List<Integer> collect = features.stream().map(Features::getId).collect(Collectors.toList());
-        compareMessageService.deleteByFeatureId(collect);
         this.remove(queryWrapper);
         return 1;
     }

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

@@ -13,7 +13,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
-
+import org.springframework.transaction.annotation.Transactional;
 
 
 /**
@@ -57,6 +57,7 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
         return flag;
     }
     //删除报告时删除导入任务
+    @Transactional(rollbackFor = Exception.class)
     public String deleteByRortID(Integer id){
         LambdaQueryWrapper<ImportTask> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ImportTask::getReportId, id);

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

@@ -33,6 +33,7 @@ import org.ddr.poi.html.HtmlRenderPolicy;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -553,6 +554,7 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
     /**
      * function:删除报告时删除
      */
+    @Transactional(rollbackFor = Exception.class)
     public String deleteByReportId(Integer id){
         LambdaQueryWrapper<ReportDocument> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ReportDocument::getReportId, id);

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

@@ -22,6 +22,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -199,6 +200,7 @@ public class ReportReferencesService extends ServiceImpl<ReportReferencesMapper,
 /**
  * function :删除报告的时候删除
  */
+  @Transactional(rollbackFor = Exception.class)
   public String deleteByReportId(Integer id){
       LambdaQueryWrapper<ReportReferences> wrapper = new LambdaQueryWrapper<>();
       wrapper.eq(ReportReferences::getReportID,id);

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

@@ -299,6 +299,8 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         reportDocumentService.deleteByReportId(id);
         //删除报告参考资料
         reportReferencesService.deleteByReportId(id);
+       //删除对比信息
+        compareMessageService.deleteByreportID(id);
 
 
 

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

@@ -242,6 +242,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
                 personnel = personnels.stream().filter(item -> item.getId().equals(handlePersonId)).findFirst().orElse(new Personnel());
                 Task task = new Task();
                 task.setReportId(reportId);
+                task.setRemark(taskVO.getRemark());
                 task.setTaskName(taskVO.getTaskName());
                 task.setBeginTime(taskVO.getBeginTime());
                 task.setEndTime(taskVO.getEndTime());

RMS/src/main/java/cn/cslg/report/service/business/asso/SyneryCCService.java

@@ -12,6 +12,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -23,8 +24,8 @@ public class SyneryCCService extends ServiceImpl<SyneryCCMapper, Synery_CC> {
     /**
      * functio : 协同任务删除时
      */
-
- public String deleteByTaskId(Integer taskId){
+    @Transactional(rollbackFor = Exception.class)
+     public String deleteByTaskId(Integer taskId){
      LambdaQueryWrapper<Synery_CC> lambdaQueryWrapper = new LambdaQueryWrapper<>();
      lambdaQueryWrapper.eq(Synery_CC::getTaskId,taskId);
      remove(lambdaQueryWrapper);

RMS/src/main/java/cn/cslg/report/service/business/asso/SyneryCodeService.java

@@ -11,19 +11,20 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @SuppressWarnings({"all"})
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class SyneryCodeService extends ServiceImpl<SyneryCodeMapper, SyneryCode> {
-
-public String deleteByTaskId(Integer taskId){
+    @Transactional(rollbackFor = Exception.class)
+    public String deleteByTaskId(Integer taskId){
     LambdaQueryWrapper<SyneryCode> lambdaQueryWrapper = new LambdaQueryWrapper<>();
     lambdaQueryWrapper.eq(SyneryCode::getTaskId,taskId);
     remove(lambdaQueryWrapper);
     return Response.success();
-}
+   }
 
 
 }