12.15修改

RMS/src/main/java/cn/cslg/report/common/model/dto/TaskTDO.java

@@ -0,0 +1,40 @@
+package cn.cslg.report.common.model.dto;
+
+import cn.cslg.report.common.model.BaseVO;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class TaskTDO {
+    @Schema(description = "报告id")
+    private Integer reportId;
+    /**
+     * 每页条数
+     */
+    @Schema(description = "每页条数")
+    private Integer size;
+
+    /**
+     * 当前页数
+     */
+    @Schema(description = "当前页数")
+    private Integer current;
+
+    /**
+     * 数据总数
+     */
+    @Schema(description = "数据总数")
+    private Integer total;
+    @Schema(description = "任务名称")
+    private String taskName;
+    @Schema(description = "任务类型 0开卷审核任务")
+    private Integer type;
+    @Schema(description = "处理人姓名")
+    private String handlePersonName;
+    @Schema(description = "完成状态")
+    private Integer taskStatus;
+
+
+
+}

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

@@ -26,4 +26,6 @@ public class PatentQueryFieldSourceVO extends BaseVO {
     private String patentNo;
     @Schema(description = "任务ID")
     private Integer taskId;
+    private String name;
+
 }

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

@@ -21,6 +21,7 @@ import java.util.List;
 @Accessors(chain = true)
 @Schema(description="任务VO",required = true)
 public class TaskVO extends BaseVO {
+    private String createName;
 
     @Schema(description = "报告信息")
     private Report report;

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

@@ -135,10 +135,6 @@ public class BaseController {
     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

@@ -98,15 +98,11 @@ public class PatentFiledController {
         return Response.success(reportFieldService.getPatentQuerySourcePageList(params));
     }
 
-    @Operation(summary ="模糊查询自定义字段")
+
     @PostMapping("/source")
-    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));
+    @Operation(summary ="模糊查询自定义字段")
+    public String getPatentField( @RequestBody PatentQueryFieldSourceVO params)throws IOException{
+    return reportFieldService.getReportField(params);
     }
 
 }

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

@@ -2,6 +2,7 @@ package cn.cslg.report.controller;
 
 
 import cn.cslg.report.common.core.base.Constants;
+import cn.cslg.report.common.model.dto.TaskTDO;
 import cn.cslg.report.common.model.vo.*;
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.*;
@@ -116,9 +117,9 @@ public class TaskController {
     private String finish(Integer id){
         return taskService.finishTask(id);
     }
-    @RequestMapping(value = "/ReviewTheTasks", method = RequestMethod.GET)
+    @RequestMapping(value = "/reviewTheTasks", method = RequestMethod.POST)
     @Operation(summary = "查看任务")
-    private String ReviewTheTasks(TaskVO taskVO){
+    private String ReviewTheTasks(@RequestBody TaskTDO taskVO){
         return taskService.ReviewTheTasks(taskVO) ;
     }
     @RequestMapping(value = "/progress", method = RequestMethod.GET)

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

@@ -89,20 +89,25 @@ public class AssoTaskPersonelService extends ServiceImpl<AssoTaskPersonelMapper,
         patentVO.setPatentNos(patentNumber);
 
 
-        if (patentVO.getLocPosition() <= 1) {
+        if (patentVO.getLocPosition() == 1) {
             patentVO.setStartNumber(0);
-            patentVO.setEndNumber(1);
+           patentVO.setEndNumber(1);
             String res = outInterfaceService.getPatentFromPAS(patentVO, 1);
             JSONObject jsonObject = JSONObject.parseObject(res);
             JSONObject jsonObject1 = JSONObject.parseObject(jsonObject.get("data").toString());
             List<JSONObject> jsonObjects = JSONArray.parseArray(jsonObject1.get("records").toString(), JSONObject.class);
            List<Patents> list= new ArrayList<>();
+
            for(JSONObject obj:jsonObjects){
 
                Patents patent = obj.toJavaObject(obj, Patents.class);
                list.add(patent);
 
            }
+            if(list.size()==0){
+
+                return Response.success();
+            }
 
            if(list.size()==1){
                map.put("currentID", list.get(0).getId());

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

@@ -305,19 +305,15 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
      */
     @Transactional(rollbackFor = Exception.class)
     public void getPatentIndexSetting(PatentIndexSettingVO params)throws IOException {
-        //详情见reportFieldPatentLinkService updatePatentIndexSetting方法
+
         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();
-            }
+            assoTaskPersonel.setState(1);
+            assoTaskPersonel.updateById();
+
         }else {
             reportFieldPatentLinkService.updatePatentIndexSetting(params);
 

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

@@ -6,6 +6,7 @@ import cn.cslg.report.entity.CompareFiles;
 import cn.cslg.report.entity.CompareRecords;
 import cn.cslg.report.entity.Features;
 import cn.cslg.report.entity.asso.AssoRecordsFeature;
+import cn.cslg.report.entity.asso.AssoTaskPersonel;
 import cn.cslg.report.mapper.CompareRecordsMapper;
 import cn.cslg.report.mapper.FeatureMapper;
 
@@ -37,6 +38,7 @@ public class CompareRecordsService extends ServiceImpl<CompareRecordsMapper, Com
     public final AssoRecordsFeatureService assoRecordsFeatureService;
     public final CompareFilesService compareFilesService;
     private final ReportFileService reportFileService;
+    private final  AssoTaskPersonelService assoTaskPersonelService;
 
     @Transactional(rollbackFor = Exception.class)
     public String addCompareRecord(CompareRecords compareRecord,List<MultipartFile> files) throws IOException {
@@ -50,6 +52,12 @@ public class CompareRecordsService extends ServiceImpl<CompareRecordsMapper, Com
         List<AssoRecordsFeature> assoRecordsFeatures = compareRecord.getAssoRecordsFeatures();
         assoRecordsFeatures.forEach(item -> item.setRecordsId(compareRecord.getId()));
         assoRecordsFeatureService.saveBatch(assoRecordsFeatures);
+        //已读状态
+        LambdaQueryWrapper<AssoTaskPersonel> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AssoTaskPersonel::getTaskId,compareRecord.getTaskId()).eq(AssoTaskPersonel::getPatentNo,compareRecord.getPatentNo());
+        AssoTaskPersonel assoTaskPersonel = assoTaskPersonelService.list(queryWrapper).get(0);
+        assoTaskPersonel.setState(1);
+        assoTaskPersonel.updateById();
         return Response.success();
 
     }

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

@@ -74,7 +74,7 @@ public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper,
     }
 
     /**
-     * @function：根据报告id查询对比方案
+     * @function ： 根据报告id查询对比方案
      * @param reportID
      * @return：对比方案 对应实体：CompareScenariosVO
      * @throws IOException
@@ -128,7 +128,7 @@ public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper,
            List<Integer> featuresIds =select.stream().filter(item->item.getFeatureRecordID().equals(0)).map(AssoScenarIOS::getFeaturesID).collect(Collectors.toList());
             //根据特征Id查询特征
             List<Features> featuresList =new ArrayList<>();
-            if(featuresIds!=null) {
+            if(featuresIds.size()!=0) {
                 LambdaQueryWrapper<Features> wrapper4 = new LambdaQueryWrapper<>();
                 wrapper4.in(Features::getId,featuresIds);
                 featuresList=featureService.list(wrapper4);

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

@@ -452,30 +452,73 @@ public class ReportFieldService extends ServiceImpl<ReportFieldMapper, ReportFie
      *
      * @return 返回自定义字段
      */
-    public String getReportField(int id, String name) {
+    public String getReportField(PatentQueryFieldSourceVO params) {
 
+        List<PatentQueryFieldSourceVO> list=new ArrayList<>();
         LambdaQueryWrapper<ReportField> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(ReportField::getId, id);
+        wrapper.eq(ReportField::getId, params.getFieldId());
+        if(this.list(wrapper).size()==0){
+            return Response.success(new ArrayList<>());
+        }
         ReportField reportField = this.list(wrapper).get(0);
+
         //获得类型
         int type1 = reportField.getType();
-        if (type1 == 1) {
+        if (type1 == 1||type1 ==2||type1 ==3) {
             LambdaQueryWrapper<ReportFieldText> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(ReportFieldText::getFieldId, id)
-                    .like(ReportFieldText::getText, name);
-            return Response.success(reportFieldTextService.list(queryWrapper));
-        } else if (type1 == 5) {
+            queryWrapper.eq(ReportFieldText::getFieldId, params.getFieldId());
+                    if(params.getName()!=null) {
+                        queryWrapper.like(ReportFieldText::getText, params.getName());
+                    }
+            List<ReportFieldText> list1 = reportFieldTextService.list(queryWrapper);
+                    for(ReportFieldText a :list1){
+                        PatentQueryFieldSourceVO param=new PatentQueryFieldSourceVO();
+                        LambdaQueryWrapper<ReportFieldPatentLink> wrapper1 = new LambdaQueryWrapper<>();
+                        wrapper1.eq(ReportFieldPatentLink::getFieldId,a.getFieldId()).eq(ReportFieldPatentLink::getOptionId,a.getId());
+                        param.setName(a.getText());
+                        param.setCount( reportFieldPatentLinkService.list(wrapper1).size());
+                        list.add(param);
+                    }
+
+            return Response.success(list);
+        } else if (type1 == 5||type1 == 4) {
             LambdaQueryWrapper<ReportFieldOption> queryWrapper5 = new LambdaQueryWrapper<>();
-            queryWrapper5.eq(ReportFieldOption::getFieldId, id)
-                    .like(ReportFieldOption::getName, name);
-            return Response.success(reportFieldOptionService.list(queryWrapper5));
+            queryWrapper5.eq(ReportFieldOption::getFieldId, params.getFieldId());
+//                    .like(ReportFieldOption::getName, name);
+            if(params.getName()!=null){
+                queryWrapper5.like(ReportFieldOption::getName,params.getName());
+            }
+            List<ReportFieldOption> list1 = reportFieldOptionService.list(queryWrapper5);
+            for(ReportFieldOption a :list1){
+                PatentQueryFieldSourceVO param=new PatentQueryFieldSourceVO();
+                LambdaQueryWrapper<ReportFieldPatentLink> wrapper1 = new LambdaQueryWrapper<>();
+                wrapper1.eq(ReportFieldPatentLink::getFieldId,a.getFieldId()).eq(ReportFieldPatentLink::getOptionId,a.getId());
+                param.setName(a.getName());
+                param.setCurrent(reportFieldPatentLinkService.list(wrapper1).size());
+                list.add(param);
+            }
+
+            return Response.success(list);
         } else if (type1 == 6) {
             LambdaQueryWrapper<ReportFieldTree> queryWrapper6 = new LambdaQueryWrapper<>();
-            queryWrapper6.eq(ReportFieldTree::getFieldId, id)
-                    .like(ReportFieldTree::getName, name);
-            return Response.success(reportFieldTreeService.list(queryWrapper6));
+            queryWrapper6.eq(ReportFieldTree::getFieldId, params.getFieldId());
+                    if(params.getName()!=null){
+                        queryWrapper6 .like(ReportFieldTree::getName, params.getName());
+                    }
+            List<ReportFieldTree> list1 = reportFieldTreeService.list(queryWrapper6);
+              for(ReportFieldTree a:list1) {
+                  PatentQueryFieldSourceVO param=new PatentQueryFieldSourceVO();
+                  LambdaQueryWrapper<ReportFieldPatentLink> wrapper1 = new LambdaQueryWrapper<>();
+                  wrapper1.eq(ReportFieldPatentLink::getFieldId,a.getFieldId()).eq(ReportFieldPatentLink::getOptionId,a.getId());
+                  param.setName(a.getName());
+                  param.setCurrent(reportFieldPatentLinkService.list(wrapper1).size());
+                  list.add(param);
+
+              }
+            return Response.success(list);
+
         } else {
-            return Response.error();
+            return Response.success(new ArrayList<>());
         }
     }
 

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

@@ -1,6 +1,7 @@
 package cn.cslg.report.service.business;
 
 
+import cn.cslg.report.common.model.dto.TaskTDO;
 import cn.cslg.report.common.model.vo.*;
 import cn.cslg.report.common.utils.CacheUtils;
 import cn.cslg.report.common.utils.DataUtils;
@@ -121,7 +122,12 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         if (taskVO.getTaskStatus() != null) {
             lambdaQueryWrapper.eq(Task::getTaskStatus, taskVO.getTaskStatus());
         }
-
+        if(taskVO.getCreateName()!=null){
+            lambdaQueryWrapper.like(Task::getCreateName,taskVO.getCreateName());
+        }
+        if(taskVO.getTaskName()!=null){
+            lambdaQueryWrapper.like(Task::getTaskName,taskVO.getTaskName());
+        }
         if (taskVO.getRoleInTask() != null) {
             if (taskVO.getRoleInTask() == 0) {
                 lambdaQueryWrapper.eq(Task::getCreateID, personnelVO.getId());
@@ -455,8 +461,8 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
      * @return
      * @author ：cj
      */
-    public String ReviewTheTasks(TaskVO taskVO) {
-        PersonnelVO personnelVO = cacheUtils.getLoginUser(StpUtil.getLoginIdAsInt());
+    public String ReviewTheTasks(TaskTDO taskVO) {
+            PersonnelVO personnelVO = cacheUtils.getLoginUser(StpUtil.getLoginIdAsInt());
         LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(Task::getReportId, taskVO.getReportId());
         List<Task> list = this.list(lambdaQueryWrapper);
@@ -464,16 +470,29 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         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());
+                if(taskVO.getTaskName()!=null){
+                    lambdaQueryWrapper1.like(Task::getTaskName,taskVO.getTaskName());
+                }
+            if(taskVO.getHandlePersonName()!=null){
+                lambdaQueryWrapper1.like(Task::getHandlePersonName,taskVO.getHandlePersonName());
+            }
+            if(taskVO.getTaskStatus()!=null){
+                lambdaQueryWrapper1.eq(Task::getTaskStatus,taskVO.getTaskStatus());
+            }
+            if(taskVO.getType()!=null){
+                lambdaQueryWrapper1.eq(Task::getType,taskVO.getType());
+            }
+
+            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)));
             }
-            return Response.success(list);
+            return Response.success(lambdaQueryWrapper1);
         } else {
             //被分配人可以查看自己的任务
                 LambdaQueryWrapper<Task> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();