分配任务

src/main/java/cn/cslg/pas/controller/ProjectTaskController.java

@@ -120,4 +120,12 @@ public class ProjectTaskController {
         Integer id = (Integer) projectTaskService.addReportOpenAuditTask(tortReportTaskDTO);
         return Response.success(id);
     }
+
+    @Operation(summary = "添加分配或者标引任务")
+    @PostMapping("/addMarkTask")
+    public Response addMarkTask(@RequestBody MarkTaskDTO markTaskDTO) throws Exception {
+     List<Integer> ids= projectTaskService.addMarkTask(markTaskDTO);
+        return Response.success(ids);
+    }
+
 }

src/main/java/cn/cslg/pas/service/business/CustomFieldService.java

@@ -32,6 +32,7 @@ import java.util.List;
 
 /**
  * 自定义栏位Service层
+ *
  * @Author xiexiang
  * @Date 2023/11/8
  */
@@ -56,7 +57,7 @@ public class CustomFieldService extends ServiceImpl<CustomFieldMapper, CustomFie
     @Override
     public Object queryMessage(QueryRequest queryRequest) throws Exception {
         //根据专题库/报告id查询自定义栏位
-        List<String> sqls = formatQueryService.reSqls(queryRequest,"customField");
+        List<String> sqls = formatQueryService.reSqls(queryRequest, "customField");
         //根据sql查询自定义栏位信息
         List<CustomFieldVO> customFieldVOS = customFieldMapper.getCustomField(sqls.get(0), sqls.get(1), sqls.get(2));
         //查询总数
@@ -177,6 +178,7 @@ public class CustomFieldService extends ServiceImpl<CustomFieldMapper, CustomFie
 
     /**
      * 装载自定义栏位
+     *
      * @param customFieldVOS
      */
     private void loadCustomField(List<CustomFieldVO> customFieldVOS) throws IOException {
@@ -205,4 +207,8 @@ public class CustomFieldService extends ServiceImpl<CustomFieldMapper, CustomFie
             }
         }
     }
+
+
+    private void getAllPatentCustomField() {
+    }
 }

src/main/java/cn/cslg/pas/service/business/ImportTaskService.java

@@ -254,6 +254,9 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
 
     private void loadImportTask(List<ImportTaskVO> importTaskVOS) throws IOException {
         List<ImportTaskAMVO> importTaskAMVOS =schedulingTaskService.getImportTaskAMVOs();
+        if(importTaskAMVOS==null){
+            importTaskAMVOS=new ArrayList<>();
+        }
         List<String> createIds = new ArrayList<>();
         importTaskVOS.forEach(item -> {
             if (item.getCreateId() != null) {

src/main/java/cn/cslg/pas/service/business/ProjectTaskService.java

@@ -89,7 +89,8 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
 
     @Autowired
     private EsPatentService esPatentService;
-
+    @Autowired
+    private CompareLiteratureService compareLiteratureService;
     /**
      * 项目开卷审核任务
      *
@@ -858,10 +859,17 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
     }
 
 
-    private void addMarkTask(MarkTaskDTO markTaskDTO) throws Exception {
+    public List<Integer> addMarkTask(MarkTaskDTO markTaskDTO) throws Exception {
+        List<Integer> ids =new ArrayList<>();
         StringRequest stringRequest = markTaskDTO.getStringRequest();
         //获取人员专利
-        List<PersonAssignedDTO> personAssignedDTOList = new ArrayList<>();
+        List<PersonAssignedDTO> personAssignedDTOList = markTaskDTO.getPersonAssignedDTOList();
+        //获取任务类型
+        Integer taskType =markTaskDTO.getTaskType();
+        //获取任务名称
+        String taskName =markTaskDTO.getName();
+        //获得截止时间
+        Date deadLineTime =markTaskDTO.getDeadLine();
         //过滤出已经添加的专利
         List<String> patentNos = new ArrayList<>();
         List<Integer> nums = new ArrayList<>();
@@ -879,7 +887,13 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
             List<String> addPatentNos =new ArrayList<>();
             //创建任务
             ProjectTaskDTO projectTaskDTO = new ProjectTaskDTO();
+            projectTaskDTO.setType(taskType);
+            projectTaskDTO.setName(taskName);
+            projectTaskDTO.setDeadLineTime(deadLineTime);
+            projectTaskDTO.setHandler(item.getPersonId());
+            projectTaskDTO.setHandlerType(0);
            Integer taskId= this.addTask(projectTaskDTO);
+           ids.add(taskId);
             //根据检索式和已经添加的专利以及位置获得专利
             if (item.getPatentNos() == null || item.getPatentNos().size() == 0) {
                 Integer num = nums.remove(0);
@@ -896,6 +910,7 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
             //添加专利
             this.addCompareLiteratureByNos(addPatentNos,taskId);
         }
+        return ids;
     }
 
     private void addAssignTask(MarkTaskDTO markTaskDTO) {
@@ -917,7 +932,9 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
                 compareLiterature.setLiteratureNo(item);
                 compareLiterature.setName(item);
                 compareLiterature.setProjectTaskId(taskId);
+                compareLiteratures.add(compareLiterature);
             });
         }
+        compareLiteratureService.saveBatch(compareLiteratures);
     }
 }

src/main/java/cn/cslg/pas/service/business/es/EsPatentService.java

@@ -313,8 +313,6 @@ public class EsPatentService {
      */
     public List<Patent> getPatentsWithNotNo(QueryRequest queryRequest, List<String> patentNos) throws Exception {
         List<Patent> patentList = new ArrayList<>();
-        Long current = queryRequest.getCurrent();
-        Long size = queryRequest.getSize();
         SearchRequest.Builder builder = new SearchRequest.Builder();
         //设置查询索引
         builder.index("patent");
@@ -330,40 +328,17 @@ public class EsPatentService {
         }
         //4. 返回数据
         builder.query(reQuery);
-        //排序
-        List<OrderDTO> dtoList = queryRequest.getOrderDTOList();
-        if (!CollectionUtils.isEmpty(dtoList)) {
-            for (OrderDTO orderDTO : dtoList) {
-                if (orderDTO.getOrderType().equals(IfConstant.NO)) {
-                    builder.sort(sortOptionsBuilder -> sortOptionsBuilder
-                            .field(fieldSortBuilder -> fieldSortBuilder
-                                    .field(orderDTO.getOrderBy()).order(SortOrder.Asc)));
-                } else {
-                    builder.sort(sortOptionsBuilder -> sortOptionsBuilder
-                            .field(fieldSortBuilder -> fieldSortBuilder
-                                    .field(orderDTO.getOrderBy()).order(SortOrder.Desc)));
-                }
-            }
-        } else {
-            builder.sort(sortOptionsBuilder -> sortOptionsBuilder
-                    .field(fieldSortBuilder -> fieldSortBuilder
-                            .field("patent_no.keyword").order(SortOrder.Desc)));
-        }
 
         List<String> reSources = this.rePatentSource();
         builder.source(sourceOptionsBuilder -> sourceOptionsBuilder
                 .filter(fieldSourceBuilder -> fieldSourceBuilder
                         .includes(reSources)));
 
-        //分页
-        if (current > 0 && size > 0) {
-            builder.from(current.intValue()).size(size.intValue());
-        }
         SearchResponse<Patent> response = client.search(builder.build(), Patent.class);
         List<Hit<Patent>> hits = response.hits().hits();
         for (Hit<Patent> hit : hits) {
             if (hits != null && hits.size() > 0) {
-                Patent patent = hits.get(0).source();
+                Patent patent = hit.source();
                 patentList.add(patent);
             }
         }

src/main/java/cn/cslg/pas/service/business/es/EsService.java

@@ -271,23 +271,23 @@ public class EsService {
         builder.query(q);
         //排序
         List<OrderDTO> dtoList = queryRequest.getOrderDTOList();
-        if (!CollectionUtils.isEmpty(dtoList)) {
-            for (OrderDTO orderDTO : dtoList) {
-                if (orderDTO.getOrderType().equals(IfConstant.NO)) {
-                    builder.sort(sortOptionsBuilder -> sortOptionsBuilder
-                            .field(fieldSortBuilder -> fieldSortBuilder
-                                    .field(orderDTO.getOrderBy()).order(SortOrder.Asc)));
-                } else {
-                    builder.sort(sortOptionsBuilder -> sortOptionsBuilder
-                            .field(fieldSortBuilder -> fieldSortBuilder
-                                    .field(orderDTO.getOrderBy()).order(SortOrder.Desc)));
-                }
-            }
-        } else {
-            builder.sort(sortOptionsBuilder -> sortOptionsBuilder
-                    .field(fieldSortBuilder -> fieldSortBuilder
-                            .field("patent_no.keyword").order(SortOrder.Desc)));
-        }
+//        if (!CollectionUtils.isEmpty(dtoList)) {
+//            for (OrderDTO orderDTO : dtoList) {
+//                if (orderDTO.getOrderType().equals(IfConstant.NO)) {
+//                    builder.sort(sortOptionsBuilder -> sortOptionsBuilder
+//                            .field(fieldSortBuilder -> fieldSortBuilder
+//                                    .field(orderDTO.getOrderBy()).order(SortOrder.Asc)));
+//                } else {
+//                    builder.sort(sortOptionsBuilder -> sortOptionsBuilder
+//                            .field(fieldSortBuilder -> fieldSortBuilder
+//                                    .field(orderDTO.getOrderBy()).order(SortOrder.Desc)));
+//                }
+//            }
+//        } else {
+//            builder.sort(sortOptionsBuilder -> sortOptionsBuilder
+//                    .field(fieldSortBuilder -> fieldSortBuilder
+//                            .field("patent_no.keyword").order(SortOrder.Desc)));
+//        }
 
         //分页
         if (current > 0 && size > 0) {
@@ -364,6 +364,7 @@ public class EsService {
         return builder.toString();
     }
 
+
     public void appendStr(EsCustomFieldValueDTO customField, StringBuilder builder, int m) {
         List<String> values = customField.getFieldValue();
         builder.append("field").append("=").append(customField.getFieldId());
@@ -379,13 +380,15 @@ public class EsService {
                     builder.append(s).append(")").append(")");
                 }
             }
-        } else {
+        }
+        else {
             for (String value : values) {
                 builder.append(value);
             }
         }
     }
 
+
     /**
      * @param key
      * @param page