26854 【智信户用(管理端)】迁移工作台相关代码

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/BusinessTypeEnum.java

@@ -10,43 +10,10 @@ public enum BusinessTypeEnum {
     /**
      * 业务类型枚举
      */
-    JG_EQUIPMENT_HANDOVER("101", "设备移交"),
-
-    JG_INSTALLATION_NOTIFICATION("102", "安装告知"),
-
-    JG_MODIFICATION_NOTIFICATION("103", "改造告知"),
-
-    JG_MAINTENANCE_NOTIFICATION("104", "维修告知"),
-
-    JG_ADVICE_REMOVAL("105", "移装告知"),
-
-    JG_MAINTENANCE_RECORD("106", "维保备案"),
-
-    JG_USAGE_REGISTRATION("107", "使用登记"),
-
-    JG_NAME_CHANGE_REGISTRATION("108", "更名变更登记"),
-
-    JG_COMPANY_CHANGE_REGISTRATION("109", "单位变更登记"),
-
-    JG_CHANGE_REGISTRATION("110", "移装变更登记"),
-
-    JG_RENOVATION_REGISTRATION("111", "改造变更登记"),
-
-    JG_EQUIPMENT_START("112-1", "设备启用"),
-    JG_EQUIPMENT_STOP("112-2", "设备停用"),
-
-    JG_EQUIPMENT_MOVE("113-1", "移装注销"),
-    JG_EQUIPMENT_CANCEL("113-2", "报废注销"),
-
-    JY_OPENING_APPLICATION("114", "业务开通"),
-
-    JY_INSPECTION_APPLICATION_JD("115", "监督检验"),
-
-    JY_INSPECTION_APPLICATION_DS("116", "定（首）检验"),
-
-    JY_INSPECTION_APPLICATION_CHECK("117", "电梯检测"),
-
-    JG_VEHICLE_GAS_APPLICATION("118", "车用气瓶登记");
+    HYGF_JXS_SH("JXS_SH", "经销商审核"),
+    HYGF_DZ_SH("hygf_10001", "电站审核"),
+    HYGF_BWYS("hygf_bwys", "并网验收"),
+    HYGF_DZTRRZ("StationFinancing", "电站投融资流程");
     private final String code;
 
     private final String name;

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/TaskStatusEnum.java

+package com.yeejoin.amos.boot.module.hygf.api.Enum;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * <pre>
+ * 任务状态枚举
+ * </pre>
+ * @author my
+ *
+ */
+public enum TaskStatusEnum {
+	 UNDERWAY("处理中",0),
+	 FINISHED("已完成",1),
+	 CANCEL("已取消",2),
+	 OVERTIME("已超时",3);
+	/**
+	 * 名称
+	 */
+	private String name;
+
+	/**
+	 * 值
+	 */
+	private int value;
+	
+
+
+	private TaskStatusEnum(String name, int value) {
+		this.name = name;
+		this.value = value;
+	}
+
+
+	public static String getName(int value) {
+		for (TaskStatusEnum c : TaskStatusEnum.values()) {
+			if (c.getValue() == value) {
+				return c.name;
+			}
+		}
+		return null;
+	}
+	
+	public static int getValue(String name) {
+		for (TaskStatusEnum c : TaskStatusEnum.values()) {
+			if (c.getName().equals(name)) {
+				return c.value;
+			}
+		}
+		return -1;
+	}
+
+
+	public static TaskStatusEnum getEnum(int value) {
+		for (TaskStatusEnum c : TaskStatusEnum.values()) {
+			if (c.getValue() == value) {
+				return c;
+			}
+		}
+		return null;
+	}
+
+
+	public static TaskStatusEnum getEnum(String name) {
+		for (TaskStatusEnum c : TaskStatusEnum.values()) {
+			if (c.getName().equals(name)) {
+				return c;
+			}
+		}
+		return null;
+	}
+	
+	public static List<Map<String,String>> getEnumList() {
+		List<Map<String,String>> nameList = new ArrayList<>();
+		for (TaskStatusEnum c: TaskStatusEnum.values()) {
+			Map<String, String> map = new HashMap<String, String>();
+			map.put("name", c.getName());
+			map.put("value", c.getValue() +"");
+			nameList.add(map);
+		}
+		return nameList;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+
+	public int getValue() {
+		return value;
+	}
+
+
+	public void setValue(int value) {
+		this.value = value;
+	}
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/BasicGridAcceptanceServiceImpl.java

@@ -47,6 +47,8 @@ public class BasicGridAcceptanceServiceImpl
 
 	@Autowired
 	PeasantHouseholdMapper peasantHouseholdMapper;
+	@Autowired
+	private CommonServiceImpl commonService;
 
 	private final String OK = "0";
 	private final String PASS = "5";
@@ -127,9 +129,42 @@ public class BasicGridAcceptanceServiceImpl
 			onGridMapper.insert(grid);
 		}
 		basicGridAcceptanceMapper.updateById(basicGridAcceptance);
+
+		//发起待办
+		commonService.buildTaskModel(buildBWYSTaskModel(grid, basicGridAcceptance));
 		return grid;
 	}
 
+	private List<TaskModelDto> buildBWYSTaskModel(HygfOnGrid grid, BasicGridAcceptance basicGridAcceptance) {
+		List<TaskModelDto> taskModelDtoList = new ArrayList<>();
+		TaskModelDto taskModelDto = new TaskModelDto();
+		taskModelDto.setFlowCode(basicGridAcceptance.getNextTaskId());
+		taskModelDto.setFlowCreateDate(new Date());
+		taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
+		taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+		taskModelDto.setPageType(null);
+		taskModelDto.setExecuteUserIds(basicGridAcceptance.getNextExecuteUserIds());
+		taskModelDto.setModel(grid);
+		taskModelDto.setRelationId(basicGridAcceptance.getInstanceId());
+		taskModelDto.setRoutePath(null);
+		taskModelDto.setStartUserId(basicGridAcceptance.getRecUserId());
+		taskModelDto.setStartUser(basicGridAcceptance.getRecUserName());
+		taskModelDto.setStartDate(basicGridAcceptance.getRecDate());
+		taskModelDto.setStartUserCompanyName(null);
+		taskModelDto.setTaskName(basicGridAcceptance.getNextNodeName());
+		taskModelDto.setTaskCode(String.valueOf(basicGridAcceptance.getWorkOrderId()));
+		taskModelDto.setTaskType(BusinessTypeEnum.HYGF_BWYS.getCode());
+		taskModelDto.setTaskTypeLabel(BusinessTypeEnum.HYGF_BWYS.getName());
+		taskModelDto.setTaskStatus(TaskStatusEnum.UNDERWAY.getValue());
+		taskModelDto.setTaskStatusLabel(TaskStatusEnum.UNDERWAY.getName());
+//        taskModelDto.setTaskDesc();
+//        taskModelDto.setTaskContent();
+		taskModelDto.setNextExecuteUser(basicGridAcceptance.getNextExecutorIds());
+		taskModelDtoList.add(taskModelDto);
+		return taskModelDtoList;
+
+	}
+
 	public HygfOnGrid modifyEntity(HygfOnGrid grid) {
 		onGridMapper.updateById(grid);
 		return grid;

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/CommonServiceImpl.java

@@ -104,11 +104,6 @@ public class CommonServiceImpl {
                     model.setRoutePath(map.get("url").toString() + urlParams);
                     break;
                 }
-                // 维保需特殊获取页面  状态不等于监管单位审核的页面均取对应编辑页面
-                else if (map.get("type").equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode()) && obj.getTaskType().equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode()) && !obj.getFlowStatus().toString().equals("16723") && map.get("pageType").equals("edit")) {
-                    model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getNextExecuteUser()) + urlParams + "&nextExecuteUserIds=" + model.getExecuteUserIds());
-                    break;
-                }
                 // 其他逻辑均按详情页面获取
                 else if (map.get("type").equals(obj.getTaskType()) && map.get("pageType").equals(null == obj.getPageType() ? "look" : obj.getPageType())) {
                     model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getNextExecuteUser()) + urlParams + "&nextExecuteUserIds=" + model.getExecuteUserIds());
@@ -313,10 +308,7 @@ public class CommonServiceImpl {
             }
 
             for (Map map : urlList) {
-                if (map.get("type").equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode()) && obj.getString("taskType").equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode()) && map.get("pageType").equals("edit")) {
-                    lastTaskModel.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getString("nextExecuteUser")) + urlParams);
-                    break;
-                } else if (map.get("type").equals(obj.get("taskType")) && map.get("pageType").equals(obj.getOrDefault("pageType", "edit"))) {
+                if (map.get("type").equals(obj.get("taskType")) && map.get("pageType").equals(obj.getOrDefault("pageType", "edit"))) {
                     lastTaskModel.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.get("nextExecuteUser").toString()) + urlParams);
                     break;
                 }
@@ -334,10 +326,7 @@ public class CommonServiceImpl {
                 model.setFlowStatusLabel(obj.get("flowStatusLabel").toString());
             }
             for (Map map : urlList) {
-                if (map.get("type").equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode()) && obj.getString("taskType").equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode()) && map.get("pageType").equals("edit")) {
-                    model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getString("nextExecuteUser")) + urlParams);
-                    break;
-                } else if (map.get("type").equals(obj.get("taskType")) && map.get("pageType").equals("edit")) {
+               if (map.get("type").equals(obj.get("taskType")) && map.get("pageType").equals("edit")) {
                     model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.get("nextExecuteUser").toString()) + urlParams);
                     break;
                 }