From f4836c58f3d6821eddddd060c4a4ca0339452705 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Sat, 8 Aug 2026 13:37:46 +0800 Subject: [PATCH] upgrade --- docs/sql/add_capability_assessment_to_org_personnel.sql | 2 ++ .../java/org/qinan/safetyeval/client/co/OrgPersonnelCO.java | 3 +++ .../org/qinan/safetyeval/client/dto/OrgPersonnelAddCmd.java | 3 +++ .../org/qinan/safetyeval/client/dto/OrgPersonnelModifyCmd.java | 3 +++ .../org/qinan/safetyeval/domain/entity/OrgPersonnelEntity.java | 3 +++ .../safetyeval/infrastructure/dataobject/OrgPersonnelDO.java | 1 + .../src/main/resources/mapper/OrgPersonnelMapper.xml | 2 +- 7 files changed, 16 insertions(+), 1 deletion(-) diff --git a/docs/sql/add_capability_assessment_to_org_personnel.sql b/docs/sql/add_capability_assessment_to_org_personnel.sql index 4d3d5f9d..c787bff5 100644 --- a/docs/sql/add_capability_assessment_to_org_personnel.sql +++ b/docs/sql/add_capability_assessment_to_org_personnel.sql @@ -1,3 +1,5 @@ -- org_personnel 表新增「能力认定」字段（JSON array 字符串） ALTER TABLE `org_personnel` ADD COLUMN `capability_assessment` varchar(512) DEFAULT NULL COMMENT '能力认定JSON array 字符串' AFTER `proof_material_url`; + +ALTER TABLE org_personnel ADD COLUMN evaluator_flag tinyint DEFAULT NULL COMMENT '是否评价师 1是 0否'; \ No newline at end of file diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCO.java index 7b668b59..e147ee85 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCO.java @@ -103,6 +103,9 @@ public class OrgPersonnelCO { @ApiModelProperty(value = "是否注册安全工程师(1是2否)") private Integer registerEngineerFlag; + @ApiModelProperty(value = "是否评价师(1是0否)") + private Integer evaluatorFlag; + @ApiModelProperty(value = "发表著作") private String publications; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelAddCmd.java index dd7f37c4..85111dec 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelAddCmd.java @@ -113,6 +113,9 @@ public class OrgPersonnelAddCmd { @ApiModelProperty(value = "是否注册安全工程师(1是2否)") private Integer registerEngineerFlag; + @ApiModelProperty(value = "是否评价师(1是0否)") + private Integer evaluatorFlag; + @Size(max = 1000, message = "出版学术专著等长度不能超过1000个字符") @ApiModelProperty(value = "出版学术专著专利获奖论文等") private String publications; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelModifyCmd.java index 8e6bd6df..4d9de13b 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelModifyCmd.java @@ -115,6 +115,9 @@ public class OrgPersonnelModifyCmd { @ApiModelProperty(value = "是否注册安全工程师(1是2否)") private Integer registerEngineerFlag; + @ApiModelProperty(value = "是否评价师(1是0否)") + private Integer evaluatorFlag; + @Size(max = 1000, message = "出版学术专著等长度不能超过1000个字符") @ApiModelProperty(value = "出版学术专著专利获奖论文等") private String publications; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgPersonnelEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgPersonnelEntity.java index 4ba20e3a..71080912 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgPersonnelEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgPersonnelEntity.java @@ -100,6 +100,9 @@ public class OrgPersonnelEntity { /** 是否注册安全工程师(1是2否) */ private Integer registerEngineerFlag; + /** 是否评价师(1是0否) */ + private Integer evaluatorFlag; + /** 出版学术专著专利获奖论文等 */ private String publications; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgPersonnelDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgPersonnelDO.java index 67e8ff32..998d2d49 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgPersonnelDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgPersonnelDO.java @@ -47,6 +47,7 @@ public class OrgPersonnelDO { private String educationLevelName; private String titleCodeArr; private Integer registerEngineerFlag; + private Integer evaluatorFlag; private String publications; private String abilityDeclaration; private String workExperience; diff --git a/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml index 6ed721b8..769a512e 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml @@ -38,7 +38,7 @@ - `id`, `org_id`, `dept_id`, `post_id`, `user_name`, `account`, `gender_code`, `gender_name`, `birth_date`, `id_card_no`, `current_address`, `office_address`, `education_code`, `education_name`, `graduate_school`, `major`, `employment_status_code`, `employment_status_name`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env` + `id`, `org_id`, `dept_id`, `post_id`, `user_name`, `account`, `gender_code`, `gender_name`, `birth_date`, `id_card_no`, `current_address`, `office_address`, `education_code`, `education_name`, `graduate_school`, `major`, `employment_status_code`, `employment_status_name`, `evaluator_flag`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`