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

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

@@ -137,4 +137,6 @@ public class ReportVO extends BaseVO {
     private List<Integer> scenarioList;
 
     private List<String> types;
+    @Schema(description = "状态集合")
+    private List<Integer> Statuses;
 }

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

@@ -26,7 +26,7 @@ public class LitigationHistoryController {
     public final LitigationHistoryService litigationHistoryService;
     @GetMapping(value = "/deleteLitigationHistory")
     @Operation(summary = "删除诉讼历史")
-    public String deleteLitigationHistory(int id)throws IOException{
+    public String deleteLitigationHistory(Integer id)throws IOException{
         return litigationHistoryService.deleteLitigationHistory(id);
     }
     @PostMapping(value = "/addLitigationHistory")

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

@@ -149,6 +149,4 @@ public class ReportController {
         }
         return Response.error("添加失败");
     }
-
-
 }

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

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.IOException;
 import java.text.ParseException;
 import java.util.*;
@@ -34,8 +35,8 @@ public class TaskController {
 
     @RequestMapping(value = "/addTask", method = RequestMethod.POST)
     @Operation(summary = "新增审核任务")
-    public String addTask( String taskVO,List<MultipartFile> files) throws ParseException, IOException {
-        return taskService.addTask(taskVO,files);
+    public String addTask(String taskVO, List<MultipartFile> files) throws ParseException, IOException {
+        return taskService.addTask(taskVO, files);
     }
 
     @RequestMapping(value = "/deleteTask", method = RequestMethod.POST)
@@ -78,20 +79,20 @@ public class TaskController {
     @RequestMapping(value = "/reTaskPatents", method = RequestMethod.POST)
     @Operation(summary = "返回任务专利清单")
     public String reTaskPatents(@RequestBody PatentVO patentVO) throws ParseException, IOException {
-         return taskService.reTaskPatents1(patentVO);
+        return taskService.reTaskPatents1(patentVO);
     }
 
     @RequestMapping(value = "/reTaskStateCount", method = RequestMethod.GET)
     @Operation(summary = "返回任务专利状态的数量")
-    public String reTaskStateCount(Integer reportId,Integer taskId) throws ParseException, IOException {
-        return Response.success(taskService.reTaskStateCount(reportId,taskId));
+    public String reTaskStateCount(Integer reportId, Integer taskId) throws ParseException, IOException {
+        return Response.success(taskService.reTaskStateCount(reportId, taskId));
     }
 
     @RequestMapping(value = "/import", method = RequestMethod.POST)
     @Operation(summary = "导入")
-    public String importPatent(MultipartFile file, Integer reportId,Boolean asCompare) throws ParseException, IOException {
-        ImportTask importTask =baseService.getImportPatentTaskParamsBro(file, reportId);
-            baseService.uploadToPCS(importTask,asCompare);
+    public String importPatent(MultipartFile file, Integer reportId, Boolean asCompare) throws ParseException, IOException {
+        ImportTask importTask = baseService.getImportPatentTaskParamsBro(file, reportId);
+        baseService.uploadToPCS(importTask, asCompare);
         //解析file装载数据
         return Response.success(importTask);
     }
@@ -99,17 +100,16 @@ public class TaskController {
     @RequestMapping(value = "/import/delete", method = RequestMethod.GET)
     @Operation(summary = "删除导入记录")
     public String importPatent(int id) throws ParseException, IOException {
-     Boolean flag =  importTaskService.delImportTask(id);
-     if(flag) {
-     return  Response.success();
-     }
+        Boolean flag = importTaskService.delImportTask(id);
+        if (flag) {
+            return Response.success();
+        }
         return Response.error();
     }
 
     @RequestMapping(value = "/reImportTask", method = RequestMethod.POST)
     @Operation(summary = "根据报告Id和状态返回导入任务列表")
     public String reImportTask(@RequestBody ImportTask importTask) {
-
         return importTaskService.reImportTask(importTask);
     }
 
@@ -122,25 +122,25 @@ public class TaskController {
     @RequestMapping(value = "/reviewTheTasks", method = RequestMethod.POST)
     @Operation(summary = "查看任务")
     public String ReviewTheTasks(@RequestBody TaskTDO taskVO) throws IOException {
-        return taskService.ReviewTheTasks(taskVO) ;
+        return taskService.ReviewTheTasks(taskVO);
     }
 
     @RequestMapping(value = "/progress", method = RequestMethod.GET)
     @Operation(summary = "任务进度")
-    public String progress(int id){
-        return Response.success (taskService.reCount(id));
+    public String progress(int id) {
+        return Response.success(taskService.reCount(id));
     }
 
     @RequestMapping(value = "/read", method = RequestMethod.GET)
     @Operation(summary = "未读变成已读")
-    public String read(int taskID,String patentNo ,Integer reportId){
-        return taskService.read(taskID,patentNo, reportId);
+    public String read(int taskID, String patentNo, Integer reportId) {
+        return taskService.read(taskID, patentNo, reportId);
     }
 
     @RequestMapping(value = "/look", method = RequestMethod.GET)
     @Operation(summary = "查看某个专利的状态")
-    public String look(int taskID,String patentNo,Integer reportId){
-        return taskService.look(taskID,patentNo,reportId);
+    public String look(int taskID, String patentNo, Integer reportId) {
+        return taskService.look(taskID, patentNo, reportId);
     }
 
     @RequestMapping(value = "/addSyneryTask", method = RequestMethod.POST)
@@ -151,7 +151,7 @@ public class TaskController {
 
     @RequestMapping(value = "/getTaskSources", method = RequestMethod.GET)
     @Operation(summary = "获得任务过滤条件列表")
-    public String getTaskSources(Integer reportId) throws  IOException {
+    public String getTaskSources(Integer reportId) throws IOException {
         return Response.success(taskService.getTaskSources(reportId));
     }
 }

RMS/src/main/java/cn/cslg/report/entity/LitigationHistory.java

@@ -56,7 +56,7 @@ public class LitigationHistory extends BaseEntity<LitigationHistory> {
      */
     @Schema(description = "结果")
     @TableField(value = "RESULT")
-    private Integer result;
+    private String result;
 
     /**
      * 案件详情

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

@@ -325,9 +325,9 @@ public class BaseService {
                                 throw new PermissionException("上传失败");
                             }
                             //判断是否直接作为对比文件
-                            if (asCompare) {
+                            if (asCompare != null && asCompare) {
                                 if (jsonObject.get("code").toString().equals("200")) {
-                                    CompareFiles compareFiles =new CompareFiles();
+                                    CompareFiles compareFiles = new CompareFiles();
                                     compareFiles.setReportId(importTask.getReportId());
                                     compareFiles.setPatentNo(jsonObject.get("data").toString());
                                     compareFiles.insert();
@@ -353,7 +353,7 @@ public class BaseService {
                                     .setFileName("")
                                     .setOldName(taskParams.getOldName())
                                     .setUrl("")
-                                    .setTotal(total), ResponseEnum.PATENT_IMPORT_TASK_SUCCESS), taskParams.getUserId());
+                                    .setTotal(total), ResponseEnum.PATENT_IMPORT_TASK_SUCCESS),null);
                         } catch (IOException | ParseException e) {
                             importTask.setState(3);
                             importTask.updateById();
@@ -373,7 +373,7 @@ public class BaseService {
                 .setFileName("")
                 .setOldName(importTask.getTaskName())
                 .setUrl("")
-                .setTotal(total), ResponseEnum.PATENT_IMPORT_TASK_SUCCESS), String.valueOf(importTask.getCreateUserId()));
+                .setTotal(total), ResponseEnum.PATENT_IMPORT_TASK_SUCCESS), null);
         ImportTask importTask1 = importTaskService.getById(importTask.getId());
         importTask1.setState(2);
         importTask1.updateById();

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

@@ -513,6 +513,9 @@ public class OutInterfaceService {
      * @autor lrj
      */
     public String getfieldFromPAS(Integer projectId) throws IOException {
+        if (projectId == null) {
+            projectId = 0;
+        }
         OkHttpClient okHttpClient = new OkHttpClient();
         Request request = new Request.Builder()
                 .url(PASUrl + "/api/v2/system/field/list?projectId=" + projectId)

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

@@ -220,7 +220,6 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
             //特征序号
             Integer order = 1;
             List<Features> featuresList = new ArrayList<>();
-
             int rightId = patentRights.get(i).getSort();
             String name = "权要" + (patentRights.get(i).getSort() + 1);
             //对需要拆解的权要进行拆解

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

@@ -35,6 +35,7 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
      * @return importTask（导入任务）
      */
     private final ImportTaskMapper mapper;
+
     public String reImportTask(ImportTask importTask) {
         LambdaQueryWrapper<ImportTask> queryWrapper = new LambdaQueryWrapper<>();
         if (importTask.getReportId() != null) {
@@ -51,17 +52,18 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
     }
 
     /**
-     *  @function 根据导入任务的id删除导入任务
      * @param id
      * @return
+     * @function 根据导入任务的id删除导入任务
      */
     public Boolean delImportTask(Integer id) {
         Boolean flag = this.removeById(id);
         return flag;
     }
+
     //删除报告时删除导入任务
     @Transactional(rollbackFor = Exception.class)
-    public String deleteByRortID(Integer id){
+    public String deleteByRortID(Integer id) {
         LambdaQueryWrapper<ImportTask> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ImportTask::getReportId, id);
         remove(queryWrapper);
@@ -70,14 +72,14 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
     }
 
     /**
-     * @function :根据时间去获取文件的路径并且删除文件
      * @param date
      * @return
+     * @function :根据时间去获取文件的路径并且删除文件
      */
-    public List<String> findPath(Date date){
-        List<String> stringList=new ArrayList<>();
+    public List<String> findPath(Date date) {
+        List<String> stringList = new ArrayList<>();
         List<ImportTask> importTasks = mapper.find(date);
-        stringList =importTasks.stream().map(ImportTask::getFilePath).collect(Collectors.toList());
+        stringList = importTasks.stream().map(ImportTask::getFilePath).collect(Collectors.toList());
         mapper.dele(date);
         return stringList;
     }

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

@@ -229,8 +229,8 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
             queryWrapper.in(Report::getType, reportVO.getTypes());
         }
         //根据状态查询报告
-        if(reportVO.getStatus()!=null){
-            queryWrapper.eq(Report::getStatus,reportVO.getStatus());
+        if(reportVO.getStatuses()!=null&&reportVO.getStatuses().size()>0){
+            queryWrapper.in(Report::getStatus,reportVO.getStatuses());
         }
         if (reportVO.getCronIds() != null && reportVO.getCronIds().size() > 0) {
             StringBuilder strs = new StringBuilder();

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

@@ -408,7 +408,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
             task.setSignPatentNo(signPatentNO);
             //发送邮件
             if (task.insert()) {
-                if(task.getPersonEmail()==null){
+                if (task.getPersonEmail() == null) {
                     task.setPersonEmail("");
                 }
                 Map<String, Object> map = new HashMap<>();
@@ -914,11 +914,11 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
                     map.put("value2", name);
                     mailUtils.sendEmailMessage(map);
                 } else {
-                        map.put("value1", personnel.getName());
-                        map.put("email", item.getCcEmail());
-                        map.put("img", "\\src\\main\\resources\\mail\\logo.png");
-                        map.put("value2", item.getCcName());
-                        mailUtils.sendEmailMessage(map);
+                    map.put("value1", personnel.getName());
+                    map.put("email", item.getCcEmail());
+                    map.put("img", "\\src\\main\\resources\\mail\\logo.png");
+                    map.put("value2", item.getCcName());
+                    mailUtils.sendEmailMessage(map);
 
                 }
             }
@@ -956,9 +956,12 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         //筛选出任务id
         List<Integer> taskIds = tasks.stream().map(Task::getId).collect(Collectors.toList());
         //根据任务id获得任务专利关联记录
-        LambdaQueryWrapper<AssoTaskPersonel> assoWrapper = new LambdaQueryWrapper<>();
-        assoWrapper.in(AssoTaskPersonel::getTaskId, taskIds);
-        List<AssoTaskPersonel> assoTaskPersonels = assoTaskPersonelService.list(assoWrapper);
+        List<AssoTaskPersonel> assoTaskPersonels = new ArrayList<>();
+        if (taskIds.size() != 0) {
+            LambdaQueryWrapper<AssoTaskPersonel> assoWrapper = new LambdaQueryWrapper<>();
+            assoWrapper.in(AssoTaskPersonel::getTaskId, taskIds);
+            assoTaskPersonels = assoTaskPersonelService.list(assoWrapper);
+        }
 
         for (Integer type : types) {
             List<String> comPatentNosCopy = new ArrayList<>(comPatentNos);

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

@@ -102,7 +102,7 @@
     <select id="getFieldPatentNos" parameterType="java.util.List" resultType="java.lang.String">
 
         select distinct c.PATENT_NO from COMPARE_FILES c <where>
-        <foreach collection="params" item="item" separator=" and ">
+        <foreach collection="params" item="item" separator=" or ">
             c.PATENT_NO in (
             select distinct a.PATENT_NO from COMPARE_FILES a left join  OS_PATENT_FIELD_PATENT_LINK b on a.PATENT_NO =b.PATENT_NO
             and b.CID=#{item.field}