diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java index 821e47a..064df2d 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java @@ -32,11 +32,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -170,7 +166,6 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageSize(query.getSize()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); - domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); domainQuery.setFilingNo(query.getFilingNo()); domainQuery.setFilingStatusCode(query.getFilingStatusCode()); PageResult pageResult = qualFilingChangeDomainService.page(domainQuery); @@ -200,14 +195,12 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { .filter(Objects::nonNull) .distinct() .collect(Collectors.toList()); - if (!filingIds.isEmpty()) { - List countList = qualFilingChangeMapper.countByFilingIds(filingIds); - Map countMap = countList.stream() - .collect(Collectors.toMap( - QualFilingChangeCountDO::getFilingId, - QualFilingChangeCountDO::getChangeCount)); - records.forEach(co -> co.setChangeCount(countMap.getOrDefault(co.getFilingId(), 1L) - 1)); - } + List countList = qualFilingChangeMapper.countByFilingIds(filingIds); + Map countMap = countList.stream() + .collect(Collectors.toMap( + QualFilingChangeCountDO::getFilingId, + QualFilingChangeCountDO::getChangeCount)); + records.forEach(co -> co.setChangeCount(countMap.getOrDefault(co.getFilingId(), 1L) - 1)); } return PageResponse.of(records, result.getTotal()); diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeAddCmd.java index 26ca20a..cf0c3ef 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeAddCmd.java @@ -1,5 +1,7 @@ package org.qinan.safetyeval.client.change.request; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -69,11 +71,13 @@ public class QualFilingPersonnelChangeAddCmd implements Serializable { * 出生日期 */ @ApiModelProperty(value = "出生日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private LocalDateTime birthDate; /** * 参加工作时间 */ @ApiModelProperty(value = "参加工作时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private LocalDateTime joinWorkDate; /** * 身份证号