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

Merge remote-tracking branch 'origin/dev-tmp1' into dev-tmp1

dev-tmp1
luotaiqian 2026-08-10 14:03:35 +08:00
parent ae2377bba2 258d2e92a1
commit a80def8d0b
4 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelCertCO.java
View File

@ -1,8 +1,12 @@
package org.qinan.safetyeval.client.co;
import java.time.LocalDate;
import lombok.Data;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.qinan.safetyeval.domain.entity.CapabilityAssessmentDTO;
import org.qinan.safetyeval.domain.entity.TitleCodeCo;
import java.time.LocalDate;
import java.util.List;
/**
* 备案申请人员证书CO（Client Object）
@ -71,4 +75,10 @@ public class QualFilingPersonnelCertCO {
@ApiModelProperty(value = "租户ID")
private Long tenantId;
@ApiModelProperty(value = "职称(多个逗号分隔)")
private List<TitleCodeCo> titleCodeArr;
@ApiModelProperty(value = "能力认定")
private List<CapabilityAssessmentDTO> capabilityAssessment;
}

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

@ -50,6 +50,12 @@ public class QualFilingPersonnelChangeInfoCO {
@ApiModelProperty(value = "参加工作日期")
private LocalDate joinWorkDate;
@ApiModelProperty(value = "参加工作日期")
private String titleCodeArr;
@ApiModelProperty(value = "参加工作日期")
private String capabilityAssessment;
@ApiModelProperty(value = "能力codeList")
private List<String> professionalCapabilityCodeList;
}

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

@ -89,6 +89,7 @@
<select id="getFillingChangePersonInfo"
resultType="org.qinan.safetyeval.client.co.QualFilingPersonnelChangeInfoCO">
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.capability_assessment
, 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

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

@ -48,8 +48,17 @@
`id`, `filing_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`
</sql>
<select id="getFillingPersonInfo" resultType="org.qinan.safetyeval.client.co.QualFilingPersonnelInfoCO">
<!-- 资质备案人员分页查询 resultMap -->
<resultMap id="FilingPersonnelInfoMap" type="org.qinan.safetyeval.client.co.QualFilingPersonnelInfoCO">
<result column="capability_assessment" property="capabilityAssessment"
typeHandler="org.qinan.safetyeval.infrastructure.handler.CapabilityAssessmentListTypeHandler"/>
<result column="title_code_arr" property="titleCodeArr"
typeHandler="org.qinan.safetyeval.infrastructure.handler.TitleCodeListTypeHandler"/>
</resultMap>
<select id="getFillingPersonInfo" resultMap="FilingPersonnelInfoMap">
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.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
FROM org_personnel p