已办接口提交

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/ProblemProcessEnum.java

@@ -9,32 +9,38 @@ import java.util.Map;
 @Getter
 @AllArgsConstructor
 public enum ProblemProcessEnum {
-    流程开始("流程开始","1","LCKS",""),
-    确定问题("确定问题","2","QDWT","问题待处理"),
-    重大问题发送短信("重大问题发送短信","3","ZDWTFSDX",""),
-    编制处理方案("编制处理方案","4","BZCLFA","问题处理方案待编制"),
-    审查处理方案("审查处理方案","5","SCCLFA","问题处理方案待审查"),
-    提交整改书("提交整改书","6","TJZGGC","问题处理方案待提交"),
-    审查整改过程("审查整改过程","7","SCZGGC","问题处理方案待审核"),
-    超期整改发送短信("超期整改发送短信","8","CQZGFSDX","问题待处理"),
-    问题分类("问题分类","9","WTFL","问题待处理"),
-    转人工("转人工","10","ZRG","问题已转人工"),
-    结束("结束","11","JS","问题已处理"),
-    重大问题整改完成发送短信("重大问题整改完成发送短信","12","ZDWTZGWCFSDX","问题已处理");
+    流程开始("流程开始","1","LCKS","","",""),
+    确定问题("确定问题","2","QDWT","问题待处理","确定质量问题","待确定"),
+    重大问题发送短信("重大问题发送短信","3","ZDWTFSDX","","",""),
+    编制处理方案("编制处理方案","4","BZCLFA","问题处理方案待编制","编制处理方案","待编制"),
+    审查处理方案("审查处理方案","5","SCCLFA","问题处理方案待审查","审查处理方案","待审查"),
+    提交整改书("提交整改书","6","TJZGGC","问题处理方案待提交","提交整改书","待提交"),
+    审查整改过程("审查整改过程","7","SCZGGC","问题处理方案待审核","审查整改过程","待审查"),
+    超期整改发送短信("超期整改发送短信","8","CQZGFSDX","问题待处理","",""),
+    问题分类("问题分类","9","WTFL","问题待处理","问题分类","待分类"),
+    转人工("转人工","10","ZRG","问题已转人工","转人工","等待人工处理"),
+    结束("结束","11","JS","问题已处理","",""),
+    重大问题整改完成发送短信("重大问题整改完成发送短信","12","ZDWTZGWCFSDX","问题已处理","","");
 
     private String Name;
     private String key;
     private String Code;
     private String progress;
+    private String taskName;
+    private String taskStatus;
 
 
     public static Map<String,String> map = new HashMap<>();
     public static Map<String,String> statusMap = new HashMap<>();
+    public static Map<String,String> getTaskStatusMap = new HashMap<String, String>();
+    public static Map<String,String> getTaskNameMap = new HashMap<String, String>();
 
     static {
         for (ProblemProcessEnum proBlemProcessEnum : ProblemProcessEnum.values()) {
             map.put(proBlemProcessEnum.getCode(),proBlemProcessEnum.getName());
             statusMap.put(proBlemProcessEnum.getName(),proBlemProcessEnum.getProgress());
+            getTaskStatusMap.put(proBlemProcessEnum.getName(),proBlemProcessEnum.getTaskStatus());
+            getTaskNameMap.put(proBlemProcessEnum.getName(),proBlemProcessEnum.getTaskName());
         }
     }
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/TaskServiceImpl.java

 package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.ProblemProcessEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectInitiationEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.TaskTypeEnum;
 import com.yeejoin.amos.boot.module.ugp.api.dto.TaskDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
 import com.yeejoin.amos.boot.module.ugp.api.entity.ProjectResource;
+import com.yeejoin.amos.boot.module.ugp.api.entity.QualityProblem;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Task;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.TaskMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.TaskService;
 import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.querydsl.QPageRequest;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -37,48 +41,92 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
     @Autowired
     ProjectResourceServiceImpl projectResourceService;
 
+    @Autowired
+    QualityProblemServiceImpl qualityProblemService;
+
     @BusinessIdentify
     public List<TaskDto> unDoneTask(){
+        List<TaskDto> taskDtoList = new ArrayList<>();
         TaskDto task = new TaskDto();
         JSONObject jsonObject = new JSONObject();
         ReginParams ReginParams = orgService.getReginParams();
         String companyType = ReginParams.getBusinessInfo().getCompanyType();
         List<Project> projectList = projectResourceService.getProjectList();
-        List<TaskDto> taskDtoList = new ArrayList<>();
-        if(OrgEnum.安装单位.getKey().equals(companyType)){
-            for (Project project : projectList) {
-                if (ProjectInitiationEnum.提交资料.getName().equals(project.getStatus())) {
-                    taskDtoList.add(setTask(project.getStatus(),false,TaskTypeEnum.填报.getKey(),project.getRecDate(),project.getSequenceNbr()));
-                } else if (ProjectInitiationEnum.告知申请.getName().equals(project.getStatus())) {
-                    taskDtoList.add(setTask(project.getStatus(),false,TaskTypeEnum.填报.getKey(),project.getRecDate(),project.getSequenceNbr()));
-                } else if (ProjectInitiationEnum.审核人审核.getName().equals(project.getStatus())) {
-                    taskDtoList.add(setTask(project.getStatus(),false,TaskTypeEnum.填报.getKey(),project.getRecDate(),project.getSequenceNbr()));
-                } else if (ProjectInitiationEnum.审批人审批.getName().equals(project.getStatus())) {
-                    taskDtoList.add(setTask(project.getStatus(),false,TaskTypeEnum.填报.getKey(),project.getRecDate(),project.getSequenceNbr()));
+        if(!ValidationUtil.isEmpty(projectList)) {
+
+            //项目流程任务
+            if (OrgEnum.安装单位.getKey().equals(companyType)) {
+                for (Project project : projectList) {
+                    if (ProjectInitiationEnum.提交资料.getName().equals(project.getStatus()) || ProjectInitiationEnum.告知申请.getName().equals(project.getStatus())) {
+                        taskDtoList.add(setTask(project.getStatus(), false, TaskTypeEnum.填报.getKey(), project.getRecDate(), project.getSequenceNbr()));
+                    }
+                    if (ProjectInitiationEnum.审核人审核.getName().equals(project.getStatus()) || ProjectInitiationEnum.审批人审批.getName().equals(project.getStatus())) {
+                        taskDtoList.add(setTask(project.getStatus(), false, TaskTypeEnum.流程.getKey(), project.getRecDate(), project.getSequenceNbr()));
+                    }
                 }
-            }
-        } else if(OrgEnum.建设单位.getKey().equals(companyType)){
-            for (Project project : projectList) {
-                if (ProjectInitiationEnum.项目立项.getName().equals(project.getStatus())) {
-                    taskDtoList.add(setTask(project.getStatus(),false,TaskTypeEnum.填报.getKey(),project.getRecDate(),project.getSequenceNbr()));
+            } else if (OrgEnum.建设单位.getKey().equals(companyType)) {
+                for (Project project : projectList) {
+                    if (ProjectInitiationEnum.项目立项.getName().equals(project.getStatus())) {
+                        taskDtoList.add(setTask(project.getStatus(), false, TaskTypeEnum.填报.getKey(), project.getRecDate(), project.getSequenceNbr()));
+                    }
+                }
+            } else if (OrgEnum.设计单位.getKey().equals(companyType)) {
+                for (Project project : projectList) {
+                    if (ProjectInitiationEnum.提交资料.getName().equals(project.getStatus())) {
+                        taskDtoList.add(setTask(project.getStatus(), false, TaskTypeEnum.填报.getKey(), project.getRecDate(), project.getSequenceNbr()));
+                    }
+                    if (ProjectInitiationEnum.审批人审批.getName().equals(project.getStatus()) || ProjectInitiationEnum.审核人审核.getName().equals(project.getStatus())) {
+                        taskDtoList.add(setTask(project.getStatus(), false, TaskTypeEnum.流程.getKey(), project.getRecDate(), project.getSequenceNbr()));
+                    }
+                }
+            } else if (OrgEnum.监察部门.getKey().equals(companyType)) {
+                for (Project project : projectList) {
+                    if (ProjectInitiationEnum.平台审核.getName().equals(project.getStatus()) || ProjectInitiationEnum.接受审查意见.getName().equals(project.getStatus()) || ProjectInitiationEnum.接受告知.getName().equals(project.getStatus())) {
+                        taskDtoList.add(setTask(project.getStatus(), false, TaskTypeEnum.流程.getKey(), project.getRecDate(), project.getSequenceNbr()));
+                    }
+                }
+            } else if (OrgEnum.监检机构.getKey().equals(companyType)) {
+                for (Project project : projectList) {
+                    if (ProjectInitiationEnum.审查项目.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检科室分配.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检员分配.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检员审核.getName().equals(project.getStatus())) {
+                        taskDtoList.add(setTask(project.getStatus(), false, TaskTypeEnum.流程.getKey(), project.getRecDate(), project.getSequenceNbr()));
+                    }
                 }
             }
-        } else if(OrgEnum.设计单位.getKey().equals(companyType)){
-            for (Project project : projectList) {
-                if (ProjectInitiationEnum.提交资料.getName().equals(project.getStatus())) {
-                    taskDtoList.add(setTask(project.getStatus(),false,TaskTypeEnum.填报.getKey(),project.getRecDate(),project.getSequenceNbr()));
-                } else if (ProjectInitiationEnum.审核人审核.getName().equals(project.getStatus())) {
-                    taskDtoList.add(setTask(project.getStatus(),false,TaskTypeEnum.填报.getKey(),project.getRecDate(),project.getSequenceNbr()));
-                } else if (ProjectInitiationEnum.审批人审批.getName().equals(project.getStatus())) {
-                    taskDtoList.add(setTask(project.getStatus(),false,TaskTypeEnum.填报.getKey(),project.getRecDate(),project.getSequenceNbr()));
+
+            //问题处置环节流程任务
+            List<QualityProblem> qualityProblemList = new ArrayList<>();
+            for(Project project:projectList){
+                qualityProblemList.addAll(qualityProblemService.list(new LambdaQueryWrapper<QualityProblem>().eq(QualityProblem::getProjectId,project.getSequenceNbr())));
+            }
+            if (OrgEnum.安装单位.getKey().equals(companyType)) {
+                for (QualityProblem qualityProblem : qualityProblemList) {
+                    if (ProblemProcessEnum.编制处理方案.getName().equals(qualityProblem.getStatus()) || ProblemProcessEnum.提交整改书.getName().equals(qualityProblem.getStatus())) {
+                        taskDtoList.add(setTask(qualityProblem.getStatus(), false, TaskTypeEnum.填报.getKey(), qualityProblem.getRecDate(), qualityProblem.getSequenceNbr()));
+                    }
+                }
+            } else if (OrgEnum.建设单位.getKey().equals(companyType)) {
+                for (QualityProblem qualityProblem : qualityProblemList) {
+                    if (ProblemProcessEnum.审查处理方案.getName().equals(qualityProblem.getStatus())) {
+                        taskDtoList.add(setTask(qualityProblem.getStatus(), false, TaskTypeEnum.流程.getKey(), qualityProblem.getRecDate(), qualityProblem.getSequenceNbr()));
+                    }
+                }
+            } else if (OrgEnum.监检机构.getKey().equals(companyType)) {
+                for (QualityProblem qualityProblem : qualityProblemList) {
+                    if (ProblemProcessEnum.确定问题.getName().equals(qualityProblem.getStatus()) || ProblemProcessEnum.问题分类.getName().equals(qualityProblem.getStatus()) || ProblemProcessEnum.审查整改过程.getName().equals(qualityProblem.getStatus())) {
+                        taskDtoList.add(setTask(qualityProblem.getStatus(), false, TaskTypeEnum.流程.getKey(), qualityProblem.getRecDate(), qualityProblem.getSequenceNbr()));
+                    }
                 }
             }
         }
+
+        //企业审核任务
+
+
         return null;
     }
 
     /**
-     *
+     * 项目流程创建TaskDto对象
      * @param InitiationStatus 项目/问题处置 表中的 status字段
      * @param taskType 任务类型（填报、流程）
      * @param sendTime
@@ -92,7 +140,8 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
         String taskStatus = ProjectInitiationEnum.getTaskStatusMap.get(InitiationStatus);
         if(ValidationUtil.isEmpty(title)){
             //不是项目立项流程，是问题处置流程
-
+            title = ProblemProcessEnum.getTaskNameMap.get(InitiationStatus);
+            taskStatus = ProblemProcessEnum.getTaskStatusMap.get(InitiationStatus);
         }
 
         task.setTitle(title);