Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java
#	safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgInfoGatewayImpl.java

safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgInfoExecutor.java

@@ -67,6 +67,15 @@ public class OrgInfoExecutor implements OrgInfoApi {
         entity.setEconomyIndustryName(cmd.getEconomyIndustryName());
         entity.setAuthStatusCode(cmd.getAuthStatusCode());
         entity.setAuthStatusName(cmd.getAuthStatusName());
+        entity.setEnterpriseStatusCode(cmd.getEnterpriseStatusCode());
+        entity.setEnterpriseStatusName(cmd.getEnterpriseStatusName());
+        entity.setEnterpriseScaleCode(cmd.getEnterpriseScaleCode());
+        entity.setEnterpriseScaleName(cmd.getEnterpriseScaleName());
+        entity.setFilingTypeCode(cmd.getFilingTypeCode());
+        entity.setFilingTypeName(cmd.getFilingTypeName());
+        entity.setFilingRecordStatusCode(cmd.getFilingRecordStatusCode());
+        entity.setFilingRecordStatusName(cmd.getFilingRecordStatusName());
+        entity.setAttachmentUrls(cmd.getAttachmentUrls());
 
         OrgInfoEntity result = orgInfoDomainService.add(entity);
         return SingleResponse.success(toCO(result));
@@ -115,6 +124,15 @@ public class OrgInfoExecutor implements OrgInfoApi {
         entity.setEconomyIndustryName(cmd.getEconomyIndustryName());
         entity.setAuthStatusCode(cmd.getAuthStatusCode());
         entity.setAuthStatusName(cmd.getAuthStatusName());
+        entity.setEnterpriseStatusCode(cmd.getEnterpriseStatusCode());
+        entity.setEnterpriseStatusName(cmd.getEnterpriseStatusName());
+        entity.setEnterpriseScaleCode(cmd.getEnterpriseScaleCode());
+        entity.setEnterpriseScaleName(cmd.getEnterpriseScaleName());
+        entity.setFilingTypeCode(cmd.getFilingTypeCode());
+        entity.setFilingTypeName(cmd.getFilingTypeName());
+        entity.setFilingRecordStatusCode(cmd.getFilingRecordStatusCode());
+        entity.setFilingRecordStatusName(cmd.getFilingRecordStatusName());
+        entity.setAttachmentUrls(cmd.getAttachmentUrls());
 
         OrgInfoEntity result = orgInfoDomainService.modify(entity);
         return SingleResponse.success(toCO(result));
@@ -209,6 +227,15 @@ public class OrgInfoExecutor implements OrgInfoApi {
         co.setEconomyIndustryName(entity.getEconomyIndustryName());
         co.setAuthStatusCode(entity.getAuthStatusCode());
         co.setAuthStatusName(entity.getAuthStatusName());
+        co.setEnterpriseStatusCode(entity.getEnterpriseStatusCode());
+        co.setEnterpriseStatusName(entity.getEnterpriseStatusName());
+        co.setEnterpriseScaleCode(entity.getEnterpriseScaleCode());
+        co.setEnterpriseScaleName(entity.getEnterpriseScaleName());
+        co.setFilingTypeCode(entity.getFilingTypeCode());
+        co.setFilingTypeName(entity.getFilingTypeName());
+        co.setFilingRecordStatusCode(entity.getFilingRecordStatusCode());
+        co.setFilingRecordStatusName(entity.getFilingRecordStatusName());
+        co.setAttachmentUrls(entity.getAttachmentUrls());
         co.setState(entity.getState());
         co.setTenantId(entity.getTenantId());
         return co;

safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java

@@ -1,9 +1,14 @@
 package org.qinan.safetyeval.app.executor;
 
+import com.jjb.saas.system.client.user.facade.UserFacade;
+import com.jjb.saas.system.client.user.request.FacadeUserAddCmd;
 import com.jjb.saas.system.client.user.request.UserAddCmd;
 import com.jjb.saas.system.client.user.request.UserUpdatePasswordCmd;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import com.zcloud.gbscommon.utils.MD5;
+import com.zcloud.gbscommon.utils.Sm2Util;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.qinan.safetyeval.app.support.OrgPersonnelChangeRecorder;
 import org.qinan.safetyeval.app.support.OrgPersonnelViewEnricher;
 import org.qinan.safetyeval.client.api.OrgPersonnelApi;
@@ -56,6 +61,8 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi {
 
     @Value("${def.password:a123456}")
     private String defPassword;
+    @Value("${def.publicKey:0402df2195296d4062ac85ad766994d73e871b887e18efb9a9a06b4cebc72372869b7da6c347c129dee2b46a0f279ff066b01c76208c2a052af75977c722a2ccee}")
+    private String publicKey;
 
 
     @Value("${safety-eval.gbs-user-sync.fail-fast:true}")
@@ -119,7 +126,8 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi {
         // 联调阶段：密码重置占位，后续对接统一用户中心
         UserUpdatePasswordCmd userUpdatePasswordCmd = new UserUpdatePasswordCmd();
         userUpdatePasswordCmd.setId(entity.getId());
-        userUpdatePasswordCmd.setPassword(defPassword);
+        String encrypt = Sm2Util.encryptHex(MD5.md5(defPassword), publicKey);
+        userUpdatePasswordCmd.setPassword(encrypt);
         syncGbsUser("reset user password", new Runnable() {
             @Override
             public void run() {
@@ -191,6 +199,7 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi {
         entity.setMajor(cmd.getMajor());
         entity.setEmploymentStatusCode(cmd.getEmploymentStatusCode());
         entity.setEmploymentStatusName(cmd.getEmploymentStatusName());
+        applyPersonnelExtFields(entity, cmd);
         entity.setDeptId(cmd.getDeptId());
         entity.setPostId(cmd.getPostId());
         return entity;
@@ -212,11 +221,50 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi {
         entity.setMajor(cmd.getMajor());
         entity.setEmploymentStatusCode(cmd.getEmploymentStatusCode());
         entity.setEmploymentStatusName(cmd.getEmploymentStatusName());
+        applyPersonnelExtFields(entity, cmd);
         entity.setDeptId(cmd.getDeptId());
         entity.setPostId(cmd.getPostId());
         return entity;
     }
 
+    private void applyPersonnelExtFields(OrgPersonnelEntity entity, OrgPersonnelAddCmd cmd) {
+        entity.setPersonTypeCode(cmd.getPersonTypeCode());
+        entity.setPersonTypeName(cmd.getPersonTypeName());
+        entity.setQualScope(cmd.getQualScope());
+        entity.setProfessionalLevelCode(cmd.getProfessionalLevelCode());
+        entity.setProfessionalLevelName(cmd.getProfessionalLevelName());
+        entity.setEvaluatorCertNo(cmd.getEvaluatorCertNo());
+        entity.setEducationTypeCode(cmd.getEducationTypeCode());
+        entity.setEducationTypeName(cmd.getEducationTypeName());
+        entity.setEducationLevelCode(cmd.getEducationLevelCode());
+        entity.setEducationLevelName(cmd.getEducationLevelName());
+        entity.setTitleName(cmd.getTitleName());
+        entity.setRegisterEngineerFlag(cmd.getRegisterEngineerFlag());
+        entity.setPublications(cmd.getPublications());
+        entity.setAbilityDeclaration(cmd.getAbilityDeclaration());
+        entity.setWorkExperience(cmd.getWorkExperience());
+        entity.setProofMaterialUrl(cmd.getProofMaterialUrl());
+    }
+
+    private void applyPersonnelExtFields(OrgPersonnelEntity entity, OrgPersonnelModifyCmd cmd) {
+        entity.setPersonTypeCode(cmd.getPersonTypeCode());
+        entity.setPersonTypeName(cmd.getPersonTypeName());
+        entity.setQualScope(cmd.getQualScope());
+        entity.setProfessionalLevelCode(cmd.getProfessionalLevelCode());
+        entity.setProfessionalLevelName(cmd.getProfessionalLevelName());
+        entity.setEvaluatorCertNo(cmd.getEvaluatorCertNo());
+        entity.setEducationTypeCode(cmd.getEducationTypeCode());
+        entity.setEducationTypeName(cmd.getEducationTypeName());
+        entity.setEducationLevelCode(cmd.getEducationLevelCode());
+        entity.setEducationLevelName(cmd.getEducationLevelName());
+        entity.setTitleName(cmd.getTitleName());
+        entity.setRegisterEngineerFlag(cmd.getRegisterEngineerFlag());
+        entity.setPublications(cmd.getPublications());
+        entity.setAbilityDeclaration(cmd.getAbilityDeclaration());
+        entity.setWorkExperience(cmd.getWorkExperience());
+        entity.setProofMaterialUrl(cmd.getProofMaterialUrl());
+    }
+
     private OrgPersonnelCO toCO(OrgPersonnelEntity entity) {
         if (entity == null) {
             return null;
@@ -239,6 +287,22 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi {
         co.setMajor(entity.getMajor());
         co.setEmploymentStatusCode(entity.getEmploymentStatusCode());
         co.setEmploymentStatusName(entity.getEmploymentStatusName());
+        co.setPersonTypeCode(entity.getPersonTypeCode());
+        co.setPersonTypeName(entity.getPersonTypeName());
+        co.setQualScope(entity.getQualScope());
+        co.setProfessionalLevelCode(entity.getProfessionalLevelCode());
+        co.setProfessionalLevelName(entity.getProfessionalLevelName());
+        co.setEvaluatorCertNo(entity.getEvaluatorCertNo());
+        co.setEducationTypeCode(entity.getEducationTypeCode());
+        co.setEducationTypeName(entity.getEducationTypeName());
+        co.setEducationLevelCode(entity.getEducationLevelCode());
+        co.setEducationLevelName(entity.getEducationLevelName());
+        co.setTitleName(entity.getTitleName());
+        co.setRegisterEngineerFlag(entity.getRegisterEngineerFlag());
+        co.setPublications(entity.getPublications());
+        co.setAbilityDeclaration(entity.getAbilityDeclaration());
+        co.setWorkExperience(entity.getWorkExperience());
+        co.setProofMaterialUrl(entity.getProofMaterialUrl());
         co.setTenantId(entity.getTenantId());
         return co;
     }

safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgResignApplyExecutor.java

@@ -41,9 +41,9 @@ public class OrgResignApplyExecutor implements OrgResignApplyApi {
     @Override
     public SingleResponse<OrgResignApplyCO> add(OrgResignApplyAddCmd cmd) {
         OrgResignApplyEntity entity = new OrgResignApplyEntity();
-        // 申请人从当前登录用户自动获取，不从前端参数传入
+        Long personnelId = resolvePersonnelId(cmd.getPersonnelId(), cmd.getApplicantName());
-        String currentUserName = AuthUserContextAdapter.getCurrentUserName();
+        entity.setPersonnelId(personnelId);
-        entity.setApplicantName(StringUtils.hasText(currentUserName) ? currentUserName : cmd.getApplicantName());
+        entity.setApplicantName(resolveApplicantName(personnelId, cmd.getApplicantName()));
         entity.setApplyTime(cmd.getApplyTime());
         entity.setResignReason(cmd.getResignReason());
         entity.setExpectedResignDate(cmd.getExpectedResignDate());
@@ -52,7 +52,6 @@ public class OrgResignApplyExecutor implements OrgResignApplyApi {
         entity.setAuditStatusName(cmd.getAuditStatusName() != null ? cmd.getAuditStatusName() : "未审核");
         entity.setRejectReason(cmd.getRejectReason());
         entity.setRemark(cmd.getRemark());
-        entity.setPersonnelId(resolvePersonnelId(cmd.getPersonnelId(), cmd.getApplicantName()));
 
         OrgResignApplyEntity result = orgResignApplyDomainService.add(entity);
         OrgResignApplyCO co = toCO(result);
@@ -130,6 +129,20 @@ public class OrgResignApplyExecutor implements OrgResignApplyApi {
         }
     }
 
+    private String resolveApplicantName(Long personnelId, String applicantName) {
+        if (personnelId != null && orgPersonnelGateway != null) {
+            OrgPersonnelEntity personnel = orgPersonnelGateway.get(personnelId);
+            if (personnel != null && StringUtils.hasText(personnel.getUserName())) {
+                return personnel.getUserName();
+            }
+        }
+        if (StringUtils.hasText(applicantName)) {
+            return applicantName;
+        }
+        String currentUserName = AuthUserContextAdapter.getCurrentUserName();
+        return StringUtils.hasText(currentUserName) ? currentUserName : applicantName;
+    }
+
     private Long resolvePersonnelId(Long personnelId, String applicantName) {
         if (personnelId != null) {
             return personnelId;

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

@@ -118,6 +118,9 @@ public class OrgPersonnelViewEnricher {
         if (personnel == null) {
             return;
         }
+        if (StringUtils.hasText(personnel.getUserName())) {
+            co.setApplicantName(personnel.getUserName());
+        }
         co.setAccount(personnel.getAccount());
         if (personnel.getDeptId() != null && orgDepartmentGateway != null) {
             OrgDepartmentEntity dept = orgDepartmentGateway.get(personnel.getDeptId());

safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgInfoCO.java

@@ -114,6 +114,33 @@ public class OrgInfoCO {
     /** authStatusName */
     private String authStatusName;
 
+    /** enterpriseStatusCode */
+    private Integer enterpriseStatusCode;
+
+    /** enterpriseStatusName */
+    private String enterpriseStatusName;
+
+    /** enterpriseScaleCode */
+    private String enterpriseScaleCode;
+
+    /** enterpriseScaleName */
+    private String enterpriseScaleName;
+
+    /** filingTypeCode */
+    private String filingTypeCode;
+
+    /** filingTypeName */
+    private String filingTypeName;
+
+    /** filingRecordStatusCode */
+    private Integer filingRecordStatusCode;
+
+    /** filingRecordStatusName */
+    private String filingRecordStatusName;
+
+    /** attachmentUrls */
+    private String attachmentUrls;
+
     /** 状态(0启用1禁用) */
     private Integer state;
 

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

@@ -62,6 +62,54 @@ public class OrgPersonnelCO {
     /** employmentStatusName */
     private String employmentStatusName;
 
+    /** personTypeCode */
+    private String personTypeCode;
+
+    /** personTypeName */
+    private String personTypeName;
+
+    /** qualScope */
+    private String qualScope;
+
+    /** professionalLevelCode */
+    private String professionalLevelCode;
+
+    /** professionalLevelName */
+    private String professionalLevelName;
+
+    /** evaluatorCertNo */
+    private String evaluatorCertNo;
+
+    /** educationTypeCode */
+    private String educationTypeCode;
+
+    /** educationTypeName */
+    private String educationTypeName;
+
+    /** educationLevelCode */
+    private String educationLevelCode;
+
+    /** educationLevelName */
+    private String educationLevelName;
+
+    /** titleName */
+    private String titleName;
+
+    /** registerEngineerFlag */
+    private Integer registerEngineerFlag;
+
+    /** publications */
+    private String publications;
+
+    /** abilityDeclaration */
+    private String abilityDeclaration;
+
+    /** workExperience */
+    private String workExperience;
+
+    /** proofMaterialUrl */
+    private String proofMaterialUrl;
+
     /** 部门名称（列表展示，非持久化） */
     private String deptName;
 

safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoAddCmd.java

@@ -110,4 +110,31 @@ public class OrgInfoAddCmd {
 
     /** authStatusName */
     private String authStatusName;
+
+    /** enterpriseStatusCode */
+    private Integer enterpriseStatusCode;
+
+    /** enterpriseStatusName */
+    private String enterpriseStatusName;
+
+    /** enterpriseScaleCode */
+    private String enterpriseScaleCode;
+
+    /** enterpriseScaleName */
+    private String enterpriseScaleName;
+
+    /** filingTypeCode */
+    private String filingTypeCode;
+
+    /** filingTypeName */
+    private String filingTypeName;
+
+    /** filingRecordStatusCode */
+    private Integer filingRecordStatusCode;
+
+    /** filingRecordStatusName */
+    private String filingRecordStatusName;
+
+    /** attachmentUrls */
+    private String attachmentUrls;
 }

safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoModifyCmd.java

@@ -114,6 +114,33 @@ public class OrgInfoModifyCmd {
     /** authStatusName */
     private String authStatusName;
 
+    /** enterpriseStatusCode */
+    private Integer enterpriseStatusCode;
+
+    /** enterpriseStatusName */
+    private String enterpriseStatusName;
+
+    /** enterpriseScaleCode */
+    private String enterpriseScaleCode;
+
+    /** enterpriseScaleName */
+    private String enterpriseScaleName;
+
+    /** filingTypeCode */
+    private String filingTypeCode;
+
+    /** filingTypeName */
+    private String filingTypeName;
+
+    /** filingRecordStatusCode */
+    private Integer filingRecordStatusCode;
+
+    /** filingRecordStatusName */
+    private String filingRecordStatusName;
+
+    /** attachmentUrls */
+    private String attachmentUrls;
+
     /** 租户ID */
     private Long tenantId;
 }

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

@@ -53,6 +53,54 @@ public class OrgPersonnelAddCmd {
     /** employmentStatusName */
     private String employmentStatusName;
 
+    /** personTypeCode */
+    private String personTypeCode;
+
+    /** personTypeName */
+    private String personTypeName;
+
+    /** qualScope */
+    private String qualScope;
+
+    /** professionalLevelCode */
+    private String professionalLevelCode;
+
+    /** professionalLevelName */
+    private String professionalLevelName;
+
+    /** evaluatorCertNo */
+    private String evaluatorCertNo;
+
+    /** educationTypeCode */
+    private String educationTypeCode;
+
+    /** educationTypeName */
+    private String educationTypeName;
+
+    /** educationLevelCode */
+    private String educationLevelCode;
+
+    /** educationLevelName */
+    private String educationLevelName;
+
+    /** titleName */
+    private String titleName;
+
+    /** registerEngineerFlag */
+    private Integer registerEngineerFlag;
+
+    /** publications */
+    private String publications;
+
+    /** abilityDeclaration */
+    private String abilityDeclaration;
+
+    /** workExperience */
+    private String workExperience;
+
+    /** proofMaterialUrl */
+    private String proofMaterialUrl;
+
     /** deptId */
     private Long deptId;
 

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

@@ -56,6 +56,54 @@ public class OrgPersonnelModifyCmd {
     /** employmentStatusName */
     private String employmentStatusName;
 
+    /** personTypeCode */
+    private String personTypeCode;
+
+    /** personTypeName */
+    private String personTypeName;
+
+    /** qualScope */
+    private String qualScope;
+
+    /** professionalLevelCode */
+    private String professionalLevelCode;
+
+    /** professionalLevelName */
+    private String professionalLevelName;
+
+    /** evaluatorCertNo */
+    private String evaluatorCertNo;
+
+    /** educationTypeCode */
+    private String educationTypeCode;
+
+    /** educationTypeName */
+    private String educationTypeName;
+
+    /** educationLevelCode */
+    private String educationLevelCode;
+
+    /** educationLevelName */
+    private String educationLevelName;
+
+    /** titleName */
+    private String titleName;
+
+    /** registerEngineerFlag */
+    private Integer registerEngineerFlag;
+
+    /** publications */
+    private String publications;
+
+    /** abilityDeclaration */
+    private String abilityDeclaration;
+
+    /** workExperience */
+    private String workExperience;
+
+    /** proofMaterialUrl */
+    private String proofMaterialUrl;
+
     /** deptId */
     private Long deptId;
 

safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgInfoEntity.java

@@ -115,6 +115,33 @@ public class OrgInfoEntity {
     /** 认证状态名称 */
     private String authStatusName;
 
+    /** 企业状态编码 */
+    private Integer enterpriseStatusCode;
+
+    /** 企业状态名称 */
+    private String enterpriseStatusName;
+
+    /** 企业规模编码 */
+    private String enterpriseScaleCode;
+
+    /** 企业规模名称 */
+    private String enterpriseScaleName;
+
+    /** 备案类型编码 */
+    private String filingTypeCode;
+
+    /** 备案类型名称 */
+    private String filingTypeName;
+
+    /** 备案状态编码 */
+    private Integer filingRecordStatusCode;
+
+    /** 备案状态名称 */
+    private String filingRecordStatusName;
+
+    /** 上传附件地址(多个逗号分隔) */
+    private String attachmentUrls;
+
     /** 状态(0启用1禁用) */
     private Integer state;
 

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

@@ -66,6 +66,54 @@ public class OrgPersonnelEntity {
     /** 就职状态名称 */
     private String employmentStatusName;
 
+    /** 人员类型编码 */
+    private String personTypeCode;
+
+    /** 人员类型名称 */
+    private String personTypeName;
+
+    /** 资质范围 */
+    private String qualScope;
+
+    /** 职业等级编码 */
+    private String professionalLevelCode;
+
+    /** 职业等级名称 */
+    private String professionalLevelName;
+
+    /** 安全评价师证书编号 */
+    private String evaluatorCertNo;
+
+    /** 学历类型编码 */
+    private String educationTypeCode;
+
+    /** 学历类型名称 */
+    private String educationTypeName;
+
+    /** 学历层次编码 */
+    private String educationLevelCode;
+
+    /** 学历层次名称 */
+    private String educationLevelName;
+
+    /** 职称 */
+    private String titleName;
+
+    /** 是否注册安全工程师(1是2否) */
+    private Integer registerEngineerFlag;
+
+    /** 出版学术专著专利获奖论文等 */
+    private String publications;
+
+    /** 自我申报的专业能力及认定方式 */
+    private String abilityDeclaration;
+
+    /** 主要学习工作经历 */
+    private String workExperience;
+
+    /** 申报专业能力证明材料(多个逗号分隔) */
+    private String proofMaterialUrl;
+
     /** 租户ID */
     private Long tenantId;
 }

safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/service/OrgPersonnelDomainService.java

@@ -86,6 +86,46 @@ public class OrgPersonnelDomainService {
         if (patch.getPostId() != null) {
             target.setPostId(patch.getPostId());
         }
+        if (StringUtils.hasText(patch.getPersonTypeCode())) {
+            target.setPersonTypeCode(patch.getPersonTypeCode());
+            target.setPersonTypeName(patch.getPersonTypeName());
+        }
+        if (patch.getQualScope() != null) {
+            target.setQualScope(patch.getQualScope());
+        }
+        if (StringUtils.hasText(patch.getProfessionalLevelCode())) {
+            target.setProfessionalLevelCode(patch.getProfessionalLevelCode());
+            target.setProfessionalLevelName(patch.getProfessionalLevelName());
+        }
+        if (patch.getEvaluatorCertNo() != null) {
+            target.setEvaluatorCertNo(patch.getEvaluatorCertNo());
+        }
+        if (StringUtils.hasText(patch.getEducationTypeCode())) {
+            target.setEducationTypeCode(patch.getEducationTypeCode());
+            target.setEducationTypeName(patch.getEducationTypeName());
+        }
+        if (StringUtils.hasText(patch.getEducationLevelCode())) {
+            target.setEducationLevelCode(patch.getEducationLevelCode());
+            target.setEducationLevelName(patch.getEducationLevelName());
+        }
+        if (patch.getTitleName() != null) {
+            target.setTitleName(patch.getTitleName());
+        }
+        if (patch.getRegisterEngineerFlag() != null) {
+            target.setRegisterEngineerFlag(patch.getRegisterEngineerFlag());
+        }
+        if (patch.getPublications() != null) {
+            target.setPublications(patch.getPublications());
+        }
+        if (patch.getAbilityDeclaration() != null) {
+            target.setAbilityDeclaration(patch.getAbilityDeclaration());
+        }
+        if (patch.getWorkExperience() != null) {
+            target.setWorkExperience(patch.getWorkExperience());
+        }
+        if (patch.getProofMaterialUrl() != null) {
+            target.setProofMaterialUrl(patch.getProofMaterialUrl());
+        }
     }
 
     public void delete(Long id) {

safety-eval-infrastructure/pom.xml

@@ -73,5 +73,11 @@
             <groupId>com.jjb.saas</groupId>
             <artifactId>jjb-saas-framework-facade</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.zcloud.gbscommon</groupId>
+            <artifactId>zcloud_gbscommon</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 </project>

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgInfoDO.java

@@ -50,6 +50,15 @@ public class OrgInfoDO {
     private String economyIndustryName;
     private Integer authStatusCode;
     private String authStatusName;
+    private Integer enterpriseStatusCode;
+    private String enterpriseStatusName;
+    private String enterpriseScaleCode;
+    private String enterpriseScaleName;
+    private String filingTypeCode;
+    private String filingTypeName;
+    private Integer filingRecordStatusCode;
+    private String filingRecordStatusName;
+    private String attachmentUrls;
     private Integer state;
 
     // ---- GBS默认字段 ----

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

@@ -33,6 +33,22 @@ public class OrgPersonnelDO {
     private String major;
     private Integer employmentStatusCode;
     private String employmentStatusName;
+    private String personTypeCode;
+    private String personTypeName;
+    private String qualScope;
+    private String professionalLevelCode;
+    private String professionalLevelName;
+    private String evaluatorCertNo;
+    private String educationTypeCode;
+    private String educationTypeName;
+    private String educationLevelCode;
+    private String educationLevelName;
+    private String titleName;
+    private Integer registerEngineerFlag;
+    private String publications;
+    private String abilityDeclaration;
+    private String workExperience;
+    private String proofMaterialUrl;
 
     // ---- GBS默认字段 ----
     private String deleteEnum;

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgInfoGatewayImpl.java

@@ -3,10 +3,14 @@ package org.qinan.safetyeval.infrastructure.gatewayimpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jjb.saas.system.client.user.facade.UserFacade;
 import com.jjb.saas.system.client.user.request.UserUpdatePasswordCmd;
 import com.jjb.saas.system.client.user.request.UserUpdateQuitCmd;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import com.zcloud.gbscommon.utils.MD5;
+import com.zcloud.gbscommon.utils.Sm2Util;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.qinan.safetyeval.domain.entity.OrgInfoEntity;
 import org.qinan.safetyeval.domain.gateway.OrgInfoGateway;
 import org.qinan.safetyeval.domain.query.OrgInfoQuery;
@@ -50,6 +54,8 @@ public class OrgInfoGatewayImpl implements OrgInfoGateway {
     private GbsUserFacadeClient gbsUserFacadeClient;
     @Value("${def.password:a123456}")
     private String defPassword;
+    @Value("${def.publicKey:0402df2195296d4062ac85ad766994d73e871b887e18efb9a9a06b4cebc72372869b7da6c347c129dee2b46a0f279ff066b01c76208c2a052af75977c722a2ccee}")
+    private String publicKey;
 
 
     @Value("${safety-eval.gbs-user-sync.fail-fast:true}")
@@ -198,7 +204,8 @@ public class OrgInfoGatewayImpl implements OrgInfoGateway {
         // 同步重置gbs用户密码
         UserUpdatePasswordCmd userUpdatePasswordCmd = new UserUpdatePasswordCmd();
         userUpdatePasswordCmd.setId(id);
-        userUpdatePasswordCmd.setPassword(defPassword);
+        String encrypt = Sm2Util.encryptHex(MD5.md5(defPassword), publicKey);
+        userUpdatePasswordCmd.setPassword(encrypt);
         syncGbsUser("reset user password", new Runnable() {
             @Override
             public void run() {
@@ -252,6 +259,15 @@ public class OrgInfoGatewayImpl implements OrgInfoGateway {
         dataObject.setEconomyIndustryName(entity.getEconomyIndustryName());
         dataObject.setAuthStatusCode(entity.getAuthStatusCode());
         dataObject.setAuthStatusName(entity.getAuthStatusName());
+        dataObject.setEnterpriseStatusCode(entity.getEnterpriseStatusCode());
+        dataObject.setEnterpriseStatusName(entity.getEnterpriseStatusName());
+        dataObject.setEnterpriseScaleCode(entity.getEnterpriseScaleCode());
+        dataObject.setEnterpriseScaleName(entity.getEnterpriseScaleName());
+        dataObject.setFilingTypeCode(entity.getFilingTypeCode());
+        dataObject.setFilingTypeName(entity.getFilingTypeName());
+        dataObject.setFilingRecordStatusCode(entity.getFilingRecordStatusCode());
+        dataObject.setFilingRecordStatusName(entity.getFilingRecordStatusName());
+        dataObject.setAttachmentUrls(entity.getAttachmentUrls());
         dataObject.setState(entity.getState());
         dataObject.setTenantId(entity.getTenantId());
         return dataObject;
@@ -296,6 +312,15 @@ public class OrgInfoGatewayImpl implements OrgInfoGateway {
         entity.setEconomyIndustryName(dataObject.getEconomyIndustryName());
         entity.setAuthStatusCode(dataObject.getAuthStatusCode());
         entity.setAuthStatusName(dataObject.getAuthStatusName());
+        entity.setEnterpriseStatusCode(dataObject.getEnterpriseStatusCode());
+        entity.setEnterpriseStatusName(dataObject.getEnterpriseStatusName());
+        entity.setEnterpriseScaleCode(dataObject.getEnterpriseScaleCode());
+        entity.setEnterpriseScaleName(dataObject.getEnterpriseScaleName());
+        entity.setFilingTypeCode(dataObject.getFilingTypeCode());
+        entity.setFilingTypeName(dataObject.getFilingTypeName());
+        entity.setFilingRecordStatusCode(dataObject.getFilingRecordStatusCode());
+        entity.setFilingRecordStatusName(dataObject.getFilingRecordStatusName());
+        entity.setAttachmentUrls(dataObject.getAttachmentUrls());
         entity.setState(dataObject.getState());
         entity.setTenantId(dataObject.getTenantId());
         return entity;

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgPersonnelGatewayImpl.java

@@ -146,6 +146,22 @@ public class OrgPersonnelGatewayImpl implements OrgPersonnelGateway {
         dataObject.setMajor(entity.getMajor());
         dataObject.setEmploymentStatusCode(entity.getEmploymentStatusCode());
         dataObject.setEmploymentStatusName(entity.getEmploymentStatusName());
+        dataObject.setPersonTypeCode(entity.getPersonTypeCode());
+        dataObject.setPersonTypeName(entity.getPersonTypeName());
+        dataObject.setQualScope(entity.getQualScope());
+        dataObject.setProfessionalLevelCode(entity.getProfessionalLevelCode());
+        dataObject.setProfessionalLevelName(entity.getProfessionalLevelName());
+        dataObject.setEvaluatorCertNo(entity.getEvaluatorCertNo());
+        dataObject.setEducationTypeCode(entity.getEducationTypeCode());
+        dataObject.setEducationTypeName(entity.getEducationTypeName());
+        dataObject.setEducationLevelCode(entity.getEducationLevelCode());
+        dataObject.setEducationLevelName(entity.getEducationLevelName());
+        dataObject.setTitleName(entity.getTitleName());
+        dataObject.setRegisterEngineerFlag(entity.getRegisterEngineerFlag());
+        dataObject.setPublications(entity.getPublications());
+        dataObject.setAbilityDeclaration(entity.getAbilityDeclaration());
+        dataObject.setWorkExperience(entity.getWorkExperience());
+        dataObject.setProofMaterialUrl(entity.getProofMaterialUrl());
         dataObject.setTenantId(entity.getTenantId());
         return dataObject;
     }
@@ -172,6 +188,22 @@ public class OrgPersonnelGatewayImpl implements OrgPersonnelGateway {
         entity.setMajor(dataObject.getMajor());
         entity.setEmploymentStatusCode(dataObject.getEmploymentStatusCode());
         entity.setEmploymentStatusName(dataObject.getEmploymentStatusName());
+        entity.setPersonTypeCode(dataObject.getPersonTypeCode());
+        entity.setPersonTypeName(dataObject.getPersonTypeName());
+        entity.setQualScope(dataObject.getQualScope());
+        entity.setProfessionalLevelCode(dataObject.getProfessionalLevelCode());
+        entity.setProfessionalLevelName(dataObject.getProfessionalLevelName());
+        entity.setEvaluatorCertNo(dataObject.getEvaluatorCertNo());
+        entity.setEducationTypeCode(dataObject.getEducationTypeCode());
+        entity.setEducationTypeName(dataObject.getEducationTypeName());
+        entity.setEducationLevelCode(dataObject.getEducationLevelCode());
+        entity.setEducationLevelName(dataObject.getEducationLevelName());
+        entity.setTitleName(dataObject.getTitleName());
+        entity.setRegisterEngineerFlag(dataObject.getRegisterEngineerFlag());
+        entity.setPublications(dataObject.getPublications());
+        entity.setAbilityDeclaration(dataObject.getAbilityDeclaration());
+        entity.setWorkExperience(dataObject.getWorkExperience());
+        entity.setProofMaterialUrl(dataObject.getProofMaterialUrl());
         entity.setTenantId(dataObject.getTenantId());
         return entity;
     }

safety-eval-start/src/main/resources/application-local.yml

@@ -122,3 +122,4 @@ safety-eval:
     org-id: 1
 def:
   passwrod: a123456
+  publicKey: 0402df2195296d4062ac85ad766994d73e871b887e18efb9a9a06b4cebc72372869b7da6c347c129dee2b46a0f279ff066b01c76208c2a052af75977c722a2ccee