From f27cda70364ec75e0a026290c8a101409b07b129 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Tue, 14 Jul 2026 15:50:54 +0800 Subject: [PATCH] titleName->titleCode --- docs/db/init-v2.sql | 22 +++++++++---------- .../app/executor/OrgPersonnelExecutor.java | 6 ++--- .../executor/QualFilingPersonnelExecutor.java | 6 ++--- .../orchestrator/QualFilingOrchestrator.java | 2 +- .../QualFilingOrgPersonnelImporter.java | 2 +- .../QualFilingPersonnelChangeAddCmd.java | 2 +- .../QualFilingPersonnelChangePageQry.java | 2 +- .../QualFilingPersonnelChangeUpdateCmd.java | 2 +- .../response/QualFilingPersonnelChangeCo.java | 2 +- .../safetyeval/client/co/OrgPersonnelCO.java | 2 +- .../client/co/QualFilingPersonnelCO.java | 2 +- .../client/dto/OrgPersonnelAddCmd.java | 2 +- .../client/dto/OrgPersonnelModifyCmd.java | 2 +- .../client/dto/QualFilingPersonnelAddCmd.java | 2 +- .../dto/QualFilingPersonnelModifyCmd.java | 2 +- .../model/QualFilingPersonnelChangeE.java | 2 +- .../domain/entity/OrgPersonnelEntity.java | 2 +- .../entity/QualFilingPersonnelEntity.java | 2 +- .../service/OrgPersonnelDomainService.java | 4 ++-- .../dataobject/OrgPersonnelDO.java | 2 +- .../dataobject/QualFilingPersonnelDO.java | 2 +- .../gatewayimpl/OrgPersonnelGatewayImpl.java | 4 ++-- .../QualFilingPersonnelGatewayImpl.java | 4 ++-- .../QualFilingPersonnelChangeDO.java | 2 +- ...alFilingPersonnelChangeRepositoryImpl.java | 4 ++-- .../support/OrgPersonnelRawRepository.java | 6 ++--- .../utils/ComplianceCheckUtil.java | 2 +- .../QualFilingPersonnelChangeMapper.xml | 4 ++-- .../mapper/QualFilingPersonnelMapper.xml | 4 ++-- 29 files changed, 51 insertions(+), 51 deletions(-) diff --git a/docs/db/init-v2.sql b/docs/db/init-v2.sql index 638bcd4..3a7bc98 100644 --- a/docs/db/init-v2.sql +++ b/docs/db/init-v2.sql @@ -231,7 +231,7 @@ CREATE TABLE `org_personnel` ( `education_type_name` varchar(50) DEFAULT NULL COMMENT '学历类型名称', `education_level_code` varchar(32) DEFAULT NULL COMMENT '学历层次编码(专科/本科/硕士/博士)', `education_level_name` varchar(50) DEFAULT NULL COMMENT '学历层次名称', - `title_name` varchar(50) DEFAULT NULL COMMENT '职称', + `title_code` varchar(50) DEFAULT NULL COMMENT '职称', `register_engineer_flag` tinyint DEFAULT '2' COMMENT '是否注册安全工程师(1是2否)', `publications` varchar(1000) DEFAULT NULL COMMENT '出版学术专著专利获奖论文等', `ability_declaration` varchar(1000) DEFAULT NULL COMMENT '自我申报的专业能力及认定方式', @@ -260,15 +260,15 @@ CREATE TABLE `org_personnel` ( -- Records of org_personnel -- ---------------------------- BEGIN; -INSERT INTO `org_personnel` (`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`, `person_type_code`, `person_type_name`, `qual_scope`, `professional_level_code`, `professional_level_name`, `evaluator_cert_no`, `education_type_code`, `education_type_name`, `education_level_code`, `education_level_name`, `title_name`, `register_engineer_flag`, `publications`, `ability_declaration`, `work_experience`, `proof_material_url`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`) VALUES (401, 1, 102, 205, '陈评价', '13800138010', 1, '男', '1985-03-15', '130302198503151234', '重庆市渝北区', '重庆市渝北区示例路88号', '在职教育-硕士', '在职教育-硕士', '重庆大学', '安全工程', 1, '在职', '1', '专职评价师', '金属冶炼', '三级安全评价师（对应职业技能等级三级 / 高级工，入门级）', '三级安全评价师（对应职业技能等级三级 / 高级工，入门级）', 'SJP-2020-0001', '在职教育', '在职教育', '硕士', '硕士', '高级评价师', 1, '发表安全评价相关论文3篇', '化工工艺安全风险评估，通过注册安全工程师资格考试认定', '2008-2012 重庆大学 安全工程专业 本科; 2012-至今 重庆安评技术研究院有限公司 评价师', 'https://gd-hbimg.huaban.com/08aaeb96f1f7360a2016ab5da1d6dd2d8f9933b62f9137-uqfbvd_fw658webp', 'false', NULL, NULL, NULL, 2069596397920849920, NULL, '2026-06-26 11:18:22', '2026-06-26 11:42:56', NULL, NULL, NULL); -INSERT INTO `org_personnel` (`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`, `person_type_code`, `person_type_name`, `qual_scope`, `professional_level_code`, `professional_level_name`, `evaluator_cert_no`, `education_type_code`, `education_type_name`, `education_level_code`, `education_level_name`, `title_name`, `register_engineer_flag`, `publications`, `ability_declaration`, `work_experience`, `proof_material_url`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`) VALUES (402, 1, 102, 206, '林项目', '13800138011', 1, '男', '1988-07-22', '130302198807221234', '重庆市渝北区', '重庆市渝北区示例路88号', NULL, '全日制-硕士', '中国矿业大学', '安全科学与工程', 1, '在职', '1', '基础人员', NULL, NULL, NULL, NULL, NULL, '全日制', NULL, '硕士', NULL, 2, NULL, NULL, NULL, NULL, 'false', NULL, NULL, NULL, 2069596397920849920, NULL, '2026-06-26 11:18:22', '2026-06-26 11:18:22', NULL, NULL, NULL); -INSERT INTO `org_personnel` (`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`, `person_type_code`, `person_type_name`, `qual_scope`, `professional_level_code`, `professional_level_name`, `evaluator_cert_no`, `education_type_code`, `education_type_name`, `education_level_code`, `education_level_name`, `title_name`, `register_engineer_flag`, `publications`, `ability_declaration`, `work_experience`, `proof_material_url`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`) VALUES (403, 1, 104, 215, '吴质量', '13800138012', 2, '女', '1990-11-08', '130302199011081234', '重庆市渝北区', '重庆市渝北区示例路88号', NULL, '全日制-本科', '河北工程大学', '安全工程', 1, '在职', '1', '基础人员', NULL, NULL, NULL, NULL, NULL, '全日制', NULL, '本科', NULL, 2, NULL, NULL, NULL, NULL, 'false', NULL, NULL, NULL, 2069596397920849920, NULL, '2026-06-26 11:18:22', '2026-06-26 11:18:22', NULL, NULL, NULL); -INSERT INTO `org_personnel` (`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`, `person_type_code`, `person_type_name`, `qual_scope`, `professional_level_code`, `professional_level_name`, `evaluator_cert_no`, `education_type_code`, `education_type_name`, `education_level_code`, `education_level_name`, `title_name`, `register_engineer_flag`, `publications`, `ability_declaration`, `work_experience`, `proof_material_url`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`) VALUES (404, 1, 103, 212, '郑专项', '13800138013', 1, '男', '1987-01-30', '130302198701301234', '重庆市渝北区', '重庆市渝北区示例路88号', NULL, '全日制-本科', '东北大学', '安全工程', 1, '在职', '1', '基础人员', NULL, NULL, NULL, NULL, NULL, '全日制', NULL, '本科', NULL, 2, NULL, NULL, NULL, NULL, 'false', NULL, NULL, NULL, 2069596397920849920, NULL, '2026-06-26 11:18:22', '2026-06-26 11:18:22', NULL, NULL, NULL); -INSERT INTO `org_personnel` (`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`, `person_type_code`, `person_type_name`, `qual_scope`, `professional_level_code`, `professional_level_name`, `evaluator_cert_no`, `education_type_code`, `education_type_name`, `education_level_code`, `education_level_name`, `title_name`, `register_engineer_flag`, `publications`, `ability_declaration`, `work_experience`, `proof_material_url`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`) VALUES (405, 1, 101, 202, '冯行政', '13800138014', 2, '女', '1992-05-18', '130302199205181234', '重庆市渝北区', '重庆市渝北区示例路88号', NULL, '全日制-专科', '重庆职业技术学院', '行政管理', 1, '在职', '1', '基础人员', NULL, NULL, NULL, NULL, NULL, '全日制', NULL, '专科', NULL, 2, NULL, NULL, NULL, NULL, 'false', NULL, NULL, NULL, 2069596397920849920, NULL, '2026-06-26 11:18:22', '2026-06-26 11:18:22', NULL, NULL, NULL); -INSERT INTO `org_personnel` (`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`, `person_type_code`, `person_type_name`, `qual_scope`, `professional_level_code`, `professional_level_name`, `evaluator_cert_no`, `education_type_code`, `education_type_name`, `education_level_code`, `education_level_name`, `title_name`, `register_engineer_flag`, `publications`, `ability_declaration`, `work_experience`, `proof_material_url`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`) VALUES (406, 1, 108, 222, '褚采样', '13800138015', 1, '男', '1995-09-03', '130302199509031234', '重庆市渝北区', '重庆市渝北区示例路88号', NULL, '全日制-本科', '重庆科技大学', '应用化学', 1, '在职', '1', '基础人员', NULL, NULL, NULL, NULL, NULL, '全日制', NULL, '本科', NULL, 2, NULL, NULL, NULL, NULL, 'false', NULL, NULL, NULL, 2069596397920849920, NULL, '2026-06-26 11:18:22', '2026-06-26 11:18:22', NULL, NULL, NULL); -INSERT INTO `org_personnel` (`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`, `person_type_code`, `person_type_name`, `qual_scope`, `professional_level_code`, `professional_level_name`, `evaluator_cert_no`, `education_type_code`, `education_type_name`, `education_level_code`, `education_level_name`, `title_name`, `register_engineer_flag`, `publications`, `ability_declaration`, `work_experience`, `proof_material_url`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`) VALUES (407, 1, 101, 201, '钱离职', '13800138016', 1, '男', '1980-01-01', '130302198001011234', '重庆市渝北区', '重庆市渝北区示例路88号', NULL, '全日制-本科', '重庆大学', '安全工程', 2, '离职', '1', '基础人员', NULL, NULL, NULL, NULL, NULL, '全日制', NULL, '本科', NULL, 2, NULL, NULL, NULL, NULL, 'false', NULL, NULL, NULL, 2069596397920849920, NULL, '2026-06-26 11:18:22', '2026-06-26 11:18:22', NULL, NULL, NULL); -INSERT INTO `org_personnel` (`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`, `person_type_code`, `person_type_name`, `qual_scope`, `professional_level_code`, `professional_level_name`, `evaluator_cert_no`, `education_type_code`, `education_type_name`, `education_level_code`, `education_level_name`, `title_name`, `register_engineer_flag`, `publications`, `ability_declaration`, `work_experience`, `proof_material_url`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`) VALUES (408, 1, 102, 205, '孙离职', '13800138017', 2, '女', '1986-06-12', '130302198606121234', '重庆市渝北区', '重庆市渝北区示例路88号', NULL, '全日制-本科', '重庆大学', '安全工程', 2, '离职', '1', '基础人员', NULL, NULL, NULL, NULL, NULL, '全日制', NULL, '本科', NULL, 2, NULL, NULL, NULL, NULL, 'false', NULL, NULL, NULL, 2069596397920849920, NULL, '2026-06-26 11:18:22', '2026-06-26 11:18:22', NULL, NULL, NULL); -INSERT INTO `org_personnel` (`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`, `person_type_code`, `person_type_name`, `qual_scope`, `professional_level_code`, `professional_level_name`, `evaluator_cert_no`, `education_type_code`, `education_type_name`, `education_level_code`, `education_level_name`, `title_name`, `register_engineer_flag`, `publications`, `ability_declaration`, `work_experience`, `proof_material_url`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`) VALUES (409, 1, 103, 212, '周离职', '13800138018', 1, '男', '1984-09-20', '130302198409201234', '重庆市渝北区', '重庆市渝北区示例路88号', NULL, '全日制-硕士', '重庆大学', '安全科学与工程', 2, '离职', '1', '基础人员', NULL, NULL, NULL, NULL, NULL, '全日制', NULL, '硕士', NULL, 2, NULL, NULL, NULL, NULL, 'false', NULL, NULL, NULL, 2069596397920849920, NULL, '2026-06-26 11:18:22', '2026-06-26 11:18:22', NULL, NULL, NULL); +INSERT INTO `org_personnel` (`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`, `person_type_code`, `person_type_name`, `qual_scope`, `professional_level_code`, `professional_level_name`, `evaluator_cert_no`, `education_type_code`, `education_type_name`, `education_level_code`, `education_level_name`, `title_code`, `register_engineer_flag`, `publications`, `ability_declaration`, `work_experience`, `proof_material_url`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`) VALUES (401, 1, 102, 205, '陈评价', '13800138010', 1, '男', '1985-03-15', '130302198503151234', '重庆市渝北区', '重庆市渝北区示例路88号', '在职教育-硕士', '在职教育-硕士', '重庆大学', '安全工程', 1, '在职', '1', '专职评价师', '金属冶炼', '三级安全评价师（对应职业技能等级三级 / 高级工，入门级）', '三级安全评价师（对应职业技能等级三级 / 高级工，入门级）', 'SJP-2020-0001', '在职教育', '在职教育', '硕士', '硕士', '高级评价师', 1, '发表安全评价相关论文3篇', '化工工艺安全风险评估，通过注册安全工程师资格考试认定', '2008-2012 重庆大学 安全工程专业 本科; 2012-至今 重庆安评技术研究院有限公司 评价师', 'https://gd-hbimg.huaban.com/08aaeb96f1f7360a2016ab5da1d6dd2d8f9933b62f9137-uqfbvd_fw658webp', 'false', NULL, NULL, NULL, 2069596397920849920, NULL, '2026-06-26 11:18:22', '2026-06-26 11:42:56', NULL, NULL, NULL); +INSERT INTO `org_personnel` (`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`, `person_type_code`, `person_type_name`, `qual_scope`, `professional_level_code`, `professional_level_name`, `evaluator_cert_no`, `education_type_code`, `education_type_name`, `education_level_code`, `education_level_name`, `title_code`, `register_engineer_flag`, `publications`, `ability_declaration`, `work_experience`, `proof_material_url`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`) VALUES (402, 1, 102, 206, '林项目', '13800138011', 1, '男', '1988-07-22', '130302198807221234', '重庆市渝北区', '重庆市渝北区示例路88号', NULL, '全日制-硕士', '中国矿业大学', '安全科学与工程', 1, '在职', '1', '基础人员', NULL, NULL, NULL, NULL, NULL, '全日制', NULL, '硕士', NULL, 2, NULL, NULL, NULL, NULL, 'false', NULL, NULL, NULL, 2069596397920849920, NULL, '2026-06-26 11:18:22', '2026-06-26 11:18:22', NULL, NULL, NULL); +INSERT INTO `org_personnel` (`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`, `person_type_code`, `person_type_name`, `qual_scope`, `professional_level_code`, `professional_level_name`, `evaluator_cert_no`, `education_type_code`, `education_type_name`, `education_level_code`, `education_level_name`, `title_code`, `register_engineer_flag`, `publications`, `ability_declaration`, `work_experience`, `proof_material_url`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`) VALUES (403, 1, 104, 215, '吴质量', '13800138012', 2, '女', '1990-11-08', '130302199011081234', '重庆市渝北区', '重庆市渝北区示例路88号', NULL, '全日制-本科', '河北工程大学', '安全工程', 1, '在职', '1', '基础人员', NULL, NULL, NULL, NULL, NULL, '全日制', NULL, '本科', NULL, 2, NULL, NULL, NULL, NULL, 'false', NULL, NULL, NULL, 2069596397920849920, NULL, '2026-06-26 11:18:22', '2026-06-26 11:18:22', NULL, NULL, NULL); +INSERT INTO `org_personnel` (`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`, `person_type_code`, `person_type_name`, `qual_scope`, `professional_level_code`, `professional_level_name`, `evaluator_cert_no`, `education_type_code`, `education_type_name`, `education_level_code`, `education_level_name`, `title_code`, `register_engineer_flag`, `publications`, `ability_declaration`, `work_experience`, `proof_material_url`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`) VALUES (404, 1, 103, 212, '郑专项', '13800138013', 1, '男', '1987-01-30', '130302198701301234', '重庆市渝北区', '重庆市渝北区示例路88号', NULL, '全日制-本科', '东北大学', '安全工程', 1, '在职', '1', '基础人员', NULL, NULL, NULL, NULL, NULL, '全日制', NULL, '本科', NULL, 2, NULL, NULL, NULL, NULL, 'false', NULL, NULL, NULL, 2069596397920849920, NULL, '2026-06-26 11:18:22', '2026-06-26 11:18:22', NULL, NULL, NULL); +INSERT INTO `org_personnel` (`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`, `person_type_code`, `person_type_name`, `qual_scope`, `professional_level_code`, `professional_level_name`, `evaluator_cert_no`, `education_type_code`, `education_type_name`, `education_level_code`, `education_level_name`, `title_code`, `register_engineer_flag`, `publications`, `ability_declaration`, `work_experience`, `proof_material_url`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`) VALUES (405, 1, 101, 202, '冯行政', '13800138014', 2, '女', '1992-05-18', '130302199205181234', '重庆市渝北区', '重庆市渝北区示例路88号', NULL, '全日制-专科', '重庆职业技术学院', '行政管理', 1, '在职', '1', '基础人员', NULL, NULL, NULL, NULL, NULL, '全日制', NULL, '专科', NULL, 2, NULL, NULL, NULL, NULL, 'false', NULL, NULL, NULL, 2069596397920849920, NULL, '2026-06-26 11:18:22', '2026-06-26 11:18:22', NULL, NULL, NULL); +INSERT INTO `org_personnel` (`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`, `person_type_code`, `person_type_name`, `qual_scope`, `professional_level_code`, `professional_level_name`, `evaluator_cert_no`, `education_type_code`, `education_type_name`, `education_level_code`, `education_level_name`, `title_code`, `register_engineer_flag`, `publications`, `ability_declaration`, `work_experience`, `proof_material_url`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`) VALUES (406, 1, 108, 222, '褚采样', '13800138015', 1, '男', '1995-09-03', '130302199509031234', '重庆市渝北区', '重庆市渝北区示例路88号', NULL, '全日制-本科', '重庆科技大学', '应用化学', 1, '在职', '1', '基础人员', NULL, NULL, NULL, NULL, NULL, '全日制', NULL, '本科', NULL, 2, NULL, NULL, NULL, NULL, 'false', NULL, NULL, NULL, 2069596397920849920, NULL, '2026-06-26 11:18:22', '2026-06-26 11:18:22', NULL, NULL, NULL); +INSERT INTO `org_personnel` (`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`, `person_type_code`, `person_type_name`, `qual_scope`, `professional_level_code`, `professional_level_name`, `evaluator_cert_no`, `education_type_code`, `education_type_name`, `education_level_code`, `education_level_name`, `title_code`, `register_engineer_flag`, `publications`, `ability_declaration`, `work_experience`, `proof_material_url`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`) VALUES (407, 1, 101, 201, '钱离职', '13800138016', 1, '男', '1980-01-01', '130302198001011234', '重庆市渝北区', '重庆市渝北区示例路88号', NULL, '全日制-本科', '重庆大学', '安全工程', 2, '离职', '1', '基础人员', NULL, NULL, NULL, NULL, NULL, '全日制', NULL, '本科', NULL, 2, NULL, NULL, NULL, NULL, 'false', NULL, NULL, NULL, 2069596397920849920, NULL, '2026-06-26 11:18:22', '2026-06-26 11:18:22', NULL, NULL, NULL); +INSERT INTO `org_personnel` (`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`, `person_type_code`, `person_type_name`, `qual_scope`, `professional_level_code`, `professional_level_name`, `evaluator_cert_no`, `education_type_code`, `education_type_name`, `education_level_code`, `education_level_name`, `title_code`, `register_engineer_flag`, `publications`, `ability_declaration`, `work_experience`, `proof_material_url`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`) VALUES (408, 1, 102, 205, '孙离职', '13800138017', 2, '女', '1986-06-12', '130302198606121234', '重庆市渝北区', '重庆市渝北区示例路88号', NULL, '全日制-本科', '重庆大学', '安全工程', 2, '离职', '1', '基础人员', NULL, NULL, NULL, NULL, NULL, '全日制', NULL, '本科', NULL, 2, NULL, NULL, NULL, NULL, 'false', NULL, NULL, NULL, 2069596397920849920, NULL, '2026-06-26 11:18:22', '2026-06-26 11:18:22', NULL, NULL, NULL); +INSERT INTO `org_personnel` (`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`, `person_type_code`, `person_type_name`, `qual_scope`, `professional_level_code`, `professional_level_name`, `evaluator_cert_no`, `education_type_code`, `education_type_name`, `education_level_code`, `education_level_name`, `title_code`, `register_engineer_flag`, `publications`, `ability_declaration`, `work_experience`, `proof_material_url`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`) VALUES (409, 1, 103, 212, '周离职', '13800138018', 1, '男', '1984-09-20', '130302198409201234', '重庆市渝北区', '重庆市渝北区示例路88号', NULL, '全日制-硕士', '重庆大学', '安全科学与工程', 2, '离职', '1', '基础人员', NULL, NULL, NULL, NULL, NULL, '全日制', NULL, '硕士', NULL, 2, NULL, NULL, NULL, NULL, 'false', NULL, NULL, NULL, 2069596397920849920, NULL, '2026-06-26 11:18:22', '2026-06-26 11:18:22', NULL, NULL, NULL); COMMIT; -- ---------------------------- @@ -789,7 +789,7 @@ CREATE TABLE `qual_filing_personnel` ( `person_type_code` varchar(32) DEFAULT NULL COMMENT '人员类型编码', `person_type_name` varchar(50) DEFAULT NULL COMMENT '人员类型名称', `position_name` varchar(50) DEFAULT NULL COMMENT '职务', - `title_name` varchar(50) DEFAULT NULL COMMENT '职称', + `title_code` varchar(50) DEFAULT NULL COMMENT '职称', `gender_code` tinyint DEFAULT NULL COMMENT '性别编码', `gender_name` varchar(10) DEFAULT NULL COMMENT '性别名称', `birth_date` date DEFAULT NULL COMMENT '出生日期', diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java index da7086b..298c7c2 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java @@ -233,7 +233,7 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi { entity.setEducationTypeName(cmd.getEducationTypeName()); entity.setEducationLevelCode(cmd.getEducationLevelCode()); entity.setEducationLevelName(cmd.getEducationLevelName()); - entity.setTitleName(cmd.getTitleName()); + entity.setTitleCode(cmd.getTitleCode()); entity.setRegisterEngineerFlag(cmd.getRegisterEngineerFlag()); entity.setPublications(cmd.getPublications()); entity.setAbilityDeclaration(cmd.getAbilityDeclaration()); @@ -253,7 +253,7 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi { entity.setEducationTypeName(cmd.getEducationTypeName()); entity.setEducationLevelCode(cmd.getEducationLevelCode()); entity.setEducationLevelName(cmd.getEducationLevelName()); - entity.setTitleName(cmd.getTitleName()); + entity.setTitleCode(cmd.getTitleCode()); entity.setRegisterEngineerFlag(cmd.getRegisterEngineerFlag()); entity.setPublications(cmd.getPublications()); entity.setAbilityDeclaration(cmd.getAbilityDeclaration()); @@ -293,7 +293,7 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi { co.setEducationTypeName(entity.getEducationTypeName()); co.setEducationLevelCode(entity.getEducationLevelCode()); co.setEducationLevelName(entity.getEducationLevelName()); - co.setTitleName(entity.getTitleName()); + co.setTitleCode(entity.getTitleCode()); co.setRegisterEngineerFlag(entity.getRegisterEngineerFlag()); co.setPublications(entity.getPublications()); co.setAbilityDeclaration(entity.getAbilityDeclaration()); diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingPersonnelExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingPersonnelExecutor.java index 2c01a72..6e758e2 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingPersonnelExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingPersonnelExecutor.java @@ -35,7 +35,7 @@ public class QualFilingPersonnelExecutor implements QualFilingPersonnelApi { entity.setPersonTypeCode(cmd.getPersonTypeCode()); entity.setPersonTypeName(cmd.getPersonTypeName()); entity.setPositionName(cmd.getPositionName()); - entity.setTitleName(cmd.getTitleName()); + entity.setTitleCode(cmd.getTitleCode()); entity.setGenderCode(cmd.getGenderCode()); entity.setGenderName(cmd.getGenderName()); entity.setBirthDate(cmd.getBirthDate()); @@ -73,7 +73,7 @@ public class QualFilingPersonnelExecutor implements QualFilingPersonnelApi { entity.setPersonTypeCode(cmd.getPersonTypeCode()); entity.setPersonTypeName(cmd.getPersonTypeName()); entity.setPositionName(cmd.getPositionName()); - entity.setTitleName(cmd.getTitleName()); + entity.setTitleCode(cmd.getTitleCode()); entity.setGenderCode(cmd.getGenderCode()); entity.setGenderName(cmd.getGenderName()); entity.setBirthDate(cmd.getBirthDate()); @@ -142,7 +142,7 @@ public class QualFilingPersonnelExecutor implements QualFilingPersonnelApi { co.setPersonTypeCode(entity.getPersonTypeCode()); co.setPersonTypeName(entity.getPersonTypeName()); co.setPositionName(entity.getPositionName()); - co.setTitleName(entity.getTitleName()); + co.setTitleCode(entity.getTitleCode()); co.setGenderCode(entity.getGenderCode()); co.setGenderName(entity.getGenderName()); co.setBirthDate(entity.getBirthDate()); diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java index f13c604..cfe4d23 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java @@ -786,7 +786,7 @@ public class QualFilingOrchestrator { co.setPersonTypeCode(entity.getPersonTypeCode()); co.setPersonTypeName(entity.getPersonTypeName()); co.setPositionName(entity.getPositionName()); - co.setTitleName(entity.getTitleName()); + co.setTitleCode(entity.getTitleCode()); co.setGenderCode(entity.getGenderCode()); co.setGenderName(entity.getGenderName()); co.setBirthDate(entity.getBirthDate()); diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/QualFilingOrgPersonnelImporter.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/QualFilingOrgPersonnelImporter.java index 29fb737..ebbc97f 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/QualFilingOrgPersonnelImporter.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/QualFilingOrgPersonnelImporter.java @@ -73,7 +73,7 @@ public class QualFilingOrgPersonnelImporter { entity.setPersonName(source.getUserName()); entity.setPersonTypeCode(source.getPersonTypeCode()); entity.setPersonTypeName(source.getPersonTypeName()); - entity.setTitleName(source.getTitleName()); + entity.setTitleCode(source.getTitleCode()); entity.setGenderCode(source.getGenderCode()); entity.setGenderName(source.getGenderName()); entity.setBirthDate(source.getBirthDate()); diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeAddCmd.java index 2c4e969..66e2a2e 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeAddCmd.java @@ -63,7 +63,7 @@ public class QualFilingPersonnelChangeAddCmd implements Serializable { */ @ApiModelProperty(value = "职称") @Size(max = 128, message = "职称不能超过128个字符") - private String titleName; + private String titleCode; /** * 性别编码 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangePageQry.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangePageQry.java index be60ab3..87d04de 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangePageQry.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangePageQry.java @@ -50,7 +50,7 @@ public class QualFilingPersonnelChangePageQry extends PageQuery { * 职称 */ @ApiModelProperty(value = "职称") - private String titleName; + private String titleCode; /** * 性别编码 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeUpdateCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeUpdateCmd.java index 09b002c..6a9c774 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeUpdateCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeUpdateCmd.java @@ -58,7 +58,7 @@ public class QualFilingPersonnelChangeUpdateCmd implements Serializable { * 职称 */ @ApiModelProperty(value = "职称") - private String titleName; + private String titleCode; /** * 性别编码 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelChangeCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelChangeCo.java index 495cde0..969aca8 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelChangeCo.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelChangeCo.java @@ -52,7 +52,7 @@ public class QualFilingPersonnelChangeCo extends ClientObject { * 职称 */ @ApiModelProperty(value = "职称") - private String titleName; + private String titleCode; /** * 性别编码 */ 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 778fb12..db3a55e 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 @@ -100,7 +100,7 @@ public class OrgPersonnelCO { private String educationLevelName; @ApiModelProperty(value = "职称名称") - private String titleName; + private String titleCode; @ApiModelProperty(value = "是否注册安全工程师(1是2否)") private Integer registerEngineerFlag; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelCO.java index 50a0b2b..1e3b6a2 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelCO.java @@ -35,7 +35,7 @@ public class QualFilingPersonnelCO { private String positionName; @ApiModelProperty(value = "职称名称") - private String titleName; + private String titleCode; @ApiModelProperty(value = "性别编码(1男2女)") private Integer genderCode; 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 a14d336..3aaa492 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 @@ -117,7 +117,7 @@ public class OrgPersonnelAddCmd { @Size(max = 50, message = "职称长度不能超过50个字符") @ApiModelProperty(value = "职称") - private String titleName; + private String titleCode; @ApiModelProperty(value = "是否注册安全工程师(1是2否)") private Integer registerEngineerFlag; 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 312f468..30a9f9e 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 @@ -120,7 +120,7 @@ public class OrgPersonnelModifyCmd { @Size(max = 50, message = "职称长度不能超过50个字符") @ApiModelProperty(value = "职称") - private String titleName; + private String titleCode; @ApiModelProperty(value = "是否注册安全工程师(1是2否)") private Integer registerEngineerFlag; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelAddCmd.java index d837ba6..d513dee 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelAddCmd.java @@ -25,7 +25,7 @@ public class QualFilingPersonnelAddCmd { private String positionName; @ApiModelProperty(value = "职称") - private String titleName; + private String titleCode; @ApiModelProperty(value = "性别编码(1男2女)") private Integer genderCode; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelModifyCmd.java index 4ac8bff..2187a41 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelModifyCmd.java @@ -28,7 +28,7 @@ public class QualFilingPersonnelModifyCmd { private String positionName; @ApiModelProperty(value = "职称") - private String titleName; + private String titleCode; @ApiModelProperty(value = "性别编码(1男2女)") private Integer genderCode; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelChangeE.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelChangeE.java index 644e113..a1e1be7 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelChangeE.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelChangeE.java @@ -49,7 +49,7 @@ public class QualFilingPersonnelChangeE extends BaseE { /** * 职称 */ - private String titleName; + private String titleCode; /** * 性别编码 */ 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 8de1b25..5ec9697 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 @@ -103,7 +103,7 @@ public class OrgPersonnelEntity { private String educationLevelName; /** 职称 */ - private String titleName; + private String titleCode; /** 是否注册安全工程师(1是2否) */ private Integer registerEngineerFlag; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelEntity.java index 7e6f5ed..e465749 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelEntity.java @@ -35,7 +35,7 @@ public class QualFilingPersonnelEntity { private String positionName; /** 职称 */ - private String titleName; + private String titleCode; /** 性别编码 */ private Integer genderCode; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/service/OrgPersonnelDomainService.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/service/OrgPersonnelDomainService.java index c5ca438..f385146 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/service/OrgPersonnelDomainService.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/service/OrgPersonnelDomainService.java @@ -113,8 +113,8 @@ public class OrgPersonnelDomainService { target.setEducationLevelCode(patch.getEducationLevelCode()); target.setEducationLevelName(patch.getEducationLevelName()); } - if (patch.getTitleName() != null) { - target.setTitleName(patch.getTitleName()); + if (patch.getTitleCode() != null) { + target.setTitleCode(patch.getTitleCode()); } if (patch.getRegisterEngineerFlag() != null) { target.setRegisterEngineerFlag(patch.getRegisterEngineerFlag()); 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 711397a..c7a2278 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 @@ -46,7 +46,7 @@ public class OrgPersonnelDO { private String educationTypeName; private String educationLevelCode; private String educationLevelName; - private String titleName; + private String titleCode; private Integer registerEngineerFlag; private String publications; private String abilityDeclaration; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingPersonnelDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingPersonnelDO.java index 70bdec1..45505da 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingPersonnelDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingPersonnelDO.java @@ -22,7 +22,7 @@ public class QualFilingPersonnelDO { private String personTypeCode; private String personTypeName; private String positionName; - private String titleName; + private String titleCode; private Integer genderCode; private String genderName; private LocalDate birthDate; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgPersonnelGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgPersonnelGatewayImpl.java index 623ea8c..58e0bbc 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgPersonnelGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgPersonnelGatewayImpl.java @@ -193,7 +193,7 @@ public class OrgPersonnelGatewayImpl implements OrgPersonnelGateway { dataObject.setEducationTypeName(entity.getEducationTypeName()); dataObject.setEducationLevelCode(entity.getEducationLevelCode()); dataObject.setEducationLevelName(entity.getEducationLevelName()); - dataObject.setTitleName(entity.getTitleName()); + dataObject.setTitleCode(entity.getTitleCode()); dataObject.setRegisterEngineerFlag(entity.getRegisterEngineerFlag()); dataObject.setPublications(entity.getPublications()); dataObject.setAbilityDeclaration(entity.getAbilityDeclaration()); @@ -237,7 +237,7 @@ public class OrgPersonnelGatewayImpl implements OrgPersonnelGateway { entity.setEducationTypeName(dataObject.getEducationTypeName()); entity.setEducationLevelCode(dataObject.getEducationLevelCode()); entity.setEducationLevelName(dataObject.getEducationLevelName()); - entity.setTitleName(dataObject.getTitleName()); + entity.setTitleCode(dataObject.getTitleCode()); entity.setRegisterEngineerFlag(dataObject.getRegisterEngineerFlag()); entity.setPublications(dataObject.getPublications()); entity.setAbilityDeclaration(dataObject.getAbilityDeclaration()); diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingPersonnelGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingPersonnelGatewayImpl.java index 72e07b7..68b6a3d 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingPersonnelGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingPersonnelGatewayImpl.java @@ -121,7 +121,7 @@ public class QualFilingPersonnelGatewayImpl implements QualFilingPersonnelGatewa dataObject.setPersonTypeCode(entity.getPersonTypeCode()); dataObject.setPersonTypeName(entity.getPersonTypeName()); dataObject.setPositionName(entity.getPositionName()); - dataObject.setTitleName(entity.getTitleName()); + dataObject.setTitleCode(entity.getTitleCode()); dataObject.setGenderCode(entity.getGenderCode()); dataObject.setGenderName(entity.getGenderName()); dataObject.setBirthDate(entity.getBirthDate()); @@ -156,7 +156,7 @@ public class QualFilingPersonnelGatewayImpl implements QualFilingPersonnelGatewa entity.setPersonTypeCode(dataObject.getPersonTypeCode()); entity.setPersonTypeName(dataObject.getPersonTypeName()); entity.setPositionName(dataObject.getPositionName()); - entity.setTitleName(dataObject.getTitleName()); + entity.setTitleCode(dataObject.getTitleCode()); entity.setGenderCode(dataObject.getGenderCode()); entity.setGenderName(dataObject.getGenderName()); entity.setBirthDate(dataObject.getBirthDate()); diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelChangeDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelChangeDO.java index 0239453..b3f3b17 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelChangeDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelChangeDO.java @@ -54,7 +54,7 @@ public class QualFilingPersonnelChangeDO extends BaseDO { /** * 职称 */ - private String titleName; + private String titleCode; /** * 性别编码 */ diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelChangeRepositoryImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelChangeRepositoryImpl.java index f0ebcf4..ce03618 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelChangeRepositoryImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelChangeRepositoryImpl.java @@ -53,8 +53,8 @@ public class QualFilingPersonnelChangeRepositoryImpl extends BaseRepositoryImpl< if (ObjectUtil.isNotEmpty(qualFilingPersonnelChangePageQry.getPositionName())) { qualFilingPersonnelChangeDoQueryWrapper.like("position_name", qualFilingPersonnelChangePageQry.getPositionName()); } - if (ObjectUtil.isNotEmpty(qualFilingPersonnelChangePageQry.getTitleName())) { - qualFilingPersonnelChangeDoQueryWrapper.like("title_name", qualFilingPersonnelChangePageQry.getTitleName()); + if (ObjectUtil.isNotEmpty(qualFilingPersonnelChangePageQry.getTitleCode())) { + qualFilingPersonnelChangeDoQueryWrapper.like("title_code", qualFilingPersonnelChangePageQry.getTitleCode()); } if (ObjectUtil.isNotEmpty(qualFilingPersonnelChangePageQry.getGenderCode())) { qualFilingPersonnelChangeDoQueryWrapper.eq("gender_code", qualFilingPersonnelChangePageQry.getGenderCode()); diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/support/OrgPersonnelRawRepository.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/support/OrgPersonnelRawRepository.java index b2e1e24..636a162 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/support/OrgPersonnelRawRepository.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/support/OrgPersonnelRawRepository.java @@ -34,7 +34,7 @@ public class OrgPersonnelRawRepository { + "person_type_code = ?, person_type_name = ?, qual_scope = ?, " + "professional_level_code = ?, professional_level_name = ?, evaluator_cert_no = ?, " + "education_type_code = ?, education_type_name = ?, education_level_code = ?, education_level_name = ?, " - + "title_name = ?, register_engineer_flag = ?, publications = ?, ability_declaration = ?, " + + "title_code = ?, register_engineer_flag = ?, publications = ?, ability_declaration = ?, " + "work_experience = ?, proof_material_url = ?, delete_enum = 'false', " + "update_time = ?, update_id = ?, update_name = ? " + "WHERE id = ?"; @@ -66,7 +66,7 @@ public class OrgPersonnelRawRepository { dataObject.getEducationTypeName(), dataObject.getEducationLevelCode(), dataObject.getEducationLevelName(), - dataObject.getTitleName(), + dataObject.getTitleCode(), dataObject.getRegisterEngineerFlag(), dataObject.getPublications(), dataObject.getAbilityDeclaration(), @@ -123,7 +123,7 @@ public class OrgPersonnelRawRepository { row.setEducationTypeName(rs.getString("education_type_name")); row.setEducationLevelCode(rs.getString("education_level_code")); row.setEducationLevelName(rs.getString("education_level_name")); - row.setTitleName(rs.getString("title_name")); + row.setTitleCode(rs.getString("title_code")); int registerEngineerFlag = rs.getInt("register_engineer_flag"); if (!rs.wasNull()) { row.setRegisterEngineerFlag(registerEngineerFlag); diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java index 3a75354..c9bfa4c 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java @@ -130,7 +130,7 @@ public class ComplianceCheckUtil { .filter(p -> p.getRegisterEngineerFlag() != null && p.getRegisterEngineerFlag() == 1) .count(); long seniorTitleCount = personnelList.stream() - .filter(p -> QualificationLevelEnum.SENIOR.getCode().equals(p.getTitleName())) + .filter(p -> QualificationLevelEnum.SENIOR.getCode().equals(p.getTitleCode())) .count(); long engineerRate = engineerCount * 100 / total; long seniorTitleRate = seniorTitleCount * 100 / total; diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml index f018bb5..2d2b0fe 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml @@ -13,7 +13,7 @@ - + @@ -54,7 +54,7 @@ person_type_code, person_type_name, position_name, - title_name, + title_code, gender_code, gender_name, birth_date, diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml index 94d2556..d573364 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml @@ -11,7 +11,7 @@ - + @@ -46,7 +46,7 @@ - `id`, `filing_id`, `source_personnel_id`, `person_name`, `person_type_code`, `person_type_name`, `position_name`, `title_name`, `gender_code`, `gender_name`, `birth_date`, `join_work_date`, `id_card_no`, `current_address`, `office_address`, `education_code`, `education_name`, `graduate_school`, `major`, `qual_scope`, `publications`, `professional_level_cert`, `register_engineer_flag`, `ability_declaration`, `work_experience`, `proof_material_url`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `org_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env` + `id`, `filing_id`, `source_personnel_id`, `person_name`, `person_type_code`, `person_type_name`, `position_name`, `title_code`, `gender_code`, `gender_name`, `birth_date`, `join_work_date`, `id_card_no`, `current_address`, `office_address`, `education_code`, `education_name`, `graduate_school`, `major`, `qual_scope`, `publications`, `professional_level_cert`, `register_engineer_flag`, `ability_declaration`, `work_experience`, `proof_material_url`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `org_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`