ugp 修改我的任务时间倒叙 修改枚举

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

@@ -15,7 +15,7 @@ public enum ProblemProcessEnum {
     编制处理方案("编制处理方案","4","BZCLFA","问题处理方案待编制","编制处理方案","待编制"),
     审查处理方案("审查处理方案","5","SCCLFA","问题处理方案待审查","审查处理方案","待审查"),
     提交整改书("提交整改书","6","TJZGGC","问题整改书待提交","提交整改书","待提交"),
-    审查整改过程("审查整改过程","7","SCZGGC","问题处理方案待审核","审查整改过程","待审查"),
+    审查整改过程("审查整改过程","7","SCZGGC","问题整改书待审查","审查整改过程","待审查"),
     超期整改发送短信("超期整改发送短信","8","CQZGFSDX","问题待处理","",""),
     问题分类("问题分类","9","WTFL","问题待分类","问题分类","待分类"),
     转人工("转人工","10","ZRG","问题已转人工","转人工","等待人工处理"),

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

@@ -10,10 +10,10 @@ import java.util.Map;
 @AllArgsConstructor
 public enum ProjectInitiationEnum {
     项目立项("1","项目立项","XMLX","","",""),
-    平台审核("2","平台审核","PTSH","项目待审核","审核项目","待审核"),
+    平台审核("2","平台审核","PTSH","项目待平台审核","审核项目","待审核"),
     告知申请("3","告知申请","GZSQ","告知待申请","告知申请","待申请"),
-    接受告知("4","接受告知","JSGZ","告知待接收","告知接受","待接受"),
-    审查项目("5","审查项目","SCXM","项目告知待审查","项目告知审查","待审查"),
+    接受告知("4","接受告知","JSGZ","告知待接收","告知接收","待接收"),
+    审查项目("5","审查项目","SCXM","告知待审查","项目告知审查","待审查"),
     提交资料("6","提交资料","TJZL","项目资料待提交","项目资料提交","待提交"),
     审批人审批("7","审批人审批","SPRSP","项目资料待审批","项目资料审批","待审批"),
     审核人审核("8","审核人审核","SHRSH","项目资料待审核","项目资料审核","待审核"),
@@ -36,6 +36,7 @@ public enum ProjectInitiationEnum {
     public static Map<String,String> getCodeByNameMap = new HashMap<String,String>();
     public static Map<String,String> getTaskStatusMap = new HashMap<String, String>();
     public static Map<String,String> getTaskNameMap = new HashMap<String, String>();
+    public static Map<String, String> getTaskDetailStatusMap = new HashMap<String, String>();
 
     static {
         for(ProjectInitiationEnum projectInitiationEnum:ProjectInitiationEnum.values()){
@@ -44,6 +45,7 @@ public enum ProjectInitiationEnum {
             getCodeByNameMap.put(projectInitiationEnum.name,projectInitiationEnum.code);
             getTaskStatusMap.put(projectInitiationEnum.name,projectInitiationEnum.taskStatus);
             getTaskNameMap.put(projectInitiationEnum.name,projectInitiationEnum.taskName);
+            getTaskDetailStatusMap.put(projectInitiationEnum.name,projectInitiationEnum.taskDetailStatus);
         }
     }
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/TaskController.java

@@ -23,6 +23,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -164,6 +165,7 @@ public class TaskController {
         if(TaskTypeEnum.已办.getKey().equals(type)){
             taskDtoList.addAll(iTzUgpTaskService.doneTask());
         }
+        taskDtoList = taskDtoList.stream().sorted(Comparator.comparing(TaskDto::getSendTime).reversed()).collect(Collectors.toList());
         page.setRecords(taskDtoList);
         page.setTotal(taskDtoList.size());
         return ResponseHelper.buildResponse(page);

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

@@ -86,40 +86,42 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
         if(!ValidationUtil.isEmpty(projectInitiationList)){
             ProjectInitiation projectInitiation = projectInitiationList.iterator().next();
             JSONObject jsonObject = JSON.parseObject(projectInitiation.getContext());
-            if(ProjectInitiationEnum.平台审核.getName().equals(project.getStatus()) || ProjectInitiationEnum.审批人审批.getName().equals(project.getStatus()) || ProjectInitiationEnum.审核人审核.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检科室分配.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检员分配.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检员审核.getName().equals(project.getStatus()) || ProjectInitiationEnum.流程结束.getName().equals(project.getStatus()) || ProjectInitiationEnum.项目关闭.getName().equals(project.getStatus())){
+            if(ProjectInitiationEnum.审批人审批.getName().equals(project.getStatus()) || ProjectInitiationEnum.审核人审核.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检科室分配.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检员分配.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检员审核.getName().equals(project.getStatus()) || ProjectInitiationEnum.流程结束.getName().equals(project.getStatus()) || ProjectInitiationEnum.项目关闭.getName().equals(project.getStatus())){
                 if(!ValidationUtil.isEmpty(jsonObject)){
                     insDepId = jsonObject.getString(XJConstant.INS_DEPID);
                     state = jsonObject.getString(XJConstant.PROCESS_PROJECT_STATE);
                     insDep = jsonObject.getString(XJConstant.INS_DEP);
                     insPerson = jsonObject.getString(XJConstant.INS_PRESON);
                 }
+            } else {
+                state = ProjectInitiationEnum.getTaskDetailStatusMap.get(project.getStatus());
             }
         }
-        if(ProjectInitiationEnum.平台审核.getName().equals(project.getStatus())){
-            if(ValidationUtil.isEmpty(state)){
-                state = "项目待审核";
-            }
-        } else if (ProjectInitiationEnum.告知申请.getName().equals(project.getStatus())){
-            if(ValidationUtil.isEmpty(state)){
-                state = "告知待申请";
-            }
-        } else if (ProjectInitiationEnum.接受告知.getName().equals(project.getStatus())){
-            if(ValidationUtil.isEmpty(state)){
-                state = "告知待接收";
-            }
-        } else if (ProjectInitiationEnum.审查项目.getName().equals(project.getStatus())){
-            if(ValidationUtil.isEmpty(state)){
-                state = "告知待接收";
-            }
-        } else if (ProjectInitiationEnum.提交资料.getName().equals(project.getStatus())){
-            if(ValidationUtil.isEmpty(state)){
-                state = "资料待上传";
-            }
-        } else if(ProjectInitiationEnum.项目立项.getName().equals(project.getStatus())){
-            if(ValidationUtil.isEmpty(state)){
-                state = "项目被驳回";
-            }
-        }
+//        if(ProjectInitiationEnum.平台审核.getName().equals(project.getStatus())){
+//            if(ValidationUtil.isEmpty(state)){
+//                state = "项目待审核";
+//            }
+//        } else if (ProjectInitiationEnum.告知申请.getName().equals(project.getStatus())){
+//            if(ValidationUtil.isEmpty(state)){
+//                state = "告知待申请";
+//            }
+//        } else if (ProjectInitiationEnum.接受告知.getName().equals(project.getStatus())){
+//            if(ValidationUtil.isEmpty(state)){
+//                state = "告知待接收";
+//            }
+//        } else if (ProjectInitiationEnum.审查项目.getName().equals(project.getStatus())){
+//            if(ValidationUtil.isEmpty(state)){
+//                state = "告知待接收";
+//            }
+//        } else if (ProjectInitiationEnum.提交资料.getName().equals(project.getStatus())){
+//            if(ValidationUtil.isEmpty(state)){
+//                state = "资料待上传";
+//            }
+//        } else if(ProjectInitiationEnum.项目立项.getName().equals(project.getStatus())){
+//            if(ValidationUtil.isEmpty(state)){
+//                state = "项目被驳回";
+//            }
+//        }
 
         project.setExamineProjectState(state);
         project.setInsDep(insDep);