cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug orgId not send

dev
luotaiqian 2026-07-07 16:34:07 +08:00
parent bb1b58df2d
commit b2f7ea18b7
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java
View File

@ -32,11 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.*;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -170,7 +166,6 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageNum(query.getCurrent());
domainQuery.setPageSize(query.getSize()); domainQuery.setPageSize(query.getSize());
domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId()); domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId());
domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId());
domainQuery.setFilingNo(query.getFilingNo()); domainQuery.setFilingNo(query.getFilingNo());
domainQuery.setFilingStatusCode(query.getFilingStatusCode()); domainQuery.setFilingStatusCode(query.getFilingStatusCode());
PageResult<QualFilingChangeEntity> pageResult = qualFilingChangeDomainService.page(domainQuery); PageResult<QualFilingChangeEntity> pageResult = qualFilingChangeDomainService.page(domainQuery);
@ -200,14 +195,12 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
.filter(Objects::nonNull) .filter(Objects::nonNull)
.distinct() .distinct()
.collect(Collectors.toList()); .collect(Collectors.toList());
if (!filingIds.isEmpty()) { List<QualFilingChangeCountDO> countList = qualFilingChangeMapper.countByFilingIds(filingIds);
List<QualFilingChangeCountDO> countList = qualFilingChangeMapper.countByFilingIds(filingIds); Map<Long, Long> countMap = countList.stream()
Map<Long, Long> countMap = countList.stream() .collect(Collectors.toMap(
.collect(Collectors.toMap( QualFilingChangeCountDO::getFilingId,
QualFilingChangeCountDO::getFilingId, QualFilingChangeCountDO::getChangeCount));
QualFilingChangeCountDO::getChangeCount)); records.forEach(co -> co.setChangeCount(countMap.getOrDefault(co.getFilingId(), 1L) - 1));
records.forEach(co -> co.setChangeCount(countMap.getOrDefault(co.getFilingId(), 1L) - 1));
}
} }
return PageResponse.of(records, result.getTotal()); return PageResponse.of(records, result.getTotal());

4
safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeAddCmd.java
View File

@ -1,5 +1,7 @@
package org.qinan.safetyeval.client.change.request; 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 io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -69,11 +71,13 @@ public class QualFilingPersonnelChangeAddCmd implements Serializable {
* 出生日期 * 出生日期
*/ */
@ApiModelProperty(value = "出生日期") @ApiModelProperty(value = "出生日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDateTime birthDate; private LocalDateTime birthDate;
/** /**
* 参加工作时间 * 参加工作时间
*/ */
@ApiModelProperty(value = "参加工作时间") @ApiModelProperty(value = "参加工作时间")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDateTime joinWorkDate; private LocalDateTime joinWorkDate;
/** /**
* 身份证号 * 身份证号