2/10 陈宇

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

@@ -346,15 +346,15 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
                 .eq(CompareFiles::getState, 0);
         List<CompareFiles> compareFiles = compareFilesService.list(wrapper);
         List<String> AllpatentNos = compareFiles.stream().map(CompareFiles::getPatentNo).collect(Collectors.toList());
-        List<String> patentNos1 =new ArrayList<>();
+        List<String> patentNos1 = new ArrayList<>();
         //无查询条件
         if (patentVO == null || patentVO.getFiledOptions() == null || patentVO.getFiledOptions().size() == 0) {
-            patentNos1 =AllpatentNos;
+            patentNos1 = AllpatentNos;
         }
         //有查询条件时，自定义字段的专利号和任务的专利号取交集
         else {
             List<String> temPatentNos = reportFieldService.getPatentNo1(patentVO.getFiledOptions(), patentVO.getReportId(), patentVO.getTaskId(), patentVO.getTaskStatus());
-            patentNos1=temPatentNos;
+            patentNos1 = temPatentNos;
         }
         //如果有任务过滤条件
         List<String> patentNosTask = new ArrayList<>();
@@ -363,9 +363,8 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         }
         List<String> allPatentsCopy = new ArrayList<>();
         if (patentVO.getNotAssignTypes() != null && patentVO.getNotAssignTypes().size() != 0) {
-            for(Integer types :patentVO.getNotAssignTypes())
-            {
-                List<String>  PatentsCopy = new ArrayList<>(AllpatentNos);
+            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);
@@ -656,21 +655,20 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
 //        PersonnelVO personnelVO = cacheUtils.getLoginUser(StpUtil.getLoginIdAsInt());
         LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(Task::getReportId, taskVO.getReportId());
-        if(taskVO.getTaskName()!=null){
-            lambdaQueryWrapper.like(Task::getTaskName,taskVO.getTaskName());
+        if (taskVO.getTaskName() != null) {
+            lambdaQueryWrapper.like(Task::getTaskName, taskVO.getTaskName());
         }
-        if(taskVO.getType()!=null){
-            lambdaQueryWrapper.eq(Task::getType,taskVO.getType());
+        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));
+                lambdaQueryWrapper.in(Task::getHandlePersonId, handleIds);
+            } else {
+                lambdaQueryWrapper.in(Task::getHandlePersonId, Arrays.asList(-1));
             }
 
         }
@@ -751,13 +749,18 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
 
     }
 
-    public String look(Integer taskID, String patentNo, Integer reoportId) {
+    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());
+            List<AssoTaskPersonel> list = assoTaskPersonelService.list(queryWrapper);
+            if (list != null && list.size() != 0) {
+                AssoTaskPersonel assoTaskPersonel = assoTaskPersonelService.list(queryWrapper).get(0);
+                return Response.success(assoTaskPersonel.getState());
+            }
+            return Response.success();
         } else {
             LambdaQueryWrapper<CompareFiles> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(CompareFiles::getPatentNo, patentNo).eq(CompareFiles::getReportId, reoportId);
@@ -798,8 +801,8 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         queryCMVO.setCompareResult(syneryVO.getCompareResult());
         List<String> patentNos = new ArrayList<>();
         //无查询条件,单个专利
-        if (syneryVO.getPatentNos() != null&&syneryVO.getPatentNos().size()!=0) {
-            patentNos =syneryVO.getPatentNos();
+        if (syneryVO.getPatentNos() != null && syneryVO.getPatentNos().size() != 0) {
+            patentNos = syneryVO.getPatentNos();
         }
         //无查询条件并且是对比过的专利
         else if ((patentVO == null || patentVO.getFiledOptions() == null || patentVO.getFiledOptions().size() == 0) && syneryVO.getIsAll() == 0) {
@@ -869,7 +872,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
                     map.put("value1", personnels.get(0).getPersonnelName());
                     map.put("email", personnels.get(0).getPersonnelEmail());
                     map.put("img", "\\src\\main\\resources\\mail\\logo.png");
-                    map.put("value2","aaa");
+                    map.put("value2", "aaa");
                     map.put("value3", "http://localhost:8086/Incomplete?taskId=" + task.getId() + "&reportId=" + task.getReportId() + "&type=1" + "&reportType=" + report.getType());
                     mailUtils.sendEmailMessage(map);
                 } else {
@@ -1021,13 +1024,13 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
             JSONObject jsonObject1 = JSONObject.parseObject(res1);
             //解析jason获得标的专利的权要
             List<Personnel> personnels = JSON.parseArray(jsonObject1.getString("data"), Personnel.class);
-            for(Integer key: personMap.keySet()){
-                TaskSourceVO.personDate tem =personMap.get(key);
+            for (Integer key : personMap.keySet()) {
+                TaskSourceVO.personDate tem = personMap.get(key);
                 tem.setPersonId(key);
-               Personnel personnel = personnels.stream().
+                Personnel personnel = personnels.stream().
                         filter(te -> te.getId().equals(key)).findFirst().orElse(new Personnel());
-               tem.setPersonName(personnel.getPersonnelName());
-               lists.add(tem);
+                tem.setPersonName(personnel.getPersonnelName());
+                lists.add(tem);
             }
             vo.setNotAssignNum(comPatentNosCopy.size());
             vo.setPersonDates(lists);