12.15修改

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

@@ -8,4 +8,11 @@ public class FileVO {
     public String name;
     public int PageSize;
     public int PageNO;
+
+    @Data
+    public static class ReportVO {
+        private Integer id;
+        private Integer pageSize;
+        private Integer pageNO;
+    }
 }

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

@@ -116,6 +116,10 @@ public class TaskController {
     private String finish(Integer id){
         return taskService.finishTask(id);
     }
-
+    @RequestMapping(value = "/ReviewTheTasks", method = RequestMethod.GET)
+    @Operation(summary = "查看任务")
+    private String ReviewTheTasks(TaskVO taskVO){
+        return null;
+    }
 
 }

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

@@ -498,12 +498,38 @@ public class ReportFieldService extends ServiceImpl<ReportFieldMapper, ReportFie
 
     }
 
-    public List<String> getPatentNos(List<SourceVO> params,List<String> allPatentNos) throws IOException {
+    public List<String> getPatentNos2(List<SourceVO> params,List<String> allPatentNos) throws IOException {
         if (params.size() == 1) {
             return this.getString(params.get(0),allPatentNos);
         }
         return this.gather1(params,allPatentNos);
     }
+    public List<String> getPatentNos(List<SourceVO> params,List<String> allPatentNos) throws IOException {
+        Map<Integer,  List<SourceVO>> map=new HashMap<>();
+        List<SourceVO> p=new ArrayList<>(params);
+       for( int i=0;i<p.size()-1;i++ ){
+           List<SourceVO> list=new ArrayList<>();
+           for(int j=i+1;j<p.size();j++){
+               //找到自定义字段相同的字段
+               if(list.get(i).getFieldId().equals(list.get(j).getFieldId())){
+                   p.add(list.get(j));
+                   //有相同的就删除
+                   list.remove(list.get(j));
+               }
+           }
+           //有相同的自定义字段id放在map集合里面去
+           if(list.size()!=0){
+               map.put(i,list);
+           }
+       }
+       //list 里面只剩下没有相同的
+        //遍历map
+        //遍历list
+       //如果list里有key=null（未选择）根据fieldId 查出所有专利号 和allPatentNos作差获得未选择patentNos
+
+
+    }
+
 
     public List<String> gather1(List<SourceVO> params,List<String> allPatentNos) throws IOException {
         //为了求并集

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

@@ -23,6 +23,7 @@ import lombok.extern.slf4j.Slf4j;
 
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.multipart.MultipartFile;
@@ -113,6 +114,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         //获得登录人的信息
         PersonnelVO personnelVO = cacheUtils.getLoginUser(StpUtil.getLoginIdAsInt());
         LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+
         if (taskVO.getType() != null) {
             lambdaQueryWrapper.eq(Task::getType, taskVO.getType());
         }
@@ -222,7 +224,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
 
 
     //添加分配任务
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class,isolation = Isolation.REPEATABLE_READ ,timeout = 30)
     public String addAssTask(AssignTaskVO assignTaskVO) throws ParseException, IOException {
         PatentVO patentVO = new PatentVO();
         if (assignTaskVO.getPatentVO() != null) {
@@ -415,9 +417,11 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         //1为已完成
         Date now = new Date();
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //增加完成时间
         simpleDateFormat.format(now);
         task.setFinishTime(now);
         task.setTaskStatus(1);
+        //结果为已完成状态
         task.setResult(1);
         task.updateById();
         return Response.success();
@@ -425,5 +429,29 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
 
 
     }
+    public String ReviewTheTasks(TaskVO taskVO){
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(StpUtil.getLoginIdAsInt());
+        LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(Task::getReportId,taskVO.getReportId());
+             List<Task> list = this.list(lambdaQueryWrapper);
+        List<Task> list1=new ArrayList<>();
+        List<Integer> collect = list.stream().map(Task::getCreateID).collect(Collectors.toList());
+        if(collect.get(0).equals(personnelVO.getId())){
+            if(taskVO.getCurrent()!=null&&taskVO.getSize()!=null){
+
+            }
+            return Response.success(list);
+        }
+        else {
+            for(Task task:list){
+              if(task.getHandlePersonId().equals(personnelVO.getId())){
+                  list1.add(task);
+              }
+            }
+            return Response.success(list1);
+        }
+
+    }
+
 
 }