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 11:33:48 +08:00
parent 37ae7c1229
commit 93b573109f
11 changed files with 57 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/sql/add_capability_assessment_to_org_personnel.sql Normal file
View File

@ -0,0 +1,3 @@
-- org_personnel 表新增「能力认定」字段（JSON array 字符串）
ALTER TABLE `org_personnel`
ADD COLUMN `capability_assessment` varchar(512) DEFAULT NULL COMMENT '能力认定JSON array 字符串' AFTER `proof_material_url`;

2
safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelViewEnricher.java
View File

@ -9,7 +9,7 @@ import org.qinan.safetyeval.domain.major.model.BasicDisciplineMajorE;
import org.qinan.safetyeval.domain.query.OrgPersonnelCertQuery;
import org.qinan.safetyeval.domain.query.PageResult;
import org.qinan.safetyeval.domain.constant.basic.IndustryEnum;
import org.qinan.safetyeval.domain.constant.ProfessionalCapabilityEnum;
import org.qinan.safetyeval.domain.constant.basic.ProfessionalCapabilityEnum;
import org.qinan.safetyeval.domain.standards.gateway.IndustryProfessionalStandardsGateway;
import org.qinan.safetyeval.domain.standards.model.IndustryProfessionalStandardsE;
import org.springframework.beans.factory.annotation.Autowired;

4
safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCO.java
View File

@ -5,6 +5,7 @@ import java.time.LocalDate;
import java.util.List;
import lombok.Data;
import org.qinan.safetyeval.domain.entity.CapabilityAssessmentDTO;
import org.qinan.safetyeval.domain.entity.TitleCodeCo;
/**
@ -114,6 +115,9 @@ public class OrgPersonnelCO {
@ApiModelProperty(value = "证明材料附件地址")
private String proofMaterialUrl;
@ApiModelProperty(value = "能力认定")
private List<CapabilityAssessmentDTO> capabilityAssessment;
@ApiModelProperty(value = "原始人像地址（人脸比对基准图）")
private String originFaceUrl;

4
safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelAddCmd.java
View File

@ -6,6 +6,7 @@ import java.util.List;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
import lombok.Data;
import org.qinan.safetyeval.domain.entity.CapabilityAssessmentDTO;
import org.qinan.safetyeval.domain.entity.TitleCodeCo;
/**
@ -127,6 +128,9 @@ public class OrgPersonnelAddCmd {
@ApiModelProperty(value = "申报专业能力证明材料地址")
private String proofMaterialUrl;
@ApiModelProperty(value = "能力认定")
private List<CapabilityAssessmentDTO> capabilityAssessment;
@ApiModelProperty(value = "是否技术负责人")
private Boolean technicalDirectorFlag;

4
safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelModifyCmd.java
View File

@ -6,6 +6,7 @@ import java.util.List;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
import lombok.Data;
import org.qinan.safetyeval.domain.entity.CapabilityAssessmentDTO;
import org.qinan.safetyeval.domain.entity.TitleCodeCo;
/**
@ -130,6 +131,9 @@ public class OrgPersonnelModifyCmd {
@ApiModelProperty(value = "申报专业能力证明材料地址")
private String proofMaterialUrl;
@ApiModelProperty(value = "能力认定")
private List<CapabilityAssessmentDTO> capabilityAssessment;
@ApiModelProperty(value = "是否技术负责人")
private Boolean technicalDirectorFlag;

19
safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/ProfessionalCapabilityEnum.java → safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/basic/ProfessionalCapabilityEnum.java
View File

@ -1,8 +1,13 @@
package org.qinan.safetyeval.domain.constant;
package org.qinan.safetyeval.domain.constant.basic;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* 专业能力
*/
@Getter
@RequiredArgsConstructor
public enum ProfessionalCapabilityEnum {
SAFETY("SAFETY", "安全"),
@ -39,18 +44,6 @@ public enum ProfessionalCapabilityEnum {
",ANTICORROSION:防腐,CHEMICAL_PROCESS:化工工艺,CHEMICAL_MECHANICAL:化工机械,AUTOMATION:自动化,EXPLOSIVES:火炸药" +
",EXPLOSION_TECHNOLOGY:爆炸技术,METALLURGY:冶金,NONFERROUS_METAL:有色金属,EQUIPMENT:设备,INSTRUMENT:仪表";
ProfessionalCapabilityEnum(String code, String value) {
this.code = code;
this.value = value;
}
public String getCode() {
return code;
}
public String getValue() {
return value;
}
public static ProfessionalCapabilityEnum ofCode(String code) {
if (code == null) {

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

@ -0,0 +1,29 @@
package org.qinan.safetyeval.domain.entity;
import lombok.Data;
import java.io.Serializable;
/**
* 能力认定信息（专业能力编码 + 专业能力来源编码）
*
* @author safety-eval
*/
@Data
public class CapabilityAssessmentDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 专业能力编码，取值见
* {@link org.qinan.safetyeval.domain.constant.basic.ProfessionalCapabilityEnum}
* {@link org.qinan.safetyeval.domain.constant.basic.ProfessionalCapabilitySourceEnum}
*/
private String professionalCapabilityCode;
/**
* 专业能力来源编码，取值见
* {@link org.qinan.safetyeval.domain.constant.basic.ProfessionalCapabilitySourceEnum}
*/
private String professionalCapabilitySourceCode;
}

3
safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgPersonnelEntity.java
View File

@ -112,6 +112,9 @@ public class OrgPersonnelEntity {
/** 申报专业能力证明材料(多个逗号分隔) */
private String proofMaterialUrl;
/** 能力认定(JSON数组字符串持久化，DO层为String) */
private List<CapabilityAssessmentDTO> capabilityAssessment;
/** 原始人像地址（人脸比对基准图） */
private String originFaceUrl;

1
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/OrgPersonnelDoConvertor.java
View File

@ -34,6 +34,7 @@ public interface OrgPersonnelDoConvertor {
* @return
*/
@Mapping(target = "titleCodeArr", source = "titleCodeArr", qualifiedByName = "jsonToTitleCodeList")
@Mapping(target = "capabilityAssessment", source = "capabilityAssessment", qualifiedByName = "jsonToCapabilityAssessmentList")
OrgPersonnelEntity converDoToEe(OrgPersonnelDO orgPersonnelDO);
/**

1
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgPersonnelDO.java
View File

@ -51,6 +51,7 @@ public class OrgPersonnelDO {
private String abilityDeclaration;
private String workExperience;
private String proofMaterialUrl;
private String capabilityAssessment;
@TableField(value = "origin_face_url", updateStrategy = FieldStrategy.NOT_NULL)
private String originFaceUrl;

1
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java
View File

@ -12,6 +12,7 @@ import org.qinan.safetyeval.client.co.QualFilingComplianceCheckResultCO;
import org.qinan.safetyeval.client.dto.*;
import org.qinan.safetyeval.domain.constant.*;
import org.qinan.safetyeval.domain.constant.basic.IndustryEnum;
import org.qinan.safetyeval.domain.constant.basic.ProfessionalCapabilityEnum;
import org.qinan.safetyeval.domain.entity.TitleCodeCo;
import org.qinan.safetyeval.domain.exception.BizException;
import org.qinan.safetyeval.infrastructure.dataobject.OrgPersonnelDO;