From ba4706cc6690b0de26481b8325e7664b788bbda7 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Tue, 14 Jul 2026 14:58:07 +0800 Subject: [PATCH] version --- .../qinan/safetyeval/app/executor/OrgPersonnelExecutor.java | 1 + .../java/org/qinan/safetyeval/client/co/OrgPersonnelCO.java | 3 +++ .../org/qinan/safetyeval/client/dto/OrgPersonnelAddCmd.java | 3 +++ .../org/qinan/safetyeval/client/dto/OrgPersonnelModifyCmd.java | 3 +++ .../org/qinan/safetyeval/domain/entity/OrgPersonnelEntity.java | 3 +++ .../safetyeval/infrastructure/dataobject/OrgPersonnelDO.java | 1 + .../infrastructure/gatewayimpl/OrgPersonnelGatewayImpl.java | 1 + .../src/main/resources/mapper/OrgPersonnelMapper.xml | 1 + 8 files changed, 16 insertions(+) diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java index e41d924..da7086b 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java @@ -242,6 +242,7 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi { } private void applyPersonnelExtFields(OrgPersonnelEntity entity, OrgPersonnelModifyCmd cmd) { + entity.setBasicDisciplineMajorId(cmd.getBasicDisciplineMajorId()); entity.setPersonTypeCode(cmd.getPersonTypeCode()); entity.setPersonTypeName(cmd.getPersonTypeName()); entity.setQualScope(cmd.getQualScope()); 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 f498abc..778fb12 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 @@ -60,6 +60,9 @@ public class OrgPersonnelCO { @ApiModelProperty(value = "专业") private String major; + @ApiModelProperty(value = "学科基础专业对照表id") + private Long basicDisciplineMajorId; + @ApiModelProperty(value = "就职状态编码(1在职2离职)") private Integer employmentStatusCode; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelAddCmd.java index 78ae5ed..a14d336 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelAddCmd.java @@ -65,6 +65,9 @@ public class OrgPersonnelAddCmd { @ApiModelProperty(value = "专业") private String major; + @ApiModelProperty(value = "学科基础专业对照表id") + private Long basicDisciplineMajorId; + @ApiModelProperty(value = "就职状态编码(1在职2离职)") private Integer employmentStatusCode; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelModifyCmd.java index 89c037c..312f468 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelModifyCmd.java @@ -68,6 +68,9 @@ public class OrgPersonnelModifyCmd { @ApiModelProperty(value = "专业") private String major; + @ApiModelProperty(value = "学科基础专业对照表id") + private Long basicDisciplineMajorId; + @ApiModelProperty(value = "就职状态编码(1在职2离职)") private Integer employmentStatusCode; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgPersonnelEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgPersonnelEntity.java index cfa37d8..8de1b25 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgPersonnelEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgPersonnelEntity.java @@ -63,6 +63,9 @@ public class OrgPersonnelEntity { /** 专业 */ private String major; + /** 学科基础专业对照表id */ + private Long basicDisciplineMajorId; + /** 就职状态编码 */ private Integer employmentStatusCode; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgPersonnelDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgPersonnelDO.java index fd01ff8..711397a 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgPersonnelDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgPersonnelDO.java @@ -33,6 +33,7 @@ public class OrgPersonnelDO { private String educationName; private String graduateSchool; private String major; + private Long basicDisciplineMajorId; private Integer employmentStatusCode; private String employmentStatusName; private String personTypeCode; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgPersonnelGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgPersonnelGatewayImpl.java index 4cad5f0..623ea8c 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgPersonnelGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgPersonnelGatewayImpl.java @@ -224,6 +224,7 @@ public class OrgPersonnelGatewayImpl implements OrgPersonnelGateway { entity.setEducationName(dataObject.getEducationName()); entity.setGraduateSchool(dataObject.getGraduateSchool()); entity.setMajor(dataObject.getMajor()); + entity.setBasicDisciplineMajorId(dataObject.getBasicDisciplineMajorId()); entity.setEmploymentStatusCode(dataObject.getEmploymentStatusCode()); entity.setEmploymentStatusName(dataObject.getEmploymentStatusName()); entity.setPersonTypeCode(dataObject.getPersonTypeCode()); diff --git a/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml index 08e07ae..ed03a10 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml @@ -20,6 +20,7 @@ +