job

safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java

@@ -466,7 +466,6 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
         // 人员清单
         List<QualFilingPersonnelChangeInfoCO> personnelList = qualFilingPersonnelChangeMapper.getFillingChangePersonInfo(changeFilingId);
         if (!CollectionUtils.isEmpty(personnelList)) {
-            setProfessionalCapabilityCodeList(personnelList);
             detail.setPersonnelList(personnelList);
         }
 

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

@@ -54,6 +54,7 @@ public class QualFilingPersonnelChangeInfoCO {
 
     @ApiModelProperty(value = "能力认定")
     private List<CapabilityAssessmentDTO> capabilityAssessment;
+
     @ApiModelProperty(value = "职称(多个逗号分隔)")
     private List<TitleCodeCo> titleCodeArr;
 
@@ -66,6 +67,9 @@ public class QualFilingPersonnelChangeInfoCO {
     @ApiModelProperty(value = "学历")
     private String educationName;
 
-    @ApiModelProperty(value = "是否管理人员")
+    @ApiModelProperty(value = "是否技术负责人(0否1是)")
     private Boolean technicalDirectorFlag;
+
+    @ApiModelProperty(value = "是否过程控制负责人(0否1是)")
+    private Boolean processControlLeaderFlag;
 }

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

@@ -3,7 +3,6 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.qinan.safetyeval.infrastructure.persistence.mapper.QualFilingPersonnelChangeMapper">
-
     <resultMap type="org.qinan.safetyeval.infrastructure.persistence.domainobject.QualFilingPersonnelChangeDO"
                id="QualFilingPersonnelChangeResult">
         <id property="id" column="id"/>
@@ -47,42 +46,42 @@
 
     <sql id="selectQualFilingPersonnelChange">
         select id,
-               filing_change_id,
+        filing_change_id,
-               source_personnel_id,
+        source_personnel_id,
-               person_name,
+        person_name,
-               person_type_code,
+        person_type_code,
-               position_name,
+        position_name,
-               title_code_arr,
+        title_code_arr,
-               gender_code,
+        gender_code,
-               gender_name,
+        gender_name,
-               birth_date,
+        birth_date,
-               join_work_date,
+        join_work_date,
-               id_card_no,
+        id_card_no,
-               current_address,
+        current_address,
-               office_address,
+        office_address,
-               education_code,
+        education_code,
-               education_name,
+        education_name,
-               graduate_school,
+        graduate_school,
-               major,
+        major,
-               qual_scope,
+        qual_scope,
-               publications,
+        publications,
-               professional_level_cert,
+        professional_level_cert,
-               register_engineer_flag,
+        register_engineer_flag,
-               ability_declaration,
+        ability_declaration,
-               work_experience,
+        work_experience,
-               proof_material_url,
+        proof_material_url,
-               delete_enum,
+        delete_enum,
-               remarks,
+        remarks,
-               create_name,
+        create_name,
-               update_name,
+        update_name,
-               tenant_id,
+        tenant_id,
-               org_id,
+        org_id,
-               version,
+        version,
-               create_time,
+        create_time,
-               update_time,
+        update_time,
-               create_id,
+        create_id,
-               update_id,
+        update_id,
-               env
+        env
         from qual_filing_personnel_change
     </sql>
 
@@ -96,17 +95,20 @@
 
     <select id="getFillingChangePersonInfo"
             resultMap="FilingPersonnelChangeInfoMap">
-        SELECT fp.source_personnel_id, fp.id, p.user_name personName, po.position_name, p.post_id, p.gender_code, p.gender_name
+        SELECT fp.source_personnel_id, fp.id, p.user_name personName, po.position_name, p.post_id, p.gender_code,
-             , p.title_code_arr, p.technical_director_flag, p.capability_assessment, p.education_name, bdm.professional_name  basicDisciplineMajorName
+        p.gender_name
-             , p.birth_date, p.register_engineer_flag, p.evaluator_cert_no, fp.filing_change_id, p.join_work_date, d.dept_name
+        , p.title_code_arr, p.technical_director_flag, p.process_control_leader_flag, p.capability_assessment
+        , p.education_name, bdm.professional_name basicDisciplineMajorName
+        , p.birth_date, p.register_engineer_flag, p.evaluator_cert_no, fp.filing_change_id, p.join_work_date,
+        d.dept_name
         FROM org_personnel p
         join qual_filing_personnel_change fp on p.id = fp.source_personnel_id
-        left join basic_discipline_major bdm on  p.basic_discipline_major_id = bdm.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_change_id = #{filingChangeId}
-          and fp.delete_enum = 'false'
+        and fp.delete_enum = 'false'
-          and p.delete_enum = 'false'
+        and p.delete_enum = 'false'
     </select>
 
     <!-- 根据备案ID查询管理人员，只返回 sourcePersonnelId 和 personName -->
@@ -116,8 +118,7 @@
         FROM qual_filing_personnel qfp
         JOIN org_personnel op ON qfp.source_personnel_id = op.id
         WHERE qfp.filing_id = #{filingId}
-          AND qfp.delete_enum = 'false'
+        AND qfp.delete_enum = 'false'
-          AND (op.technical_director_flag = 1 OR op.process_control_leader_flag = 1)
+        AND (op.technical_director_flag = 1 OR op.process_control_leader_flag = 1)
     </select>
-
 </mapper>