diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangeAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangeAddCmd.java index 3b2e93e0..0244b7be 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangeAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangeAddCmd.java @@ -1,7 +1,9 @@ package org.qinan.safetyeval.client.change.request; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; @@ -40,6 +42,8 @@ public class QualFilingCommitmentChangeAddCmd implements Serializable { * 签署日期 */ @ApiModelProperty(value = "签署日期") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime signDate; /** * 法定代表人机构人员id diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangePageQry.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangePageQry.java index 62bc2ff0..179492ba 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangePageQry.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangePageQry.java @@ -1,8 +1,10 @@ package org.qinan.safetyeval.client.change.request; import com.alibaba.cola.dto.PageQuery; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; @@ -35,6 +37,8 @@ public class QualFilingCommitmentChangePageQry extends PageQuery { * 签署日期 */ @ApiModelProperty(value = "签署日期") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime signDate; /** * 法定代表人机构人员id diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangeUpdateCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangeUpdateCmd.java index 07528944..644c5214 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangeUpdateCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangeUpdateCmd.java @@ -3,6 +3,7 @@ package org.qinan.safetyeval.client.change.request; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -39,6 +40,8 @@ public class QualFilingCommitmentChangeUpdateCmd implements Serializable { * 签署日期 */ @ApiModelProperty(value = "签署日期") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime signDate; /** * 法定代表人机构人员id diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeAddCmd.java index d24e66ef..f6f93fec 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeAddCmd.java @@ -1,7 +1,9 @@ package org.qinan.safetyeval.client.change.request; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; @@ -88,16 +90,22 @@ public class QualFilingPersonnelCertChangeAddCmd implements Serializable { * 证书有效开始日期 */ @ApiModelProperty(value = "证书有效开始日期") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime validStartDate; /** * 证书有效结束日期 */ @ApiModelProperty(value = "证书有效结束日期") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime validEndDate; /** * 复核日期 */ @ApiModelProperty(value = "复核日期") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime reviewDate; /** * 证书附件地址 diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/regulator/RegulatorEvalSurveyClockInCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/regulator/RegulatorEvalSurveyClockInCO.java index b8d8e8cd..d5e2d4b3 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/regulator/RegulatorEvalSurveyClockInCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/regulator/RegulatorEvalSurveyClockInCO.java @@ -1,7 +1,9 @@ package org.qinan.safetyeval.client.co.regulator; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; @@ -27,9 +29,13 @@ public class RegulatorEvalSurveyClockInCO { private Integer gpsState; @ApiModelProperty("签到时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime singInTime; @ApiModelProperty("签退时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime signOutTime; @ApiModelProperty("现场照片") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/regulator/RegulatorInspNoticeCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/regulator/RegulatorInspNoticeCO.java index 60f54f52..472311dc 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/regulator/RegulatorInspNoticeCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/regulator/RegulatorInspNoticeCO.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.time.LocalDateTime; +import org.springframework.format.annotation.DateTimeFormat; +import com.fasterxml.jackson.annotation.JsonFormat; @Data public class RegulatorInspNoticeCO { @@ -42,6 +44,8 @@ public class RegulatorInspNoticeCO { private String projectId; @ApiModelProperty("计划检查时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime planInspTime; @ApiModelProperty("检查组长") @@ -66,9 +70,13 @@ public class RegulatorInspNoticeCO { private Integer feedbackFlag; @ApiModelProperty("确认时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime confirmTime; @ApiModelProperty("下发时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime sendTime; @ApiModelProperty(value = "检查结果编码:1未发现问题/合格 2责令整改/不合格 3转入风险预警/限期整改", example = "1") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/regulator/RegulatorOrgProfileScoreModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/regulator/RegulatorOrgProfileScoreModifyCmd.java index c4f15cda..02b24055 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/regulator/RegulatorOrgProfileScoreModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/regulator/RegulatorOrgProfileScoreModifyCmd.java @@ -6,6 +6,8 @@ import lombok.Data; import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.time.LocalDateTime; +import org.springframework.format.annotation.DateTimeFormat; +import com.fasterxml.jackson.annotation.JsonFormat; @Data public class RegulatorOrgProfileScoreModifyCmd { @@ -45,5 +47,7 @@ public class RegulatorOrgProfileScoreModifyCmd { private String metricJson; @ApiModelProperty("计算时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime calcTime; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/regulator/RegulatorOrgProfileScoreSaveCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/regulator/RegulatorOrgProfileScoreSaveCmd.java index e9bf99cd..3756c78b 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/regulator/RegulatorOrgProfileScoreSaveCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/regulator/RegulatorOrgProfileScoreSaveCmd.java @@ -7,6 +7,8 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.time.LocalDateTime; +import org.springframework.format.annotation.DateTimeFormat; +import com.fasterxml.jackson.annotation.JsonFormat; @Data public class RegulatorOrgProfileScoreSaveCmd { @@ -47,5 +49,7 @@ public class RegulatorOrgProfileScoreSaveCmd { private String metricJson; @ApiModelProperty("计算时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime calcTime; }