已办代办dto创建 修改流程枚举类

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

@@ -9,35 +9,42 @@ import java.util.Map;
 @Getter
 @AllArgsConstructor
 public enum ProjectInitiationEnum {
-    项目立项("1","项目立项","XMLX"),
-    平台审核("2","平台审核","PTSH"),
-    告知申请("3","告知申请","GZSQ"),
-    接受告知("4","接受告知","JSGZ"),
-    审查项目("5","审查项目","SCXM"),
-    提交资料("6","提交资料","TJZL"),
-    审批人审批("7","审批人审批","SPRSP"),
-    审核人审核("8","审核人审核","SHRSH"),
-    监检科室分配("9","监检科室分配","JJKSFP"),
-    监检员分配("10","监检员分配","JJYFP"),
-    监检员审核("11","监检员审核","JJYSH"),
-    项目关闭("12","项目关闭","XMGB"),
-    接受审查意见("13","接受审查意见","JSSCYJ"),
-    流程结束("14","流程结束！","LCJS");
+    项目立项("1","项目立项","XMLX","","",""),
+    平台审核("2","平台审核","PTSH","项目待审核","审核项目","待审核"),
+    告知申请("3","告知申请","GZSQ","告知待申请","告知申请","待申请"),
+    接受告知("4","接受告知","JSGZ","告知待接收","告知接受","待接受"),
+    审查项目("5","审查项目","SCXM","项目告知待审查","项目告知审查","待审查"),
+    提交资料("6","提交资料","TJZL","项目资料待提交","项目资料提交","待提交"),
+    审批人审批("7","审批人审批","SPRSP","项目资料待审批","项目资料审批","待审批"),
+    审核人审核("8","审核人审核","SHRSH","项目资料待审核","项目资料审核","待审核"),
+    监检科室分配("9","监检科室分配","JJKSFP","监检科室待分配","监检科室分配","待分配"),
+    监检员分配("10","监检员分配","JJYFP","监检员待分配","监检员分配","待分配"),
+    监检员审核("11","监检员审核","JJYSH","监检员待审核","监检员审核","待审核"),
+    项目关闭("12","项目关闭","XMGB","","",""),
+    接受审查意见("13","接受审查意见","JSSCYJ","审查意见待接受","接受审查意见","待接受"),
+    流程结束("14","流程结束！","LCJS","","","");
 
     private String status;
     private String name;
     private String code;
+    private String taskDetailStatus;
+    private String taskName;
+    private String taskStatus;
 
     public static Map<String,String> getNameByStatusMap = new HashMap<String,String>();
     public static Map<String,String> getStatusByNameMap = new HashMap<String,String>();
     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>();
+
     static {
         for(ProjectInitiationEnum projectInitiationEnum:ProjectInitiationEnum.values()){
             getNameByStatusMap.put(projectInitiationEnum.status,projectInitiationEnum.name);
             getStatusByNameMap.put(projectInitiationEnum.name, projectInitiationEnum.status);
             getCodeByNameMap.put(projectInitiationEnum.name,projectInitiationEnum.code);
+            getTaskStatusMap.put(projectInitiationEnum.name,projectInitiationEnum.taskStatus);
+            getTaskNameMap.put(projectInitiationEnum.name,projectInitiationEnum.taskName);
         }
     }
 
-
 }

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

+package com.yeejoin.amos.boot.module.ugp.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum TaskTypeEnum {
+    填报("form","填报"),
+    流程("flow","流程"),
+    待办("false","待办"),
+    已办("true","已办");
+
+    String key;
+    String name;
+}

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/TaskDto.java

@@ -16,36 +16,13 @@ public class TaskDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "任务名称")
-    /**
-    * 任务名称
-    */
-    private String name;
-    @ApiModelProperty(value = "焊工id")
-    /**
-    * 焊工id
-    */
-    private String welderId;
-    @ApiModelProperty(value = "任务状态（0：未开始 1：进行中 2：已结束）")
-    /**
-    * 任务状态（0：未开始 1：进行中 2：已结束）
-    */
-    private String status;
-    @ApiModelProperty(value = "更新日期")
-    /**
-    * 任务开始时间
-    */
-    private Date startTime;
-    @ApiModelProperty(value = "任务结束时间")
-    /**
-    * 任务结束时间
-    */
-    private Date overTime;
-    @ApiModelProperty(value = "项目id")
-    /**
-    * 项目id
-    */
-    private Long projectId;
-
+    String content;
+    String sendTime;
+    String status;
+    String statusLabel;
+    String taskType;
+    String taskTypeLabel;
+    String title;
+    String agencyCode = "ugp";
 
 }