From 33acabdb773232f1ec1c094e32c66c32fa86ac2b Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 6 Sep 2023 11:20:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/service/impl/NcrTrackServiceImpl.java | 8 ++++---- .../main/java/com/jero/modules/project/vo/NcrTrackVO.java | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java index 77018c99f..1d696f64a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java @@ -347,18 +347,18 @@ public class NcrTrackServiceImpl extends ServiceImpl if(ComplianceFlowStatusEnum.INCONFORMITY.getCnName().equals(problemType) || ComplianceFlowStatusEnum.INCONFORMITY.getEnName().equals(problemType)){ if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){ - trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getCnName()); + trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getCnName()); }else{ - trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getEnName()); + trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getEnName()); } trackVO.setProblemState(ColourEnum.RED.getName()); } if(ComplianceFlowStatusEnum.TO_TRACK.getCnName().equals(problemType) ||ComplianceFlowStatusEnum.TO_TRACK.getEnName().equals(problemType)){ if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){ - trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getCnName()); + trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getCnName()); }else{ - trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getEnName()); + trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getEnName()); } trackVO.setProblemState(ColourEnum.YELLOW.getName()); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java index e52292cde..c2ccb89f7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java @@ -40,6 +40,11 @@ public class NcrTrackVO implements Serializable { @ApiModelProperty(value = "创建日期") private java.util.Date createTime; + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "修改日期") + private java.util.Date updateTime; + //中英文切换 private String cut;