diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java index c0474b20..2b681ca4 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java @@ -466,7 +466,6 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { // 人员清单 List personnelList = qualFilingPersonnelChangeMapper.getFillingChangePersonInfo(changeFilingId); if (!CollectionUtils.isEmpty(personnelList)) { - setProfessionalCapabilityCodeList(personnelList); detail.setPersonnelList(personnelList); } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelChangeInfoCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelChangeInfoCO.java index 37d33041..8517a264 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelChangeInfoCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelChangeInfoCO.java @@ -54,6 +54,7 @@ public class QualFilingPersonnelChangeInfoCO { @ApiModelProperty(value = "能力认定") private List capabilityAssessment; + @ApiModelProperty(value = "职称(多个逗号分隔)") private List 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; } diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml index 35e5e3a5..37a7820a 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml +++ b/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"> - @@ -47,42 +46,42 @@ select id, - filing_change_id, - source_personnel_id, - person_name, - person_type_code, - position_name, - title_code_arr, - gender_code, - gender_name, - birth_date, - join_work_date, - id_card_no, - current_address, - office_address, - education_code, - education_name, - graduate_school, - major, - qual_scope, - publications, - professional_level_cert, - register_engineer_flag, - ability_declaration, - work_experience, - proof_material_url, - delete_enum, - remarks, - create_name, - update_name, - tenant_id, - org_id, - version, - create_time, - update_time, - create_id, - update_id, - env + filing_change_id, + source_personnel_id, + person_name, + person_type_code, + position_name, + title_code_arr, + gender_code, + gender_name, + birth_date, + join_work_date, + id_card_no, + current_address, + office_address, + education_code, + education_name, + graduate_school, + major, + qual_scope, + publications, + professional_level_cert, + register_engineer_flag, + ability_declaration, + work_experience, + proof_material_url, + delete_enum, + remarks, + create_name, + update_name, + tenant_id, + org_id, + version, + create_time, + update_time, + create_id, + update_id, + env from qual_filing_personnel_change @@ -96,17 +95,20 @@ @@ -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 (op.technical_director_flag = 1 OR op.process_control_leader_flag = 1) + AND qfp.delete_enum = 'false' + AND (op.technical_director_flag = 1 OR op.process_control_leader_flag = 1) - \ No newline at end of file