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

upgrade

dev-tmp1
luotaiqian 2026-08-08 15:05:40 +08:00
parent 2cc00b3c53
commit 6be9868207
5 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,12 @@ public class QualFilingPersonnelInfoCO {
@ApiModelProperty(value = "是否注册安全工程师(1是2否)")
private Integer registerEngineerFlag;
@ApiModelProperty(value = "是否技术负责人(0否1是)")
private Integer technicalDirectorFlag;
@ApiModelProperty(value = "是否过程控制负责人(0否1是)")
private Integer processControlLeaderFlag;
@ApiModelProperty(value = "评价师证书编号")
private String evaluatorCertNo;

3
safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgFilingPersonnelPageQuery.java
View File

@ -18,4 +18,7 @@ public class OrgFilingPersonnelPageQuery extends BasePageQuery {
@ApiModelProperty(value = "人员姓名")
private String personName;
@ApiModelProperty(value = "是否管理人员")
private Boolean managementFlag;
}

1
safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/CapabilityAssessmentDTO.java
View File

@ -17,7 +17,6 @@ public class CapabilityAssessmentDTO implements Serializable {
/**
* 专业能力编码，取值见
* {@link org.qinan.safetyeval.domain.constant.basic.ProfessionalCapabilityEnum}
* {@link org.qinan.safetyeval.domain.constant.basic.ProfessionalCapabilitySourceEnum}
*/
private String professionalCapabilityCode;

9
safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml
View File

@ -71,7 +71,8 @@
<!-- 资质备案人员分页查询，直接返回 CO -->
<select id="filingPage" resultType="org.qinan.safetyeval.client.co.QualFilingPersonnelInfoCO">
SELECT p.id source_personnel_id, p.id, p.user_name personName, d.dept_name, po.position_name, p.post_id, p.gender_code, p.gender_name
, p.birth_date, p.register_engineer_flag, p.evaluator_cert_no, p.join_work_date
, p.birth_date, p.register_engineer_flag, p.technical_director_flag, p.process_control_leader_flag
, p.evaluator_cert_no, p.join_work_date
FROM org_personnel p
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'
@ -81,6 +82,12 @@
<if test="query.personName != null and query.personName != ''">
AND p.user_name LIKE CONCAT('%', #{query.personName}, '%')
</if>
<if test="query.managementFlag != null and query.managementFlag == true">
AND (p.technical_director_flag =1 or p.process_control_leader_flag =1)
</if>
<if test="query.managementFlag != null and query.managementFlag == false">
AND (p.technical_director_flag !=1 and p.process_control_leader_flag !=1)
</if>
</where>
ORDER BY p.id DESC
</select>

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

@ -50,7 +50,8 @@
<select id="getFillingPersonInfo" resultType="org.qinan.safetyeval.client.co.QualFilingPersonnelInfoCO">
SELECT fp.source_personnel_id, fp.id, p.user_name personName, po.position_name, p.post_id, p.gender_code, p.gender_name
, p.birth_date, p.register_engineer_flag, p.evaluator_cert_no,fp.filing_id, p.join_work_date,d.dept_name
, 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
join qual_filing_personnel fp on p.id = fp.source_personnel_id
left join org_department d on p.dept_id = d.id and d.delete_enum = 'false'