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

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

@@ -348,15 +348,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<>();
@@ -365,9 +365,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);
@@ -658,21 +657,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));
             }
 
         }
@@ -758,8 +756,12 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
             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 = list.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);
@@ -792,7 +794,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
             task.setHandlePersonName(syneryVO.getPersonEmail());
         }
         task.setCreateID(loginUtils.getId());
-        PersonnelVO personnel =cacheUtils.getLoginUser(loginUtils.getId());
+        PersonnelVO personnel = cacheUtils.getLoginUser(loginUtils.getId());
         task.insert();
 
 
@@ -801,8 +803,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) {
@@ -860,7 +862,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         syneryCode.insert();
         Map<String, Object> map = new LinkedHashMap<>();
         map.put("title", "任务通知");
-        String name ="";
+        String name = "";
         if (syneryVO.getHandlePersonId() != null) {
             map.put("template", "mail/SyneryInside.html");
             String resBody = outInterfaceService.getPersonnelByIdsFromPCS(Arrays.asList(task.getHandlePersonId()));
@@ -868,10 +870,10 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
             //解析jason获得标的专利的权要
             List<Personnel> personnels = JSON.parseArray(jsonObject.getString("data"), Personnel.class);
             map.put("value1", personnels.get(0).getPersonnelName());
-            name=personnels.get(0).getPersonnelName();
+            name = personnels.get(0).getPersonnelName();
             map.put("email", personnels.get(0).getPersonnelEmail());
             map.put("img", "\\src\\main\\resources\\mail\\logo.png");
-            map.put("value2", url+"/Incomplete?taskId=" + task.getId() + "&reportId=" + task.getReportId() + "&type=1" + "&reportType=" + report.getType());
+            map.put("value2", url + "/Incomplete?taskId=" + task.getId() + "&reportId=" + task.getReportId() + "&type=1" + "&reportType=" + report.getType());
             mailUtils.sendEmailMessage(map);
         } else {
             map.put("template", "mail/Synery.html");
@@ -885,18 +887,17 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
                 email = email.replace("<", "");
                 email = email.replace(">", "");
                 map.put("value1", personName);
-                name=personName;
+                name = personName;
                 map.put("email", email);
                 map.put("img", "\\src\\main\\resources\\mail\\logo.png");
                 map.put("value2", syneryCode.getCode());
-                map.put("value3", url+"/identificationCode");
+                map.put("value3", url + "/identificationCode");
                 mailUtils.sendEmailMessage(map);
             }
         }
         if (synery_ccs != null && synery_ccs.size() != 0) {
             map.put("template", "mail/SyneryTo.html");
-            for(Synery_CC item: synery_ccs)
-            {
+            for (Synery_CC item : synery_ccs) {
                 item.setTaskId(task.getId());
                 if (item.getCcId() != null) {
                     String resBody = null;
@@ -908,10 +909,10 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
                     JSONObject jsonObject = JSONObject.parseObject(resBody);
                     //解析jason获得标的专利的权要
                     List<Personnel> personnels = JSON.parseArray(jsonObject.getString("data"), Personnel.class);
-                    map.put("value1",personnel.getName());
+                    map.put("value1", personnel.getName());
                     map.put("email", personnels.get(0).getPersonnelEmail());
                     map.put("img", "\\src\\main\\resources\\mail\\logo.png");
-                    map.put("value2",name);
+                    map.put("value2", name);
                     mailUtils.sendEmailMessage(map);
                 } else {
                     String orgin = item.getCcEmail();
@@ -923,10 +924,10 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
                         String email = matcher.group(0);
                         email = email.replace("<", "");
                         email = email.replace(">", "");
-                        map.put("value1",personnel.getName());
+                        map.put("value1", personnel.getName());
                         map.put("email", email);
                         map.put("img", "\\src\\main\\resources\\mail\\logo.png");
-                        map.put("value2",name);
+                        map.put("value2", name);
                         mailUtils.sendEmailMessage(map);
                     }
                 }
@@ -985,7 +986,10 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
             for (AssoTaskPersonel item : partAsso) {
                 if (personMap.get(item.getPersonelId()) != null) {
                     TaskSourceVO.personDate personDate = personMap.get(item.getPersonelId());
-                    List<Integer> TaskIds = personDate.getTaskIds();
+                    //List<Integer> TaskIds = personDate.getTaskIds();
+                    List<Integer> list = personDate.getTaskIds();
+                    ArrayList<Integer> TaskIds = new ArrayList<>();
+                    TaskIds.addAll(list);
                     List<String> done = new ArrayList<>(personDate.getDone());
                     List<String> notDone = new ArrayList<>(personDate.getNotDone());
                     if (!TaskIds.contains(item.getTaskId())) {
@@ -1025,13 +1029,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);