diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/convertor/OrgPersonnelConvertor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/convertor/OrgPersonnelConvertor.java index 8e25b3e..c4f57f0 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/convertor/OrgPersonnelConvertor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/convertor/OrgPersonnelConvertor.java @@ -18,6 +18,7 @@ public interface OrgPersonnelConvertor { */ @Mapping(target = "deptName", ignore = true) @Mapping(target = "postName", ignore = true) + @Mapping(target = "basicDisciplineMajorName", ignore = true) @Mapping(target = "certNames", ignore = true) @Mapping(target = "changeCount", ignore = true) @Mapping(target = "resignApplyId", ignore = true) diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelViewEnricher.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelViewEnricher.java index f6f984c..f766d09 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelViewEnricher.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelViewEnricher.java @@ -2,18 +2,10 @@ package org.qinan.safetyeval.app.support; import org.qinan.safetyeval.client.co.OrgPersonnelCO; import org.qinan.safetyeval.client.co.OrgResignApplyCO; -import org.qinan.safetyeval.domain.entity.OrgDepartmentEntity; -import org.qinan.safetyeval.domain.entity.OrgPersonnelCertEntity; -import org.qinan.safetyeval.domain.entity.OrgPersonnelChangeEntity; -import org.qinan.safetyeval.domain.entity.OrgPersonnelEntity; -import org.qinan.safetyeval.domain.entity.OrgPositionEntity; -import org.qinan.safetyeval.domain.entity.OrgResignApplyEntity; -import org.qinan.safetyeval.domain.gateway.OrgDepartmentGateway; -import org.qinan.safetyeval.domain.gateway.OrgPersonnelCertGateway; -import org.qinan.safetyeval.domain.gateway.OrgPersonnelChangeGateway; -import org.qinan.safetyeval.domain.gateway.OrgPersonnelGateway; -import org.qinan.safetyeval.domain.gateway.OrgPositionGateway; -import org.qinan.safetyeval.domain.gateway.OrgResignApplyGateway; +import org.qinan.safetyeval.domain.entity.*; +import org.qinan.safetyeval.domain.gateway.*; +import org.qinan.safetyeval.domain.major.gateway.BasicDisciplineMajorGateway; +import org.qinan.safetyeval.domain.major.model.BasicDisciplineMajorE; import org.qinan.safetyeval.domain.query.OrgPersonnelCertQuery; import org.qinan.safetyeval.domain.query.PageResult; import org.springframework.beans.factory.annotation.Autowired; @@ -47,6 +39,9 @@ public class OrgPersonnelViewEnricher { @Autowired(required = false) private OrgResignApplyGateway orgResignApplyGateway; + @Autowired + private BasicDisciplineMajorGateway basicDisciplineMajorGateway; + public void enrichPersonnel(OrgPersonnelCO co) { if (co == null) { return; @@ -63,6 +58,10 @@ public class OrgPersonnelViewEnricher { co.setPostName(position.getPositionName()); } } + if (co.getBasicDisciplineMajorId() != null) { + BasicDisciplineMajorE major = basicDisciplineMajorGateway.getById(co.getBasicDisciplineMajorId()); + co.setBasicDisciplineMajorName(major != null ? major.getProfessionalName() : null); + } if (co.getId() != null) { if (orgPersonnelCertGateway != null) { OrgPersonnelCertQuery certQuery = new OrgPersonnelCertQuery(); diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCO.java index f8a546e..bcf5d42 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCO.java @@ -66,6 +66,9 @@ public class OrgPersonnelCO { @ApiModelProperty(value = "学科基础专业对照表id") private Long basicDisciplineMajorId; + @ApiModelProperty(value = "学科基础专业对照表name") + private String basicDisciplineMajorName; + @ApiModelProperty(value = "就职状态编码(1在职2离职)") private Integer employmentStatusCode; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/major/gateway/BasicDisciplineMajorGateway.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/major/gateway/BasicDisciplineMajorGateway.java index 3d0d804..8b3f36a 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/major/gateway/BasicDisciplineMajorGateway.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/major/gateway/BasicDisciplineMajorGateway.java @@ -45,6 +45,14 @@ public interface BasicDisciplineMajorGateway { */ Boolean deletedBasicDisciplineMajorByIds(Long[] ids); + /** + * 根据ID查找基础学科专业 + * + * @param id 基础学科专业ID + * @return 基础学科专业 + */ + BasicDisciplineMajorE getById(Long id); + /** * 按专业名称集合批量精确查询未删除的基础学科专业(用于导入名称解析)。 * diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/BasicDisciplineMajorGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/BasicDisciplineMajorGatewayImpl.java index fabd08b..49df70d 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/BasicDisciplineMajorGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/BasicDisciplineMajorGatewayImpl.java @@ -50,6 +50,12 @@ public class BasicDisciplineMajorGatewayImpl implements BasicDisciplineMajorGate return basicDisciplineMajorRepository.deletedBasicDisciplineMajorById(id); } + @Override + public BasicDisciplineMajorE getById(Long id) { + BasicDisciplineMajorDO basicDisciplineMajorDO = basicDisciplineMajorRepository.getById(id); + return basicDisciplineMajorDO == null ? null : basicDisciplineMajorDoConvertor.convertDoToEe(basicDisciplineMajorDO); + } + @Override public Boolean deletedBasicDisciplineMajorByIds(Long[] ids) { return basicDisciplineMajorRepository.deletedBasicDisciplineMajorByIds(ids);