1.维保任务

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/common/enums/LatentDangerExcuteTypeEnum.java

-package com.yeejoin.amos.maintenance.common.enums;
-
-public enum LatentDangerExcuteTypeEnum {
-    填写隐患完成("填写隐患完成", 1, ExecuteStateEnum.通过, LatentDangerStateEnum.待评审,
-            "{\"action\": \"complete\"}"),
-    隐患评审通过("隐患评审通过", 2, ExecuteStateEnum.通过, LatentDangerStateEnum.待治理,
-            "{\"reviewResult\": \"通过\"}"),
-    隐患评审拒绝("隐患评审拒绝", 3, ExecuteStateEnum.驳回, LatentDangerStateEnum.已撤销,
-            "{\"reviewResult\": \"不通过\"}"),
-    隐患常规治理("隐患常规治理", 4, ExecuteStateEnum.通过, LatentDangerStateEnum.待验证,
-            "{\"rectifyResult\": \"常规整改\"}"),
-    隐患安措计划("隐患安措计划", 5, ExecuteStateEnum.通过, LatentDangerStateEnum.安措计划中,
-            "{\"action\": \"complete\",\"variables\": [{\"name\": \"rectification\",\"value\": \"plan\"}]}"),
-    隐患延期治理("隐患延期治理", 15, ExecuteStateEnum.通过, LatentDangerStateEnum.延期治理申请待车间部门审核,
-            "{\"rectifyResult\": \"延期\"}"),
-    隐患延期治理车间部门审核通过("隐患延期治理车间部门审核通过", 16, ExecuteStateEnum.通过, LatentDangerStateEnum.待治理,
-            "{\"approveResult\": \"通过\"}"),
-    隐患延期治理车间部门审核拒绝("隐患延期治理车间部门审核拒绝", 17, ExecuteStateEnum.驳回, LatentDangerStateEnum.待治理,
-            "{\"approveResult\": \"不通过\"}"),
-
-    隐患延期治理公司审核通过("隐患延期治理公司审核通过", 18, ExecuteStateEnum.通过, LatentDangerStateEnum.待治理,
-            "{\"approveResult\": true}"),
-    隐患延期治理公司审核拒绝("隐患延期治理公司审核拒绝", 19, ExecuteStateEnum.驳回, LatentDangerStateEnum.延期治理申请待车间部门审核,
-            "{\"approveResult\": false}"),
-    填写安措计划完成("填写安措计划完成", 6, ExecuteStateEnum.通过, LatentDangerStateEnum.安措计划中,
-            "{\"action\": \"complete\"}"),
-    车间部门审核通过("车间部门审核通过", 7, ExecuteStateEnum.通过, LatentDangerStateEnum.安措计划中,
-            "{\"action\": \"complete\",\"variables\": [{\"name\": \"rejected\",\"value\": false}]}"),
-    车间部门审核拒绝("车间部门审核拒绝", 8, ExecuteStateEnum.驳回, LatentDangerStateEnum.待治理,
-            "{\"action\": \"complete\",\"variables\": [{\"name\": \"rejected\",\"value\": true}]}"),
-    总工程师审核通过("总工程师审核通过", 9, ExecuteStateEnum.通过, LatentDangerStateEnum.安措计划中,
-            "{\"action\": \"complete\",\"variables\": [{\"name\": \"rejected\",\"value\": false}]}"),
-    总工程师审核拒绝("总工程师审核拒绝", 10, ExecuteStateEnum.驳回, LatentDangerStateEnum.待治理,
-            "{\"action\": \"complete\",\"variables\": [{\"name\": \"rejected\",\"value\": true}]}"),
-    公司负责人审核通过("公司负责人审核通过", 11, ExecuteStateEnum.通过, LatentDangerStateEnum.待验证,
-            "{\"action\": \"complete\",\"variables\": [{\"name\": \"rejected\",\"value\": false}]}"),
-    公司负责人审核拒绝("公司负责人审核拒绝", 12, ExecuteStateEnum.驳回, LatentDangerStateEnum.待治理,
-            "{\"action\": \"complete\",\"variables\": [{\"name\": \"rejected\",\"value\": true}]}"),
-    隐患验证通过("隐患验证通过", 13, ExecuteStateEnum.通过, LatentDangerStateEnum.治理完毕,
-            "{\"validationResult\": \"通过\"}"),
-    隐患验证拒绝("隐患验证拒绝", 14, ExecuteStateEnum.驳回, LatentDangerStateEnum.待治理,
-            "{\"validationResult\": \"不通过\"}");
-
-    /**
-     * 名称，描述
-     */
-    private String name;
-    /**
-     * 编码
-     */
-    private Integer code;
-
-    /**
-     * 执行状态
-     */
-    private ExecuteStateEnum excuteState;
-
-    private String requestBody;
-
-    private LatentDangerStateEnum nextState;
-
-    LatentDangerExcuteTypeEnum(String name, Integer code, ExecuteStateEnum excuteState, LatentDangerStateEnum nextState, String requestBody) {
-        this.name = name;
-        this.code = code;
-        this.excuteState = excuteState;
-        this.requestBody = requestBody;
-        this.nextState = nextState;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public void setCode(Integer code) {
-        this.code = code;
-    }
-
-    public ExecuteStateEnum getExcuteState() {
-        return excuteState;
-    }
-
-    public void setExcuteState(ExecuteStateEnum excuteState) {
-        this.excuteState = excuteState;
-    }
-
-    public String getRequestBody() {
-        return requestBody;
-    }
-
-    public void setRequestBody(String requestBody) {
-        this.requestBody = requestBody;
-    }
-
-    public LatentDangerStateEnum getNextState() {
-        return nextState;
-    }
-
-    public void setNextState(LatentDangerStateEnum nextState) {
-        this.nextState = nextState;
-    }
-
-    public static LatentDangerExcuteTypeEnum getByCode(Integer code) {
-        for (LatentDangerExcuteTypeEnum e : LatentDangerExcuteTypeEnum.values()) {
-            if (code.equals(e.getCode())) {
-                return e;
-            }
-        }
-        return null;
-    }
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/common/enums/LatentDangerLevelEnum.java

-package com.yeejoin.amos.maintenance.common.enums;
-
-public enum LatentDangerLevelEnum {
-
-    安全问题("安全问题", 0, "0"),
-    一般隐患("一般隐患", 1, "1"),
-    重大隐患("重大隐患", 2, "2");
-
-    /**
-     * 名称，描述
-     */
-    private String name;
-    /**
-     * 编码
-     */
-    private Integer code;
-
-    private String riskSourceDangerLevelCode;
-
-    LatentDangerLevelEnum(String name, Integer code, String riskSourceDangerLevelCode) {
-        this.name = name;
-        this.code = code;
-        this.riskSourceDangerLevelCode = riskSourceDangerLevelCode;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public void setCode(Integer code) {
-        this.code = code;
-    }
-
-    public String getRiskSourceDangerLevelCode() {
-        return riskSourceDangerLevelCode;
-    }
-
-    public void setRiskSourceDangerLevelCode(String riskSourceDangerLevelCode) {
-        this.riskSourceDangerLevelCode = riskSourceDangerLevelCode;
-    }
-
-    public static LatentDangerLevelEnum getByRiskSourceDangerLevelCode(String riskSourceDangerLevelCode) {
-        for (LatentDangerLevelEnum l : LatentDangerLevelEnum.values()) {
-            if (riskSourceDangerLevelCode.equals(l.getRiskSourceDangerLevelCode())) {
-                return l;
-            }
-        }
-        return null;
-    }
-
-    public static LatentDangerLevelEnum getByCode(Integer code) {
-        for (LatentDangerLevelEnum l : LatentDangerLevelEnum.values()) {
-            if (code.equals(l.getCode())) {
-                return l;
-            }
-        }
-        return null;
-    }
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/common/enums/LatentDangerOvertimeStateEnum.java

-package com.yeejoin.amos.maintenance.common.enums;
-
-public enum LatentDangerOvertimeStateEnum {
-    未超时("未超时", 0),
-    已超时("已超时", 1);
-
-    /**
-     * 名称，描述
-     */
-    private String name;
-    /**
-     * 编码
-     */
-    private Integer code;
-
-    LatentDangerOvertimeStateEnum(String name, Integer code) {
-        this.name = name;
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public void setCode(Integer code) {
-        this.code = code;
-    }
-
-    public static LatentDangerOvertimeStateEnum getByCode(Integer code) {
-        for (LatentDangerOvertimeStateEnum l : LatentDangerOvertimeStateEnum.values()) {
-            if (code.equals(l.getCode())) {
-                return l;
-            }
-        }
-        return null;
-    }
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/common/enums/LatentDangerReformTypeEnum.java

-package com.yeejoin.amos.maintenance.common.enums;
-
-public enum LatentDangerReformTypeEnum {
-
-    常规整改("常规整改", 1),
-    安措计划("安措计划", 2),
-    延期治理("延期治理", 3);
-
-    /**
-     * 名称，描述
-     */
-    private String name;
-    /**
-     * 编码
-     */
-    private Integer code;
-
-    LatentDangerReformTypeEnum(String name, Integer code) {
-        this.name = name;
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public void setCode(Integer code) {
-        this.code = code;
-    }
-
-    public static LatentDangerReformTypeEnum getByCode(Integer code) {
-        for (LatentDangerReformTypeEnum l : LatentDangerReformTypeEnum.values()) {
-            if (code.equals(l.getCode())) {
-                return l;
-            }
-        }
-        return null;
-    }
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/common/enums/LatentDangerStateEnum.java

-package com.yeejoin.amos.maintenance.common.enums;
-
-public enum LatentDangerStateEnum {
-    待评审("待评审", 1),
-    待治理("待治理", 2),
-    安措计划中("安措计划中", 3),
-    待验证("待验证", 4),
-    治理完毕("治理完毕", 5),
-    已撤销("已撤销", 6),
-    延期治理申请("延期治理中", 7),
-    延期治理申请待车间部门审核("延期治理待车间部门审核", 8),
-    延期治理申请待公司审核("延期治理待公司审核", 9);
-
-    /**
-     * 名称，描述
-     */
-    private String name;
-    /**
-     * 编码
-     */
-    private Integer code;
-
-    LatentDangerStateEnum(String name, Integer code) {
-        this.name = name;
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public void setCode(Integer code) {
-        this.code = code;
-    }
-
-    public static String getEnumName(Integer code) {
-        String name = "";
-        for(LatentDangerStateEnum type: LatentDangerStateEnum.values()) {
-            if (type.getCode()==code) {
-                name = type.getName();
-                break;
-            }
-        }
-        return name;
-    }
-
-    public static LatentDangerStateEnum getByCode(Integer code) {
-        for (LatentDangerStateEnum l : LatentDangerStateEnum.values()) {
-            if (code.equals(l.getCode())) {
-                return l;
-            }
-        }
-        return null;
-    }
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/common/enums/LatentDangerTypeEnum.java

-package com.yeejoin.amos.maintenance.common.enums;
-
-public enum LatentDangerTypeEnum {
-
-    无码检查("无码检查", 1),
-    计划检查("计划检查", 2),
-    无计划检查("无计划检查", 3),
-    随手拍("随手拍", 4);
-
-    /**
-     * 名称，描述
-     */
-    private String name;
-    /**
-     * 编码
-     */
-    private Integer code;
-
-    LatentDangerTypeEnum(String name, Integer code) {
-        this.name = name;
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public void setCode(Integer code) {
-        this.code = code;
-    }
-
-    public static String getEnumName(Integer code) {
-        String name = "";
-        for(LatentDangerTypeEnum type: LatentDangerTypeEnum.values()) {
-            if (type.getCode()==code) {
-                name = type.getName();
-                break;
-            }
-        }
-        return name;
-    }
-
-    public static LatentDangerTypeEnum getByCode(Integer code) {
-        for (LatentDangerTypeEnum l : LatentDangerTypeEnum.values()) {
-            if (code.equals(l.getCode())) {
-                return l;
-            }
-        }
-        return null;
-    }
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/common/enums/RiskFactorWorkFlowActionTypeEnum.java

-package com.yeejoin.amos.maintenance.common.enums;
-
-public enum RiskFactorWorkFlowActionTypeEnum {
-
-    通过("通过", 1),
-    拒绝("拒绝", 2),
-    终止流程("终止流程", 3),
-    唤起流程("唤起流程", 4),
-    重启流程("重启流程", 5);
-
-    private String desc;
-
-    private Integer actionType;
-
-    RiskFactorWorkFlowActionTypeEnum(String desc, Integer actionType) {
-        this.desc = desc;
-        this.actionType = actionType;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
-
-    public Integer getActionType() {
-        return actionType;
-    }
-
-    public void setActionType(Integer actionType) {
-        this.actionType = actionType;
-    }
-
-    public static RiskFactorWorkFlowActionTypeEnum getByActionType(Integer actionType) {
-        for (RiskFactorWorkFlowActionTypeEnum e : RiskFactorWorkFlowActionTypeEnum.values()) {
-            if (actionType.equals(e.actionType)) {
-                return e;
-            }
-        }
-        return null;
-    }
-}
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/common/enums/RiskFactorsCmStatusEnum.java

-package com.yeejoin.amos.maintenance.common.enums;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * 风险管控内容状态
- * @author maoying
- *
- */
-public enum RiskFactorsCmStatusEnum {
-	
-	Control("受控","1"),
-	outOfControl("失控","2"),
-	generalDanger("一般","3"),
-	majorDanger("重要","4");
-	/**
-	 * 名称，描述
-	 */
-	private String name;
-	/**
-	 * 编码
-	 */
-	private String code;
-	
-	private RiskFactorsCmStatusEnum(String name, String code){
-		this.name = name;
-		this.code = code;
-	}
-	
-	public static RiskFactorsCmStatusEnum getEnum(String code) {
-		RiskFactorsCmStatusEnum instance = null;
-		for(RiskFactorsCmStatusEnum type: RiskFactorsCmStatusEnum.values()) {
-			if (type.getCode().equals(code)) {
-				instance = type;
-				break;
-			}
-		}
-		
-		return instance;
-	}
-	
-	public static String getEnumName(String code) {
-		String name = "";
-		for(RiskFactorsCmStatusEnum type: RiskFactorsCmStatusEnum.values()) {
-			if (type.getCode().equals(code)) {
-				name = type.getName();
-				break;
-			}
-		}
-		
-		return name;
-	}
-	
-	public static List<Map<String,String>> getEnumList() {
-		List<Map<String,String>> list = new ArrayList<>();
-		for(RiskFactorsCmStatusEnum e : RiskFactorsCmStatusEnum.values()) {
-			Map<String, String> map = new HashMap<String, String>();
-			map.put("code", e.getCode());
-			map.put("name", e.getName());
-			list.add(map);
-		}
-		return list;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/common/enums/RiskJudgeTaskworkTypeEnum.java

-package com.yeejoin.amos.maintenance.common.enums;
-
-
-/**
- * 作业活动类型
- *
- * @author Administrator
- */
-public enum RiskJudgeTaskworkTypeEnum {
-
-    重大工艺操作(TaskworkTypeEnum.重大工艺操作,"danger_work_control_a"),
-    检维修作业(TaskworkTypeEnum.检维修作业, "danger_work_control_b"),
-    特殊动火作业(TaskworkTypeEnum.特殊动火作业, "danger_work_control_c"),
-    一级动火作业(TaskworkTypeEnum.一级动火作业, "danger_work_control_d"),
-    二级动火作业(TaskworkTypeEnum.二级动火作业, "danger_work_control_e"),
-    进入受限空间作业(TaskworkTypeEnum.进入受限空间作业, "danger_work_control_f");
-	
-    /**
-     * 名称，描述
-     */
-    private TaskworkTypeEnum eum;
-    
-    /**
-     * 编码
-     */
-    private String intemFlag;
-
-    private RiskJudgeTaskworkTypeEnum(TaskworkTypeEnum eum, String intemFlag) {
-    	this.setEum(eum);
-    	this.setIntemFlag(intemFlag);
-    }
-
-	public TaskworkTypeEnum getEum() {
-		return eum;
-	}
-
-	public void setEum(TaskworkTypeEnum eum) {
-		this.eum = eum;
-	}
-
-	public String getIntemFlag() {
-		return intemFlag;
-	}
-
-	public void setIntemFlag(String intemFlag) {
-		this.intemFlag = intemFlag;
-	}
-    
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/common/enums/RiskJudgmentSelectStatusEnum.java

-package com.yeejoin.amos.maintenance.common.enums;
-
-public enum RiskJudgmentSelectStatusEnum {
-    可控("可控", "1"),
-    不可控("不可控", "2");
-
-    /**
-     * 名称，描述
-     */
-    private String name;
-    /**
-     * 编码
-     */
-    private String code;
-
-    RiskJudgmentSelectStatusEnum(String name, String code) {
-        this.name = name;
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/common/enums/RiskJudgmentStatusEnum.java

-package com.yeejoin.amos.maintenance.common.enums;
-
-public enum RiskJudgmentStatusEnum {
-    未开始("未开始", 0),
-    进行中("进行中", 1),
-    已超时("已超时", 2),
-    已提交("已提交", 3);
-
-    /**
-     * 名称，描述
-     */
-    private String name;
-    /**
-     * 编码
-     */
-    private Integer code;
-
-    RiskJudgmentStatusEnum(String name, Integer code) {
-        this.name = name;
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public void setCode(Integer code) {
-        this.code = code;
-    }
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/common/enums/RiskJudgmentTaskStatusEnum.java

-package com.yeejoin.amos.maintenance.common.enums;
-
-public enum RiskJudgmentTaskStatusEnum {
-
-    未开始("未开始", 0),
-    进行中("进行中", 1),
-    已超时("已超时", 2),
-    已提交("已提交", 3),
-	已审核("已审核", 4),
-	已合并("已汇总", 5);
-
-    /**
-     * 名称，描述
-     */
-    private String name;
-    /**
-     * 编码
-     */
-    private Integer code;
-
-    RiskJudgmentTaskStatusEnum(String name, Integer code) {
-        this.name = name;
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public void setCode(Integer code) {
-        this.code = code;
-    }
-
-    public static RiskJudgmentTaskStatusEnum getByCode(Integer code) {
-        for (RiskJudgmentTaskStatusEnum l : RiskJudgmentTaskStatusEnum.values()) {
-            if (code.equals(l.getCode())) {
-                return l;
-            }
-        }
-        return null;
-    }
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/common/enums/WorkFlowDefinitionKeyEnum.java

-package com.yeejoin.amos.maintenance.common.enums;
-
-public enum WorkFlowDefinitionKeyEnum {
-
-    设备设施风险评级("设备设施风险评级", "1", "A"),
-    隐患治理流程("隐患治理流程", "2", "B"),
-    作业活动风险评级("作业活动风险评级", "3", "C"),
-    风险研判评审("风险研判评审", "4", "G");
-
-    private String desc;
-
-    private String key;
-
-    private String processDefinitionKey;
-
-    WorkFlowDefinitionKeyEnum(String desc, String key, String processDefinitionKey) {
-        this.desc = desc;
-        this.key = key;
-        this.processDefinitionKey = processDefinitionKey;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
-
-    public String getProcessDefinitionKey() {
-        return processDefinitionKey;
-    }
-
-    public void setProcessDefinitionKey(String processDefinitionKey) {
-        this.processDefinitionKey = processDefinitionKey;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public static WorkFlowDefinitionKeyEnum getByKey(String key) {
-        for (WorkFlowDefinitionKeyEnum w : WorkFlowDefinitionKeyEnum.values()) {
-            if (key.equals(w.key)) {
-                return w;
-            }
-        }
-        return null;
-    }
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/common/enums/WorkFlowRiskFactorUriEnum.java

-package com.yeejoin.amos.maintenance.common.enums;
-
-public enum WorkFlowRiskFactorUriEnum {
-
-    唤起流程("唤起流程", "/api/spcRiskFactor/flowCallBack", ""),
-    检查结果推送("检查结果推送", "/api/protal/data", ""),
-    隐患治理结果推送("隐患治理结果推送", "/api/protal/hiddentrouble", ""),
-    等级查询("等级查询", "/api/spcRiskLevel/listselect", "");
-
-    private String desc;
-
-    private String uri;
-
-    private String params;
-
-    WorkFlowRiskFactorUriEnum(String desc, String uri, String params) {
-        this.desc = desc;
-        this.uri = uri;
-        this.params = params;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
-
-    public String getUri() {
-        return uri;
-    }
-
-    public void setUri(String uri) {
-        this.uri = uri;
-    }
-
-    public String getParams() {
-        return params;
-    }
-
-    public void setParams(String params) {
-        this.params = params;
-    }
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/common/enums/WorkFlowUriEnum.java

-package com.yeejoin.amos.maintenance.common.enums;
-
-public enum WorkFlowUriEnum {
-
-    启动流程("启动流程", "/workflow/task/startTask", ""),
-    流程详情("流程详情", "/workflow/task/{taskId}", "taskId"),
-    合并启动流程("合并启动流程", "/workflow/task/startProcess", ""),
-    所有已执行任务详情("所有已执行任务详情","/workflow/activitiHistory/task/detail/{taskId}","taskId"),
-    流程任务("流程任务", "/workflow/task?processInstanceId={processInstanceId}", "processInstanceId"),
-    我的代办("我的代办", "/workflow/task/all-list?processDefinitionKey={processDefinitionKey}", "processDefinitionKey"),
-    我的代办有ID("我的代办有ID", "/workflow/task/all-list?processDefinitionKey={processDefinitionKey}&userId={userId}", "processDefinitionKey,userId"),
-    已执行任务("已执行任务", "/workflow/activitiHistory/all-historytasks?processDefinitionKey={processDefinitionKey}", "processDefinitionKey"),
-    已执行任务有ID("已执行任务有ID", "/workflow/activitiHistory/all-historytasks?processDefinitionKey={processDefinitionKey}&userId={userId}", "processDefinitionKey,userId"),
-    启动免登录流程("启动免登录流程", "/processes/{appKey}", "appKey"),
-    当前节点("当前节点", "/wf/taskstodo?processInstanceId={processInstanceId}", "processInstanceId"),
-    执行流程("执行流程", "/workflow/task/pickupAndCompleteTask/{taskId}", "taskId"),
-    终止流程("终止流程", "/wf/processes/{processInstanceId}?deleteReason={deleteReason}", "processInstanceId,deleteReason"),
-    当前子节点("当前子节点", "/wf/processes/{processInstanceId}/tasks?taskDefinitionKey={taskDefinitionKey}", "processInstanceId,taskDefinitionKey"),
-    工作流流水("工作流流水","/wf/processes/{processInstanceId}/tasks", "processInstanceId"),
-    子节点信息("子节点信息","/workflow/task/list/all/{instanceId}", "instanceId");
-
-    private String desc;
-
-    private String uri;
-
-    private String params;
-
-    WorkFlowUriEnum(String desc, String uri, String params) {
-        this.desc = desc;
-        this.uri = uri;
-        this.params = params;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
-
-    public String getUri() {
-        return uri;
-    }
-
-    public void setUri(String uri) {
-        this.uri = uri;
-    }
-
-    public String getParams() {
-        return params;
-    }
-
-    public void setParams(String params) {
-        this.params = params;
-    }
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/CheckController.java

@@ -194,7 +194,7 @@ public class CheckController extends AbstractBaseController {
     @ApiOperation(value = "保存巡检记录-mobile", notes = "保存巡检记录-mobile")
     @RequestMapping(value = "/saveRecord", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse saveCheckRecord(
-            @ApiParam(value = "检查信息") @RequestBody() CheckRecordParam requestParam) {
+            @ApiParam(value = "检查信息") @RequestBody CheckRecordParam requestParam) {
         try {
             ReginParams reginParams = getSelectedOrgInfo();
             String orgCode = getOrgCode(reginParams);

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/dao/mapper/CheckMapper.java

@@ -36,7 +36,7 @@ public interface CheckMapper extends BaseMapper {
 
 	List<PointCheckDetailBo> findCheckPointInputItem(@Param(value="checkId") long checkId);
 
-	int checkHasRecord(@Param(value = "planTaskId") Long planTaskId, @Param(value = "checkId") Long pointId);
+	int checkHasRecord(@Param(value = "planTaskId") Long planTaskId, @Param(value = "pointId") Long pointId);
 
 	List<Map<String, Object>> queryCheckPointImgs(@Param(value="planTaskId") int planTaskId, @Param(value="pointId") int pointId);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/param/CheckInputParam.java

 package com.yeejoin.amos.maintenance.business.param;
 
 import com.yeejoin.amos.maintenance.business.dto.CheckShotDto;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
@@ -9,6 +11,8 @@ import java.util.List;
  * @author DELL
  */
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class CheckInputParam {
 	private Long inputItemId;
 	private String inputValue;

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/param/CheckRecordParam.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.maintenance.business.param;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
@@ -10,6 +11,7 @@ import java.util.List;
  * @author DELL
  */
 @Data
+@NoArgsConstructor
 @ApiModel(value = "任务提交")
 public class CheckRecordParam {
 
@@ -19,7 +21,7 @@ public class CheckRecordParam {
     @ApiModelProperty(value = "点id", required = true)
     private Long pointId;
 
-    @ApiModelProperty(value = "任务id")
+    @ApiModelProperty(value = "任务id,非必输")
     private String orgCode;
 
     @ApiModelProperty(value = "备注")

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/CheckServiceImpl.java

@@ -224,6 +224,7 @@ public class CheckServiceImpl implements ICheckService {
             checkItemList.forEach(c -> {
                 c.getCheckShotList().forEach(s -> {
                     s.setCheckId(c.getCheckId());
+                    s.setOrgCode(recordParam.getOrgCode());
                     s.setCheckInputId(c.getId());
                 });
                 allShot.addAll(c.getCheckShotList());

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/PlanTaskServiceImpl.java

@@ -1027,6 +1027,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         facility.put("pointNo", point.getPointNo());
         facility.put("position", point.getBuildingName() + point.getAddress());
         facility.put("userName", planTask.getUserName());
+        facility.put("planTaskId", planTask.getId());
         facility.put("riskAndManage", point.getRemark());
         return facility;
     }

amos-boot-system-maintenance/src/main/resources/db/changelog/mt-1.0.0.xml

@@ -38,4 +38,13 @@
             ALTER TABLE p_point ADD COLUMN `building_name` varchar(255) DEFAULT NULL COMMENT '所在建筑名称' AFTER `building_id`;
         </sql>
     </changeSet>
+    <changeSet author="suhuiguang" id="1628747347004-3">
+        <preConditions onFail="MARK_RAN">
+            <columnExists tableName="p_check_shot" columnName="org_code"/>
+        </preConditions>
+        <comment>p_check_shot modify COLUMN org_code 需求变更</comment>
+        <sql>
+            ALTER TABLE p_check_shot modify `org_code` varchar(100) DEFAULT NULL COMMENT '权限系统org code';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

amos-boot-system-maintenance/src/main/resources/db/changelog/mt-sql-task.xml

@@ -8,7 +8,7 @@
 	<changeSet author="suhuiguang" id="1628836692856-1" runOnChange="true">
 		<createProcedure procedureName="updatePlanTask" >
 			DROP PROCEDURE IF EXISTS `updatePlanTask`;
-			CREATE PROCEDURE `updatePlanTask`(IN `planTaskId` int,IN `pointId` int,IN `planTaskDetailId` int,IN `executorId` int)
+			CREATE PROCEDURE `updatePlanTask`(IN `planTaskId` int,IN `pointId` int,IN `planTaskDetailId` int,IN `executorId` bigint)
 			BEGIN
 			declare num int ;
 			declare orgCode VARCHAR(50) ;