version

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());

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;
 

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;
 

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;
 

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;
 

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;

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());

safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml

@@ -20,6 +20,7 @@
         <result column="education_name" property="educationName"/>
         <result column="graduate_school" property="graduateSchool"/>
         <result column="major" property="major"/>
+        <result column="basic_discipline_major_id" property="basicDisciplineMajorId"/>
         <result column="employment_status_code" property="employmentStatusCode"/>
         <result column="employment_status_name" property="employmentStatusName"/>
         <result column="delete_enum" property="deleteEnum"/>