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:16:53 +08:00
parent fccd1b61a6
commit 37ae7c1229
20 changed files with 161 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,3 @@
-- org_personnel 表新增「人员岗位类型」字段
ALTER TABLE `org_personnel`
ADD COLUMN `personnel_position_type` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '人员岗位类型: TECHNICAL_LEADER=>技术负责人; PROCESS_CONTROL_LEADER=>过程控制负责人' AFTER `process_control_leader_flag`;

5
docs/sql/eval_process_control_add_org_head_signature.sql
View File

@ -1,5 +0,0 @@
-- eval_process_control 新增机构负责人签字相关字段
ALTER TABLE `eval_process_control`
ADD COLUMN `org_head_signature_task_status` varchar(64) DEFAULT NULL COMMENT '机构负责人签字任务状态 dispatched 下发，non_dispatched 未下发 , completed 已完成',
ADD COLUMN `org_head_personnel_id` bigint DEFAULT NULL COMMENT '机构负责人',
ADD COLUMN `org_head_signature_url` varchar(512) DEFAULT NULL COMMENT '机构负责人签字';

2
safety-eval-app/src/main/java/org/qinan/safetyeval/app/convertor/EvalCustomerCmdConvertor.java
View File

@ -12,7 +12,7 @@ import org.qinan.safetyeval.domain.constant.ChongqingDistrictEnum;
import org.qinan.safetyeval.domain.constant.CustomerStatusEnum;
import org.qinan.safetyeval.domain.constant.EnterpriseScaleEnum;
import org.qinan.safetyeval.domain.constant.EnterpriseStatusEnum;
import org.qinan.safetyeval.domain.constant.IndustryEnum;
import org.qinan.safetyeval.domain.constant.basic.IndustryEnum;
import org.qinan.safetyeval.domain.entity.EvalCustomerEntity;
import org.qinan.safetyeval.domain.query.EvalCustomerQuery;

2
safety-eval-app/src/main/java/org/qinan/safetyeval/app/convertor/EvalProjectCmdConvertor.java
View File

@ -15,7 +15,7 @@ import org.qinan.safetyeval.client.dto.institution.EvalProjectPageQuery;
import org.qinan.safetyeval.client.dto.institution.EvalProjectProgressPageQuery;
import org.qinan.safetyeval.domain.constant.ChongqingDistrictEnum;
import org.qinan.safetyeval.domain.constant.EvalTypeEnum;
import org.qinan.safetyeval.domain.constant.IndustryEnum;
import org.qinan.safetyeval.domain.constant.basic.IndustryEnum;
import org.qinan.safetyeval.domain.entity.EvalProjectEntity;
import org.qinan.safetyeval.domain.query.EvalProjectQuery;
import org.springframework.util.StringUtils;

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

@ -13,6 +13,7 @@ import org.qinan.safetyeval.client.dto.institution.EvalCustomerModifyCmd;
import org.qinan.safetyeval.client.dto.institution.EvalCustomerPageQuery;
import org.qinan.safetyeval.client.dto.institution.EvalProjectPageQuery;
import org.qinan.safetyeval.domain.constant.*;
import org.qinan.safetyeval.domain.constant.basic.IndustryEnum;
import org.qinan.safetyeval.domain.entity.EvalCustomerEntity;
import org.qinan.safetyeval.domain.exception.ErrorCode;
import org.qinan.safetyeval.domain.query.EvalCustomerQuery;

2
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/InstitutionDashboardExecutor.java
View File

@ -11,7 +11,7 @@ import org.qinan.safetyeval.client.co.institution.dashboard.InstitutionDashboard
import org.qinan.safetyeval.client.co.institution.dashboard.InstitutionDashboardProjectNodeStatsCO;
import org.qinan.safetyeval.client.dto.SingleResponse;
import org.qinan.safetyeval.domain.constant.EvalTypeEnum;
import org.qinan.safetyeval.domain.constant.IndustryEnum;
import org.qinan.safetyeval.domain.constant.basic.IndustryEnum;
import org.qinan.safetyeval.domain.entity.EvalCustomerEntity;
import org.qinan.safetyeval.domain.entity.EvalProjectEntity;
import org.qinan.safetyeval.domain.gateway.EvalCustomerGateway;

2
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/regulator/RegulatorCockpitExecutor.java
View File

@ -14,7 +14,7 @@ import org.qinan.safetyeval.client.co.regulator.cockpit.CockpitRegionDistributio
import org.qinan.safetyeval.client.co.regulator.cockpit.CockpitReviewSummaryCO;
import org.qinan.safetyeval.client.dto.SingleResponse;
import org.qinan.safetyeval.domain.constant.EvalTypeEnum;
import org.qinan.safetyeval.domain.constant.IndustryEnum;
import org.qinan.safetyeval.domain.constant.basic.IndustryEnum;
import org.qinan.safetyeval.domain.constant.QualFilingStatusEnum;
import org.qinan.safetyeval.domain.entity.EvalProjectEntity;
import org.qinan.safetyeval.domain.entity.InspNoticeEntity;

2
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/regulator/RegulatorEvalProjectMonitorExecutor.java
View File

@ -17,8 +17,6 @@ import org.qinan.safetyeval.client.dto.SingleResponse;
import org.qinan.safetyeval.client.dto.regulator.RegulatorEvalProjectMonitorPageQuery;
import org.qinan.safetyeval.client.dto.regulator.RegulatorEvalProjectMonitorRealtimePageQuery;
import org.qinan.safetyeval.client.dto.regulator.RegulatorEvalProjectSurveyPageQuery;
import org.qinan.safetyeval.domain.constant.EvalTypeEnum;
import org.qinan.safetyeval.domain.constant.IndustryEnum;
import org.qinan.safetyeval.domain.constant.ProjectProcessWaringStatusEnum;
import org.qinan.safetyeval.domain.entity.EvalProjectEntity;
import org.qinan.safetyeval.domain.exception.BizException;

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

@ -8,7 +8,7 @@ import org.qinan.safetyeval.domain.major.gateway.BasicDisciplineMajorGateway;
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.IndustryEnum;
import org.qinan.safetyeval.domain.constant.basic.IndustryEnum;
import org.qinan.safetyeval.domain.constant.ProfessionalCapabilityEnum;
import org.qinan.safetyeval.domain.standards.gateway.IndustryProfessionalStandardsGateway;
import org.qinan.safetyeval.domain.standards.model.IndustryProfessionalStandardsE;

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

@ -123,6 +123,9 @@ public class OrgPersonnelCO {
@ApiModelProperty(value = "是否过程控制负责人")
private Boolean processControlLeaderFlag;
@ApiModelProperty(value = "人员岗位类型: TECHNICAL_LEADER=>技术负责人; PROCESS_CONTROL_LEADER=>过程控制负责人")
private String personnelPositionType;
@ApiModelProperty(value = "部门名称（列表展示，非持久化）")
private String deptName;

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

@ -133,6 +133,9 @@ public class OrgPersonnelAddCmd {
@ApiModelProperty(value = "是否过程控制负责人")
private Boolean processControlLeaderFlag;
@ApiModelProperty(value = "人员岗位类型: TECHNICAL_LEADER=>技术负责人; PROCESS_CONTROL_LEADER=>过程控制负责人")
private String personnelPositionType;
@ApiModelProperty(value = "部门id")
private Long deptId;

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

@ -136,6 +136,9 @@ public class OrgPersonnelModifyCmd {
@ApiModelProperty(value = "是否过程控制负责人")
private Boolean processControlLeaderFlag;
@ApiModelProperty(value = "人员岗位类型: TECHNICAL_LEADER=>技术负责人; PROCESS_CONTROL_LEADER=>过程控制负责人")
private String personnelPositionType;
@ApiModelProperty(value = "部门id")
private Long deptId;

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

@ -1,4 +1,4 @@
package org.qinan.safetyeval.domain.constant;
package org.qinan.safetyeval.domain.constant.basic;
/**
* 行业类型枚举

22
safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/basic/PersonnelPositionTypeEnum.java Normal file
View File

@ -0,0 +1,22 @@
package org.qinan.safetyeval.domain.constant.basic;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* 人员岗位类型
*/
@Getter
@RequiredArgsConstructor
public enum PersonnelPositionTypeEnum {
TECHNICAL_LEADER("TECHNICAL_LEADER", "技术负责人"),
PROCESS_CONTROL_LEADER("PROCESS_CONTROL_LEADER", "过程控制负责人"),
;
private final String value;
private final String label;
public static final String REMARKS = "人员岗位类型: TECHNICAL_LEADER=>技术负责人;" +
"PROCESS_CONTROL_LEADER=>过程控制负责人";
}

28
safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/basic/ProfessionalCapabilitySourceEnum.java Normal file
View File

@ -0,0 +1,28 @@
package org.qinan.safetyeval.domain.constant.basic;
import com.baomidou.mybatisplus.annotation.EnumValue;
import com.fasterxml.jackson.annotation.JsonValue;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* 专业能力来源
*/
@Getter
@RequiredArgsConstructor
public enum ProfessionalCapabilitySourceEnum {
REGISTERED_SAFETY_ENGINEER("REGISTERED_SAFETY_ENGINEER", "注册安全工程师"),
EDUCATION("EDUCATION", "学历"),
PROFESSIONAL_TITLE("PROFESSIONAL_TITLE", "职称"),
ACADEMIC_ACHIEVEMENT("ACADEMIC_ACHIEVEMENT", "出版学术专著、专利、获奖、发表学术论文等"),
;
private final String value;
private final String label;
public static final String REMARKS = "专业能力来源: REGISTERED_SAFETY_ENGINEER=>注册安全工程师;" +
"EDUCATION=>学历;" +
"PROFESSIONAL_TITLE=>职称;" +
"ACADEMIC_ACHIEVEMENT=>出版学术专著、专利、获奖、发表学术论文等";
}

34
safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/basic/SafetyCategoryEnum.java Normal file
View File

@ -0,0 +1,34 @@
package org.qinan.safetyeval.domain.constant.basic;
import com.baomidou.mybatisplus.annotation.EnumValue;
import com.fasterxml.jackson.annotation.JsonValue;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* 安全类别
*/
@Getter
@RequiredArgsConstructor
public enum SafetyCategoryEnum {
COAL_MINE("COAL_MINE", "煤矿安全"),
METAL_NONMETAL_MINE("METAL_NONMETAL_MINE", "金属非金属矿山安全"),
CHEMICAL("CHEMICAL", "化工安全"),
METAL_SMELTING("METAL_SMELTING", "金属冶炼安全"),
CONSTRUCTION("CONSTRUCTION", "建筑施工安全"),
ROAD_TRANSPORT("ROAD_TRANSPORT", "道路运输安全"),
OTHER("OTHER", "其他安全"),
;
private final String value;
private final String label;
public static final String REMARKS = "注安专业类别: COAL_MINE=>煤矿安全 ;" +
"METAL_NONMETAL_MINE=>金属非金属矿山安全;" +
"CHEMICAL=>化工安全 ;" +
"METAL_SMELTING=>金属冶炼安全;" +
"CONSTRUCTION=>建筑施工安全 ;" +
"ROAD_TRANSPORT=>道路运输安全;" +
"OTHER=>其他安全";
}

53
safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/basic/TitleCapabilityEnum.java Normal file
View File

@ -0,0 +1,53 @@
package org.qinan.safetyeval.domain.constant.basic;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* 职称能力
*/
@Getter
@RequiredArgsConstructor
public enum TitleCapabilityEnum {
SAFETY_ENGINEERING("P01", "安全工程", "安全"),
MECHANICAL_ENGINEERING("P02", "机械工程", "机械、化工机械"),
CHEMICAL_MACHINERY("P03", "化工机械", "化工机械"),
CHEMICAL_ENGINEERING("P04", "化学工程", "化工工艺"),
AUTOMATION("P05", "自动化/测控技术", "仪表自动化"),
ELECTRICAL_ENGINEERING("P06", "电气工程", "电气"),
MINING_ENGINEERING("P07", "采矿工程", "采矿"),
VENTILATION_ENGINEERING("P08", "通风工程", "通风"),
GEOLOGICAL_ENGINEERING("P09", "地质工程", "地质"),
MINE_CONSTRUCTION_ENGINEERING("P10", "矿建工程", "矿建"),
PETROLEUM_ENGINEERING("P11", "石油工程", "油气开发"),
OIL_GAS_STORAGE_TRANSPORT("P12", "油气储运工程", "油气储运"),
CORROSION_PROTECTION("P13", "腐蚀与防护", "防腐"),
METALLURGY_ENGINEERING("P14", "冶金工程", "冶金"),
NONFERROUS_METALLURGY("P15", "有色金属冶金", "有色金属"),
EXPLOSIVES("P16", "火炸药/爆炸技术", "火炸药"),
CIVIL_ENGINEERING("P17", "土木工程", "水工结构"),
;
private final String value;
private final String label;
private final String capability;
public static final String REMARKS = "职称能力: P01=>安全工程(安全);" +
"P02=>机械工程(机械、化工机械);" +
"P03=>化工机械(化工机械);" +
"P04=>化学工程(化工工艺);" +
"P05=>自动化/测控技术(仪表自动化);" +
"P06=>电气工程(电气);" +
"P07=>采矿工程(采矿);" +
"P08=>通风工程(通风);" +
"P09=>地质工程(地质);" +
"P10=>矿建工程(矿建);" +
"P11=>石油工程(油气开发);" +
"P12=>油气储运工程(油气储运);" +
"P13=>腐蚀与防护(防腐);" +
"P14=>冶金工程(冶金);" +
"P15=>有色金属冶金(有色金属);" +
"P16=>火炸药/爆炸技术(火炸药);" +
"P17=>土木工程(水工结构)";
}

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

@ -121,6 +121,9 @@ public class OrgPersonnelEntity {
/** 是否过程控制负责人 */
private Boolean processControlLeaderFlag;
/** 人员岗位类型: TECHNICAL_LEADER=>技术负责人; PROCESS_CONTROL_LEADER=>过程控制负责人 */
private String personnelPositionType;
/** 租户ID */
private Long tenantId;

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

@ -57,6 +57,7 @@ public class OrgPersonnelDO {
private Boolean technicalDirectorFlag;
private Boolean processControlLeaderFlag;
private String personnelPositionType;
// ---- GBS默认字段 ----
/**

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

@ -11,6 +11,7 @@ import org.qinan.safetyeval.client.co.OrgPersonnelCertCapabilityComplianceCheckC
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.entity.TitleCodeCo;
import org.qinan.safetyeval.domain.exception.BizException;
import org.qinan.safetyeval.infrastructure.dataobject.OrgPersonnelDO;