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 61d6bd4..2c01a72 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
@@ -39,6 +39,7 @@ public class QualFilingPersonnelExecutor implements QualFilingPersonnelApi {
entity.setGenderCode(cmd.getGenderCode());
entity.setGenderName(cmd.getGenderName());
entity.setBirthDate(cmd.getBirthDate());
+ entity.setJoinWorkDate(cmd.getJoinWorkDate());
entity.setIdCardNo(cmd.getIdCardNo());
entity.setCurrentAddress(cmd.getCurrentAddress());
entity.setOfficeAddress(cmd.getOfficeAddress());
@@ -76,6 +77,7 @@ public class QualFilingPersonnelExecutor implements QualFilingPersonnelApi {
entity.setGenderCode(cmd.getGenderCode());
entity.setGenderName(cmd.getGenderName());
entity.setBirthDate(cmd.getBirthDate());
+ entity.setJoinWorkDate(cmd.getJoinWorkDate());
entity.setIdCardNo(cmd.getIdCardNo());
entity.setCurrentAddress(cmd.getCurrentAddress());
entity.setOfficeAddress(cmd.getOfficeAddress());
@@ -144,6 +146,7 @@ public class QualFilingPersonnelExecutor implements QualFilingPersonnelApi {
co.setGenderCode(entity.getGenderCode());
co.setGenderName(entity.getGenderName());
co.setBirthDate(entity.getBirthDate());
+ co.setJoinWorkDate(entity.getJoinWorkDate());
co.setIdCardNo(entity.getIdCardNo());
co.setCurrentAddress(entity.getCurrentAddress());
co.setOfficeAddress(entity.getOfficeAddress());
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 4dd658e..99a1fee 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
@@ -722,6 +722,7 @@ public class QualFilingOrchestrator {
co.setGenderCode(entity.getGenderCode());
co.setGenderName(entity.getGenderName());
co.setBirthDate(entity.getBirthDate());
+ co.setJoinWorkDate(entity.getJoinWorkDate());
co.setIdCardNo(entity.getIdCardNo());
co.setCurrentAddress(entity.getCurrentAddress());
co.setOfficeAddress(entity.getOfficeAddress());
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 2124d7a..29178d2 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
@@ -44,6 +44,9 @@ public class QualFilingPersonnelCO {
/** birthDate */
private LocalDate birthDate;
+ /** 参加工作时间 */
+ private LocalDate joinWorkDate;
+
/** idCardNo */
private String idCardNo;
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 54b61f0..4894917 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
@@ -35,6 +35,9 @@ public class QualFilingPersonnelAddCmd {
/** birthDate */
private LocalDate birthDate;
+ /** 参加工作时间 */
+ private LocalDate joinWorkDate;
+
/** idCardNo */
private String idCardNo;
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 85999c3..93c1c42 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
@@ -38,6 +38,9 @@ public class QualFilingPersonnelModifyCmd {
/** birthDate */
private LocalDate birthDate;
+ /** 参加工作时间 */
+ private LocalDate joinWorkDate;
+
/** idCardNo */
private String idCardNo;
diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/MaterialTypeEnum.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/MaterialTypeEnum.java
index 2f28ab9..bfeeb9b 100644
--- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/MaterialTypeEnum.java
+++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/MaterialTypeEnum.java
@@ -14,7 +14,10 @@ public enum MaterialTypeEnum {
WORKPLACE_AREA_CERT(7, "工作场所及档案室面积证明"),
PROFESSIONAL_ABILITY_CERT(8, "安全评价师专业能力证明"),
RELATED_PERSONNEL_CERT(9, "相关负责人证明材料"),
- INTERNAL_MANAGEMENT_SYSTEM(10, "机构内部管理制度");
+ INTERNAL_MANAGEMENT_SYSTEM(10, "机构内部管理制度"),
+ ;
+
+ public static final String REMARKS = "1,申请材料目录（原件）,2,申请书（原件）,3,法人证明（复印件）,4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书（原件）,6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度";
private final int code;
private final String name;
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 6a0fdc7..2764c0a 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
@@ -45,6 +45,9 @@ public class QualFilingPersonnelEntity {
/** 出生日期 */
private LocalDate birthDate;
+ /** 参加工作时间 */
+ private LocalDate joinWorkDate;
+
/** 身份证号 */
private String idCardNo;
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 f82c0da..70bdec1 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
@@ -26,6 +26,7 @@ public class QualFilingPersonnelDO {
private Integer genderCode;
private String genderName;
private LocalDate birthDate;
+ private LocalDate joinWorkDate;
private String idCardNo;
private String currentAddress;
private String officeAddress;
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 dad4644..3410460 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
@@ -98,6 +98,7 @@ public class QualFilingPersonnelGatewayImpl implements QualFilingPersonnelGatewa
dataObject.setGenderCode(entity.getGenderCode());
dataObject.setGenderName(entity.getGenderName());
dataObject.setBirthDate(entity.getBirthDate());
+ dataObject.setJoinWorkDate(entity.getJoinWorkDate());
dataObject.setIdCardNo(entity.getIdCardNo());
dataObject.setCurrentAddress(entity.getCurrentAddress());
dataObject.setOfficeAddress(entity.getOfficeAddress());
@@ -132,6 +133,7 @@ public class QualFilingPersonnelGatewayImpl implements QualFilingPersonnelGatewa
entity.setGenderCode(dataObject.getGenderCode());
entity.setGenderName(dataObject.getGenderName());
entity.setBirthDate(dataObject.getBirthDate());
+ entity.setJoinWorkDate(dataObject.getJoinWorkDate());
entity.setIdCardNo(dataObject.getIdCardNo());
entity.setCurrentAddress(dataObject.getCurrentAddress());
entity.setOfficeAddress(dataObject.getOfficeAddress());
diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml
index 0859b4c..94d2556 100644
--- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml
+++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml
@@ -15,6 +15,7 @@
+
@@ -45,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`, `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_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`