diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/FileInfoCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/FileInfoCO.java index 6b40d93..0ca2095 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/FileInfoCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/FileInfoCO.java @@ -1,7 +1,9 @@ package org.qinan.safetyeval.client.co; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; @@ -38,5 +40,7 @@ public class FileInfoCO { private String creatorName; @ApiModelProperty(value = "上传时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime createdTime; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgInfoCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgInfoCO.java index 2d60879..2936b7e 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgInfoCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgInfoCO.java @@ -1,10 +1,13 @@ package org.qinan.safetyeval.client.co; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; -import lombok.Data; /** * 机构信息CO(Client Object) @@ -153,5 +156,7 @@ public class OrgInfoCO { private Long orgId; @ApiModelProperty(value = "创建时间(开户时间)") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime createTime; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelChangeCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelChangeCO.java index f336693..4abdda9 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelChangeCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelChangeCO.java @@ -1,9 +1,11 @@ package org.qinan.safetyeval.client.co; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDate; -import java.time.LocalDateTime; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; /** * 人员变更记录CO(Client Object) @@ -23,6 +25,8 @@ public class OrgPersonnelChangeCO { private String changeItem; @ApiModelProperty(value = "变更时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime changeTime; @ApiModelProperty(value = "操作人姓名") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgResignApplyCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgResignApplyCO.java index 4119460..6100f74 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgResignApplyCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgResignApplyCO.java @@ -1,9 +1,12 @@ package org.qinan.safetyeval.client.co; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDate; import java.time.LocalDateTime; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; /** * 人员离职申请CO(Client Object) @@ -23,6 +26,8 @@ public class OrgResignApplyCO { private String applicantName; @ApiModelProperty(value = "申请时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime applyTime; @ApiModelProperty(value = "离职原因") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingCO.java index 26022c0..e1de879 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingCO.java @@ -1,9 +1,11 @@ package org.qinan.safetyeval.client.co; -import java.math.BigDecimal; - +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; /** * 资质备案申请CO(Client Object) @@ -104,9 +106,13 @@ public class QualFilingCO { private Long filingReviewId; @ApiModelProperty(value = "提交时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private java.time.LocalDateTime submitTime; @ApiModelProperty(value = "审核通过时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private java.time.LocalDateTime approveTime; @ApiModelProperty(value = "租户ID") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeHistoryItemCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeHistoryItemCO.java index a9e80fb..ddda3af 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeHistoryItemCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeHistoryItemCO.java @@ -1,7 +1,9 @@ package org.qinan.safetyeval.client.co; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import io.swagger.annotations.ApiModelProperty; +import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; @@ -18,6 +20,8 @@ public class QualFilingChangeHistoryItemCO { private String changeItemName; @ApiModelProperty(value = "变更时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime changeTime; @ApiModelProperty(value = "操作人") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeOrgCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeOrgCO.java index 8eef130..f98d612 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeOrgCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeOrgCO.java @@ -1,8 +1,11 @@ package org.qinan.safetyeval.client.co; -import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; /** * 备案变更机构端CO(Client Object) @@ -35,6 +38,8 @@ public class QualFilingChangeOrgCO { private String rejectReason; @ApiModelProperty(value = "提交时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private java.time.LocalDateTime submitTime; @ApiModelProperty(value = "备案地区编码") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/BasePageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/BasePageQuery.java index ce5231f..2fe23f2 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/BasePageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/BasePageQuery.java @@ -2,6 +2,7 @@ package org.qinan.safetyeval.client.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; @@ -26,8 +27,10 @@ public class BasePageQuery { private String orders; @ApiModelProperty(value = "开始时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime startTime; @ApiModelProperty(value = "结束时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime endTime; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelChangeAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelChangeAddCmd.java index b386ccd..f9fe393 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelChangeAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelChangeAddCmd.java @@ -1,9 +1,11 @@ package org.qinan.safetyeval.client.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDate; -import java.time.LocalDateTime; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; /** * 人员变更记录新增命令 @@ -17,6 +19,8 @@ public class OrgPersonnelChangeAddCmd { private String changeItem; @ApiModelProperty(value = "变更时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime changeTime; @ApiModelProperty(value = "操作人") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelChangeModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelChangeModifyCmd.java index 5c53135..a7c278c 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelChangeModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelChangeModifyCmd.java @@ -1,9 +1,11 @@ package org.qinan.safetyeval.client.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDate; -import java.time.LocalDateTime; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; /** * 人员变更记录修改命令 @@ -20,6 +22,8 @@ public class OrgPersonnelChangeModifyCmd { private String changeItem; @ApiModelProperty(value = "变更时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime changeTime; @ApiModelProperty(value = "操作人") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgResignApplyAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgResignApplyAddCmd.java index 2728670..236cc99 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgResignApplyAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgResignApplyAddCmd.java @@ -1,9 +1,12 @@ package org.qinan.safetyeval.client.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDate; import java.time.LocalDateTime; -import lombok.Data; /** * 人员离职申请新增命令 @@ -17,6 +20,8 @@ public class OrgResignApplyAddCmd { private String applicantName; @ApiModelProperty(value = "申请时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime applyTime; @ApiModelProperty(value = "离职原因") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgResignApplyModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgResignApplyModifyCmd.java index b8460ee..f2cba9a 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgResignApplyModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgResignApplyModifyCmd.java @@ -1,9 +1,12 @@ package org.qinan.safetyeval.client.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDate; import java.time.LocalDateTime; -import lombok.Data; /** * 人员离职申请修改命令 @@ -20,6 +23,8 @@ public class OrgResignApplyModifyCmd { private String applicantName; @ApiModelProperty(value = "申请时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime applyTime; @ApiModelProperty(value = "离职原因") diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java index fa540d3..7426a4a 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java @@ -116,6 +116,9 @@ public class QualFilingGatewayImpl implements QualFilingGateway { if (StringUtils.hasText(query.getFilingTerritoryCode())) { wrapper.eq(QualFilingDO::getFilingTerritoryCode, query.getFilingTerritoryCode()); } + if (Objects.nonNull(query.getApplyTypeCode())) { + wrapper.eq(QualFilingDO::getApplyTypeCode, query.getApplyTypeCode()); + } if (query.getSupervision()) { wrapper.ne(QualFilingDO::getFilingStatusCode, 5); }