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 16:34:12 +08:00
parent e11f0c992b 6fc7090770
commit 77db971e2d
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,8 @@ package org.qinan.safetyeval.client.co;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.qinan.safetyeval.domain.entity.CapabilityAssessmentDTO;
import org.qinan.safetyeval.domain.entity.TitleCodeCo;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.List; import java.util.List;
@ -50,11 +52,10 @@ public class QualFilingPersonnelChangeInfoCO {
@ApiModelProperty(value = "参加工作日期") @ApiModelProperty(value = "参加工作日期")
private LocalDate joinWorkDate; private LocalDate joinWorkDate;
@ApiModelProperty(value = "参加工作日期") @ApiModelProperty(value = "能力认定")
private String titleCodeArr; private List<CapabilityAssessmentDTO> capabilityAssessment;
@ApiModelProperty(value = "职称(多个逗号分隔)")
@ApiModelProperty(value = "参加工作日期") private List<TitleCodeCo> titleCodeArr;
private String capabilityAssessment;
@ApiModelProperty(value = "能力codeList") @ApiModelProperty(value = "能力codeList")
private List<String> professionalCapabilityCodeList; private List<String> professionalCapabilityCodeList;

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

@ -86,8 +86,16 @@
from qual_filing_personnel_change from qual_filing_personnel_change
</sql> </sql>
<!-- 资质备案人员分页查询 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="getFillingChangePersonInfo" <select id="getFillingChangePersonInfo"
resultType="org.qinan.safetyeval.client.co.QualFilingPersonnelChangeInfoCO"> 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 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.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 , p.birth_date, p.register_engineer_flag, p.evaluator_cert_no, fp.filing_change_id, p.join_work_date, d.dept_name