3/8 专利挖掘bug修改

src/main/java/cn/cslg/pas/mapper/AssoHandleResultFileMapper.java

@@ -11,4 +11,5 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface AssoHandleResultFileMapper extends BaseMapper<AssoHandleResultFile> {
+    public Integer getResultFileNum(Integer projectId,Integer processId);
 }

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

@@ -305,6 +305,8 @@ public class PatentDigProjectFilesService extends ServiceImpl<PatentDigProjectFi
             LambdaQueryWrapper<PatentDigProjectFiles> queryWrapper1 = new LambdaQueryWrapper<>();
             queryWrapper1.eq(PatentDigProjectFiles::getProcessId, i).eq(PatentDigProjectFiles::getProjectId, projectId);
             Integer fileCount = (int) this.count(queryWrapper1);
+            Integer handleFileCount = assoHandleResultFileService.getBaseMapper().getResultFileNum(projectId, i);
+            fileCount += handleFileCount;
             Map<String, Integer> countMap = new HashMap<>();
             countMap.put("taskCount", taskCount);
             countMap.put("fileCount", fileCount);
@@ -394,6 +396,7 @@ public class PatentDigProjectFilesService extends ServiceImpl<PatentDigProjectFi
                     patentDigProjectFilesVO.setProjectId(projectId);
                     patentDigProjectFilesVO.setFileGuid(item.getFileGuid());
                     patentDigProjectFilesVO.setCreateId(item.getCreateId());
+                    patentDigProjectFilesVO.setProcessId(processId);
                     patentDigProjectFilesVO.setCreateTime(item.getCreateTime());
                     patentDigProjectFilesVOS.add(patentDigProjectFilesVO);
                 });

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

@@ -140,6 +140,7 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
             Integer projectId = (Integer) patentDigProjectService.addMessage(patentDigProjectDTO);
             if (projectId != null) {
                 projectTaskDTO.setProjectId(projectId);
+                projectTaskDTO.setType(1);
                 Integer projectTaskId = this.addTask(projectTaskDTO);
                 if (projectTaskId != null) {
                     //将专利挖掘项目状态置为开卷审核

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

@@ -102,7 +102,7 @@ public class TaskHandleResultService extends ServiceImpl<TaskHandleResultMapper,
         ProjectTask currentProjectTask = projectTaskService.getById(currentTaskId);
         //如果当前处理的是审核任务或者项目开卷审核任务，进入以下流程
         Integer taskType = currentProjectTask.getType();
-        if (taskType == 5 || taskType == 1) {
+        if (taskType == 5 || taskType == 1||taskType==7) {
             //判断下一个审核人
             String nextAuditor = taskHandleResult.getNextAuditor();
             if (StringUtils.isNotEmpty(nextAuditor)) {

src/main/resources/mapper/AssoHandleResultFileMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="cn.cslg.pas.mapper.AssoHandleResultFileMapper">
+    <select id="getResultFileNum" resultType="java.lang.Integer">
+        select count(*)  from
+        asso_handle_result_file where
+    task_handle_result_id in (select id from task_handle_result where task_id in (select id from
+          project_task where  project_id =#{projectId} and process_id =#{processId}
+
+        ))
+    </select>
+
+
+
+
+</mapper>