cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

job

dev-tmp1
luotaiqian 2026-08-14 15:45:03 +08:00
parent 9ac15c2ddf
commit b5799d8cdb
3 changed files with 52 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -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;
}

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

@ -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,
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
</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
, p.title_code_arr, p.technical_director_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
SELECT fp.source_personnel_id, fp.id, p.user_name personName, po.position_name, p.post_id, p.gender_code,
p.gender_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 p.delete_enum = 'false'
and fp.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 (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)
</select>
</mapper>