Commit 61375970 authored by tianbo's avatar tianbo

隐患bug修改

parent 1c44822a
...@@ -109,7 +109,7 @@ public enum LatentDangerExcuteTypeEnum { ...@@ -109,7 +109,7 @@ public enum LatentDangerExcuteTypeEnum {
public static LatentDangerExcuteTypeEnum getByCode(Integer code) { public static LatentDangerExcuteTypeEnum getByCode(Integer code) {
for (LatentDangerExcuteTypeEnum e : LatentDangerExcuteTypeEnum.values()) { for (LatentDangerExcuteTypeEnum e : LatentDangerExcuteTypeEnum.values()) {
if (code.equals(e.getCode())) { if (e.getCode().equals(code)) {
return e; return e;
} }
} }
......
...@@ -1240,14 +1240,14 @@ public class LatentDangerServiceImpl implements ILatentDangerService { ...@@ -1240,14 +1240,14 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
latentDangerBo.setReformType(LatentDangerReformTypeEnum.常规整改.getCode().toString()); latentDangerBo.setReformType(LatentDangerReformTypeEnum.常规整改.getCode().toString());
latentDangerBo.setReformJson(executeParam.getFlowJson().toJSONString()); latentDangerBo.setReformJson(executeParam.getFlowJson().toJSONString());
latentDangerBo.setInferOtherThings(executeParam.getInferOtherThings()); latentDangerBo.setInferOtherThings(executeParam.getInferOtherThings());
latentDangerBo.setProblemDescription(executeParam.getReasonAnalysis()); latentDangerBo.setProblemDescription(executeParam.getRemark());
latentDangerBo.setReasonAnalysis(executeParam.getRemark()); latentDangerBo.setReasonAnalysis(executeParam.getReasonAnalysis());
} else if (executeTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患延期治理)) { } else if (executeTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患延期治理)) {
latentDangerBo.setReformType(LatentDangerReformTypeEnum.延期治理.getCode().toString()); latentDangerBo.setReformType(LatentDangerReformTypeEnum.延期治理.getCode().toString());
latentDangerBo.setReformJson(executeParam.getFlowJson().toJSONString()); latentDangerBo.setReformJson(executeParam.getFlowJson().toJSONString());
latentDangerBo.setInferOtherThings(executeParam.getInferOtherThings()); latentDangerBo.setInferOtherThings(executeParam.getInferOtherThings());
latentDangerBo.setProblemDescription(executeParam.getReasonAnalysis()); latentDangerBo.setProblemDescription(executeParam.getRemark());
latentDangerBo.setReasonAnalysis(executeParam.getRemark()); latentDangerBo.setReasonAnalysis(executeParam.getReasonAnalysis());
latentDangerBo.setDelayLimitDate(DateUtil.str2Date(executeParam.getDelayLimitDate(), DateUtil.DATETIME_DEFAULT_FORMAT)); latentDangerBo.setDelayLimitDate(DateUtil.str2Date(executeParam.getDelayLimitDate(), DateUtil.DATETIME_DEFAULT_FORMAT));
} }
if (executeTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患评审通过)) { if (executeTypeEnum.equals(LatentDangerExcuteTypeEnum.隐患评审通过)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment