12.15修改

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

@@ -11,4 +11,5 @@ public class PatentIndexSettingVO {
     private Integer reportId;
     private Integer type;
     private List<LabelDTO> selected;
+    private Integer taskID;
 }

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

@@ -1,6 +1,7 @@
 package cn.cslg.report.controller;
 
 import cn.cslg.report.common.core.base.Constants;
+import cn.cslg.report.common.model.delete.Patents;
 import cn.cslg.report.common.model.vo.LoginVO;
 import cn.cslg.report.common.model.vo.PatentVO;
 import cn.cslg.report.common.model.vo.PersonnelVO;
@@ -9,6 +10,8 @@ import cn.cslg.report.service.BaseService;
 import cn.cslg.report.service.OutInterfaceService;
 import cn.cslg.report.service.business.SystemDictItemService;
 import cn.dev33.satoken.stp.StpUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
@@ -18,6 +21,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
+import java.util.List;
 
 /**
  * @author 沈永艺
@@ -125,9 +129,16 @@ public class BaseController {
     @Parameters(value = {
             @Parameter(name = "patentNo",description = "专利号",required = true),
 
+
+
     })
-    public String getPatentByPatentNo(String patentNo) throws IOException {
-        return  outInterfaceService.getPatentFromPAS(patentNo);
+    public String getPatentByPatentNo(String patentNo,Integer taskID) throws IOException {
+         return  outInterfaceService.getPatentFromPAS(patentNo);
+
+
+
+
+
     }
 
     @GetMapping("/getPatentNos")

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

@@ -4,6 +4,7 @@ import cn.cslg.report.common.core.base.Constants;
 
 import cn.cslg.report.common.model.vo.PatentQueryFieldSourceVO;
 import cn.cslg.report.common.model.vo.ReportFieldVO;
+import cn.cslg.report.common.model.vo.SourceVO;
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.ReportField;
 import cn.cslg.report.entity.ReportFieldOption;
@@ -16,6 +17,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
 import java.io.IOException;
+import java.util.List;
 
 @Tag(name = "自定义字段")
 @RestController
@@ -101,5 +103,10 @@ public class PatentFiledController {
     public String getPatentField( int filedId ,String name)throws IOException{
       return reportFieldService.getReportField(filedId, name);
     }
+    @Operation(summary ="测试无前端无关，马上删除")
+    @PostMapping("/sourcessssss")
+    public String getPatentNo2(@RequestBody  List<SourceVO> params)throws IOException{
+        return Response.success (reportFieldService.getPatentNo2(params));
+    }
 
 }

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

@@ -121,7 +121,7 @@ public class TaskController {
     private String ReviewTheTasks(TaskVO taskVO){
         return taskService.ReviewTheTasks(taskVO) ;
     }
-    @RequestMapping(value = "/Progress", method = RequestMethod.GET)
+    @RequestMapping(value = "/progress", method = RequestMethod.GET)
     @Operation(summary = "任务进度")
     private String progress(int id){
         return Response.success (taskService.reCount(id));
@@ -131,5 +131,11 @@ public class TaskController {
     private String read(int taskID,String patentNo ){
         return taskService.read(taskID,patentNo);
     }
+    @RequestMapping(value = "/look", method = RequestMethod.GET)
+    @Operation(summary = "查看某个专利的状态")
+    private String look(int taskID,String patentNo){
+        return taskService.look(taskID,patentNo);
+    }
+
 
 }

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

@@ -264,6 +264,7 @@ public class OutInterfaceService {
      * @description 接口来源:PCS
      */
     public String getPatentFromPAS(String patentNo) throws IOException {
+
         OkHttpClient okHttpClient = new OkHttpClient();
         Request request = new Request.Builder()
                 .url(PASUrl + "/api/v2/patent/patentNo?patentNo=" + patentNo)

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

@@ -199,10 +199,10 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
         }
         //有查询条件时，自定义字段的专利号和任务的专利号取交集
         else {
-          patentNos = reportFieldService.getPatentNo(patentVO.getFiledOptions());
-            List<String> jiaoList = new ArrayList<>(AllpatentNos);
-            jiaoList.retainAll(patentNos);
-            patentVO.setPatentNos(jiaoList);
+//          patentNos = reportFieldService.getPatentNo(patentVO.getFiledOptions());
+//            List<String> jiaoList = new ArrayList<>(AllpatentNos);
+//            jiaoList.retainAll(patentNos);
+//            patentVO.setPatentNos(jiaoList);
         }
         patentVO.setPatentNos(patentNos);
         //详情见outInterfaceService.getPatentFromPAS 接口
@@ -306,8 +306,23 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
     @Transactional(rollbackFor = Exception.class)
     public void getPatentIndexSetting(PatentIndexSettingVO params)throws IOException {
         //详情见reportFieldPatentLinkService updatePatentIndexSetting方法
-       reportFieldPatentLinkService.updatePatentIndexSetting(params);
+        if(params.getTaskID()!=null) {
+            reportFieldPatentLinkService.updatePatentIndexSetting(params);
+            LambdaQueryWrapper<AssoTaskPersonel> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(AssoTaskPersonel::getTaskId, params.getTaskID()).eq(AssoTaskPersonel::getPatentNo, params.getPatentNo());
+            AssoTaskPersonel assoTaskPersonel = assoTaskPersonelService.list(queryWrapper).get(0);
+            if (assoTaskPersonel.getState().equals(1)) {
+                return;
+            }
+            if (assoTaskPersonel.getState().equals(0)) {
+                assoTaskPersonel.setState(1);
+                assoTaskPersonel.updateById();
+            }
+        }else {
+            reportFieldPatentLinkService.updatePatentIndexSetting(params);
 
+
+        }
     }
 
     /**

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

@@ -26,6 +26,7 @@ import java.io.IOException;
 import java.util.*;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 
 /**
@@ -494,24 +495,35 @@ public class ReportFieldService extends ServiceImpl<ReportFieldMapper, ReportFie
             List<String> list = new ArrayList<>();
             return list;
         } else {
-            return this.getPatentNo2(params,allPatentNos);
+            return this.getPatentNo2(params);
         }
 
     }
 
 
-    public List<String> getPatentNo2(List<SourceVO> params,List<String> allPatentNos) throws IOException {
-      List< List<Integer>> lists=new
-              ArrayList<>();
+    public List<String> getPatentNo2(List<SourceVO> params) throws IOException {
+        List<String> str=new ArrayList<>();
+        if(params.size()==0){
+            return str;
+        }
+        if(params.size()==1){
+            LambdaQueryWrapper<ReportFieldPatentLink> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(ReportFieldPatentLink::getOptionId,params.get(0).getKey());
+            lambdaQueryWrapper.eq(ReportFieldPatentLink::getFieldId,params.get(0).getFieldId());
+            List<ReportFieldPatentLink> list = reportFieldPatentLinkService.list(lambdaQueryWrapper);
+            str = list.stream().map(ReportFieldPatentLink::getPatentNo).collect(Collectors.toList());
+            return str;
+
 
+        }
+      List< List<SourceVO>> lists=new ArrayList<>();
        for( int i=0;i<params.size()-1;i++ ){
-           List<Integer> list=new ArrayList<>();
-           list.add(params.get(i).getKey());
+           List<SourceVO> list=new ArrayList<>();
+           list.add(params.get(i));
            for(int j=i+1;j<params.size();j++){
-
                //找到自定义字段相同的字段
                if(params.get(i).getFieldId().equals(params.get(j).getFieldId())){
-                  list.add(params.get(j).getKey());
+                  list.add(params.get(j));
                    //有相同的就删除
                    params.remove(list.get(j));
                }
@@ -519,11 +531,26 @@ public class ReportFieldService extends ServiceImpl<ReportFieldMapper, ReportFie
           lists.add(list);
 
        }
-        LambdaQueryWrapper<ReportFieldPatentLink> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-       for(List<Integer> list:lists) {
-           lambdaQueryWrapper.and((Consumer<LambdaQueryWrapper<ReportFieldPatentLink>>) lambdaQueryWrapper.in(ReportFieldPatentLink::getOptionId,list));
+
+       LambdaQueryWrapper<ReportFieldPatentLink> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+       for(List<SourceVO> list:lists) {
+           lambdaQueryWrapper.and(Wrapper->{
+               List<Integer> collect1 = list.stream().map(SourceVO::getFieldId).collect(Collectors.toList());
+               List<Integer> collect = list.stream().map(SourceVO::getKey).collect(Collectors.toList());
+               Wrapper.in(ReportFieldPatentLink::getFieldId,collect1);
+               Wrapper.in(ReportFieldPatentLink::getOptionId,collect);
+
+
+           });
+
        }
-        return null;
+
+        List<ReportFieldPatentLink> list = reportFieldPatentLinkService.list(lambdaQueryWrapper);
+        List<String> collect = list.stream().map(ReportFieldPatentLink::getPatentNo).collect(Collectors.toList());
+        return collect;
+
+
+
     }
 
 

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

@@ -447,10 +447,14 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         task.setResult(1);
         task.updateById();
         return Response.success();
-
-
-
     }
+
+    /**
+     * @function 根据报告查看任务
+     * @param taskVO
+     * @return
+     * @author ：cj
+     */
     public String ReviewTheTasks(TaskVO taskVO) {
         PersonnelVO personnelVO = cacheUtils.getLoginUser(StpUtil.getLoginIdAsInt());
         LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -459,8 +463,10 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         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) {
                 LambdaQueryWrapper<Task> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
+                //分页
                 lambdaQueryWrapper1.eq(Task::getCreateID, personnelVO.getId())
                         .eq(Task::getReportId, taskVO.getReportId());
                 List<Task> records = this.page(new Page<>(taskVO.getCurrent(), taskVO.getSize()), lambdaQueryWrapper1).getRecords();
@@ -469,10 +475,12 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
             }
             return Response.success(list);
         } else {
+            //被分配人可以查看自己的任务
                 LambdaQueryWrapper<Task> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
                 lambdaQueryWrapper1.eq(Task::getHandlePersonId, personnelVO.getId())
                         .eq(Task::getReportId, taskVO.getReportId());
-            if (taskVO.getCurrent() != null && taskVO.getSize() != null) {
+            if (taskVO.getCurrent()!= null && taskVO.getSize()!= null) {
+                //分页
                 List<Task> records = this.page(new Page<>(taskVO.getCurrent(), taskVO.getSize()), lambdaQueryWrapper1).getRecords();
                 Long count = this.count(lambdaQueryWrapper1);
                 return Response.success(records, DataUtils.setPageColumn(taskVO.getSize(), taskVO.getCurrent(), Math.toIntExact(count)));
@@ -482,15 +490,32 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
             }
 
         }
+    /**
+     * @function :点击自定义字段变成已读
+     * @param ： 任务的id 专利号
+     * @return： 是否改变成功
+     * @author ：cj
+     */
         @Transactional
-        public String read(int taskID,String patentNo){
+        public String read(int taskID, String patentNo ){
             LambdaQueryWrapper<AssoTaskPersonel> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(AssoTaskPersonel::getTaskId,taskID).eq(AssoTaskPersonel::getPatentNo,patentNo);
             AssoTaskPersonel assoTaskPersonel = assoTaskPersonelService.list(queryWrapper).get(0);
-            assoTaskPersonel.setState(1);
+            if(assoTaskPersonel.getState().equals(1)){
+                assoTaskPersonel.setState(0);
+            }
+            else  {
+                 assoTaskPersonel.setState(1);
+            }
             assoTaskPersonel.updateById();
             return Response.success();
         }
+        public String look(int taskID,String patentNo){
+            LambdaQueryWrapper<AssoTaskPersonel> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(AssoTaskPersonel::getTaskId,taskID).eq(AssoTaskPersonel::getPatentNo,patentNo);
+            AssoTaskPersonel assoTaskPersonel = assoTaskPersonelService.list(queryWrapper).get(0);
+            return Response.success(assoTaskPersonel.getState());
+        }