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 0244b7be..3b2e93e0 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,9 +1,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 javax.validation.constraints.Size; @@ -42,8 +40,6 @@ 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 179492ba..62bc2ff0 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,10 +1,8 @@ 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; @@ -37,8 +35,6 @@ 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 644c5214..07528944 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,7 +3,6 @@ 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; @@ -40,8 +39,6 @@ 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 f6f93fec..ac9b6b4f 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,9 +1,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 javax.validation.constraints.Size; @@ -89,23 +87,15 @@ 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/RegulatorInspNoticeCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/regulator/RegulatorInspNoticeCO.java index 472311dc..60f54f52 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,8 +4,6 @@ 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 { @@ -44,8 +42,6 @@ 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("检查组长") @@ -70,13 +66,9 @@ 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 02b24055..c4f15cda 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,8 +6,6 @@ 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 { @@ -47,7 +45,5 @@ 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 3756c78b..e9bf99cd 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,8 +7,6 @@ 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 { @@ -49,7 +47,5 @@ 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; }