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

Merge remote-tracking branch 'origin/dev-tmp1' into dev-tmp1

dev-tmp1
luotaiqian 2026-08-11 14:07:41 +08:00
parent 1e48fb8cf3 083267633c
commit 9342ab42d3
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgInfoExecutor.java
View File

@ -1,28 +1,25 @@
package org.qinan.safetyeval.app.executor;
import com.alibaba.fastjson.JSON;
import org.qinan.safetyeval.app.convertor.OrgInfoConvertor;
import org.qinan.safetyeval.client.api.OrgInfoApi;
import org.qinan.safetyeval.client.dto.PageResponse;
import org.qinan.safetyeval.client.dto.SingleResponse;
import org.qinan.safetyeval.client.co.OrgInfoCO;
import org.qinan.safetyeval.client.co.OrgInfoSelectCO;
import org.qinan.safetyeval.client.dto.OrgInfoAddCmd;
import org.qinan.safetyeval.client.dto.OrgInfoModifyCmd;
import org.qinan.safetyeval.client.dto.OrgInfoPageQuery;
import org.qinan.safetyeval.client.dto.OrgInfoUpdateStateCmd;
import org.qinan.safetyeval.client.dto.*;
import org.qinan.safetyeval.domain.entity.OrgInfoEntity;
import org.qinan.safetyeval.domain.exception.BizException;
import org.qinan.safetyeval.domain.exception.ErrorCode;
import org.qinan.safetyeval.domain.query.OrgInfoQuery;
import org.qinan.safetyeval.domain.query.PageResult;
import org.qinan.safetyeval.domain.service.OrgInfoDomainService;
import org.qinan.safetyeval.app.convertor.OrgInfoConvertor;
import org.qinan.safetyeval.infrastructure.dataobject.AccountDO;
import org.qinan.safetyeval.infrastructure.mapper.AccountMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
@ -39,6 +36,8 @@ public class OrgInfoExecutor implements OrgInfoApi {
@Autowired
private OrgInfoConvertor orgInfoConvertor;
@Autowired
private AccountMapper accountMapper;
@Override
public SingleResponse<OrgInfoCO> add(OrgInfoAddCmd cmd) {
@ -248,6 +247,8 @@ public class OrgInfoExecutor implements OrgInfoApi {
}
OrgInfoCO co = new OrgInfoCO();
co.setId(entity.getId());
AccountDO accountDO = accountMapper.selectById(entity.getCreateId());
co.setAccount(Objects.isNull(accountDO) ? null : accountDO.getAccount());
co.setUnitName(entity.getUnitName());
co.setCreditCode(entity.getCreditCode());
co.setSafetyIndustryCategoryCode(entity.getSafetyIndustryCategoryCode());

2
safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgInfoCO.java
View File

@ -186,5 +186,7 @@ public class OrgInfoCO {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime;
@ApiModelProperty(value = "账号")
private String account;
}