upgrade

safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelInfoCO.java

@@ -64,6 +64,12 @@ public class QualFilingPersonnelInfoCO {
     @ApiModelProperty(value = "参加工作日期")
     private LocalDate joinWorkDate;
 
+    @ApiModelProperty(value = "专业")
+    private String basicDisciplineMajorName;
+
+    @ApiModelProperty(value = "学历")
+    private String educationName;
+
     @ApiModelProperty(value = "能力codeList")
     private List<PersonnelCertFilingPageCO> personnelCertFilingPageCOList;
 

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

@@ -61,8 +61,10 @@
              , p.title_code_arr, p.capability_assessment
              , p.birth_date, p.register_engineer_flag, p.technical_director_flag, p.process_control_leader_flag
         , p.evaluator_cert_no,fp.filing_id, p.join_work_date,d.dept_name
+        ,p.education_name,bdm.professional_name  basicDisciplineMajorName
         FROM org_personnel p
         join qual_filing_personnel fp on p.id = fp.source_personnel_id
+        left join basic_discipline_major bdm on  p.basic_discipline_major_id = bdm.id
         left join org_department d on p.dept_id  = d.id and d.delete_enum = 'false'
         left join org_position po on po.id = p.post_id and po.delete_enum = 'false'
         WHERE fp.filing_id = #{fillingId}