WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加参数

Browse Source
This commit is contained in:
zhn
2023-09-06 11:20:50 +08:00
parent c5c1d3cf4e
commit 33acabdb77
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
+4 -4
View File
@@ -347,18 +347,18 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
if(ComplianceFlowStatusEnum.INCONFORMITY.getCnName().equals(problemType) if(ComplianceFlowStatusEnum.INCONFORMITY.getCnName().equals(problemType)
|| ComplianceFlowStatusEnum.INCONFORMITY.getEnName().equals(problemType)){ || ComplianceFlowStatusEnum.INCONFORMITY.getEnName().equals(problemType)){
if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){ if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){
trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getCnName()); trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getCnName());
}else{ }else{
trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getEnName()); trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getEnName());
} }
trackVO.setProblemState(ColourEnum.RED.getName()); trackVO.setProblemState(ColourEnum.RED.getName());
} }
if(ComplianceFlowStatusEnum.TO_TRACK.getCnName().equals(problemType) if(ComplianceFlowStatusEnum.TO_TRACK.getCnName().equals(problemType)
||ComplianceFlowStatusEnum.TO_TRACK.getEnName().equals(problemType)){ ||ComplianceFlowStatusEnum.TO_TRACK.getEnName().equals(problemType)){
if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){ if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){
trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getCnName()); trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getCnName());
}else{ }else{
trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getEnName()); trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getEnName());
} }
trackVO.setProblemState(ColourEnum.YELLOW.getName()); trackVO.setProblemState(ColourEnum.YELLOW.getName());
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
+5
View File
@@ -40,6 +40,11 @@ public class NcrTrackVO implements Serializable {
@ApiModelProperty(value = "创建日期") @ApiModelProperty(value = "创建日期")
private java.util.Date createTime; 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; private String cut;