waring
parent
3cd2c46ec2
commit
1cd112a05d
|
|
@ -6,6 +6,7 @@ import org.qinan.safetyeval.client.file.response.QualOnSiteReviewFileCo;
|
|||
import org.qinan.safetyeval.client.review.response.QualOnSiteReviewCo;
|
||||
import org.qinan.safetyeval.client.review.response.QualOnSiteReviewResultCo;
|
||||
import org.qinan.safetyeval.domain.constant.QualOnSiteReviewStatusEnum;
|
||||
import org.qinan.safetyeval.domain.gateway.OrgInfoGateway;
|
||||
import org.qinan.safetyeval.infrastructure.convertor.QualOnSiteReviewDoConvertor;
|
||||
import org.qinan.safetyeval.infrastructure.persistence.domainobject.QualOnSiteReviewDO;
|
||||
import org.qinan.safetyeval.infrastructure.persistence.queryservice.QualOnSiteReviewFileQueryService;
|
||||
|
|
@ -27,6 +28,7 @@ public class QualOnSiteReviewListQueryExe {
|
|||
private final QualOnSiteReviewQueryService qualOnSiteReviewQueryService;
|
||||
private final QualOnSiteReviewDoConvertor qualOnSiteReviewDoConvertor;
|
||||
private final QualOnSiteReviewFileQueryService qualOnSiteReviewFileQueryService;
|
||||
private final OrgInfoGateway orgInfoGateway;
|
||||
|
||||
/**
|
||||
* 根据ID查找资质现场核查对象
|
||||
|
|
@ -53,6 +55,7 @@ public class QualOnSiteReviewListQueryExe {
|
|||
QualOnSiteReviewResultCo resultCo = new QualOnSiteReviewResultCo();
|
||||
resultCo.setId(qualOnSiteReviewDO.getId());
|
||||
resultCo.setOrgId(qualOnSiteReviewDO.getOrgId());
|
||||
resultCo.setOrgName(orgInfoGateway.getUnitNameById(qualOnSiteReviewDO.getOrgId()));
|
||||
resultCo.setReviewDateStart(qualOnSiteReviewDO.getReviewDateStart());
|
||||
resultCo.setReviewLeader(qualOnSiteReviewDO.getReviewLeader());
|
||||
resultCo.setReviewOpinion(qualOnSiteReviewDO.getReviewOpinion());
|
||||
|
|
|
|||
|
|
@ -28,6 +28,9 @@ public class QualOnSiteReviewResultCo extends ClientObject implements Serializab
|
|||
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||
private Long orgId;
|
||||
|
||||
@ApiModelProperty(value = "受审查机构名称")
|
||||
private String orgName;
|
||||
|
||||
@ApiModelProperty(value = "现场审查日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private LocalDateTime reviewDateStart;
|
||||
|
|
|
|||
|
|
@ -39,4 +39,12 @@ public interface OrgInfoGateway {
|
|||
* @return 机构列表
|
||||
*/
|
||||
List<OrgInfoEntity> selectList();
|
||||
|
||||
/**
|
||||
* 根据机构ID查询单位名称(按需查询字段)
|
||||
*
|
||||
* @param id 机构ID
|
||||
* @return 单位名称
|
||||
*/
|
||||
String getUnitNameById(Long id);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -306,6 +306,18 @@ public class OrgInfoGatewayImpl implements OrgInfoGateway {
|
|||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUnitNameById(Long id) {
|
||||
if (id == null) {
|
||||
return null;
|
||||
}
|
||||
LambdaQueryWrapper<OrgInfoDO> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.select(OrgInfoDO::getUnitName)
|
||||
.eq(OrgInfoDO::getId, id);
|
||||
OrgInfoDO orgInfoDO = orgInfoMapper.selectOne(wrapper);
|
||||
return orgInfoDO == null ? null : orgInfoDO.getUnitName();
|
||||
}
|
||||
|
||||
private void syncGbsUser(String action, Runnable runnable) {
|
||||
try {
|
||||
runnable.run();
|
||||
|
|
|
|||
Loading…
Reference in New Issue