From 4f15fcfa3e4599aa07c15d69961d0e668890d057 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Sat, 8 Aug 2026 16:43:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E7=AE=A1?= =?UTF-8?q?=E7=90=86:=20=E4=B8=93=E4=B8=9A=E8=83=BD=E5=8A=9B=E6=9D=90?= =?UTF-8?q?=E6=96=99=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/web/OrgPersonnelController.java | 6 ++++++ .../app/executor/OrgPersonnelExecutor.java | 9 +++++++++ .../qinan/safetyeval/client/api/OrgPersonnelApi.java | 1 + .../qinan/safetyeval/client/co/OrgPersonnelCO.java | 8 ++++---- .../safetyeval/client/dto/OrgPersonnelAddCmd.java | 12 ++++++------ ...ProfessionalCapabilityProofMaterialUpdateCmd.java | 12 ++++++++++++ 6 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/ProfessionalCapabilityProofMaterialUpdateCmd.java diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelController.java index dfb3f999..6d9d0435 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelController.java @@ -71,6 +71,12 @@ public class OrgPersonnelController { return orgPersonnelApi.resetPassword(req.getData().getId(), req.getData().getResetPassword()); } + @ApiOperation("专业能力材料变更") + @PostMapping("/professionalCapabilityProofMaterialUpdate") + public SingleResponse professionalCapabilityProofMaterialUpdate(@RequestBody ProfessionalCapabilityProofMaterialUpdateCmd cmd) { + return orgPersonnelApi.professionalCapabilityProofMaterialUpdate(cmd); + } + @ApiOperation("导入人员信息") @PostMapping("/import") public SingleResponse importPersonnel( 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 91cf631a..8c3a94d7 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 @@ -1,6 +1,7 @@ package org.qinan.safetyeval.app.executor; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jjb.saas.system.client.user.request.UserAddCmd; @@ -457,4 +458,12 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi { }).collect(Collectors.toList()); return SingleResponse.success(orgPersonnelCOS); } + + @Override + public SingleResponse professionalCapabilityProofMaterialUpdate(ProfessionalCapabilityProofMaterialUpdateCmd cmd) { + orgPersonnelMapper.update(new LambdaUpdateWrapper() + .eq(OrgPersonnelDO::getId, cmd.getId()) + .set(OrgPersonnelDO::getProfessionalCapabilityProofMaterial, cmd.getProfessionalCapabilityProofMaterial())); + return SingleResponse.success(); + } } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/OrgPersonnelApi.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/OrgPersonnelApi.java index 224de5de..b77876db 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/OrgPersonnelApi.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/OrgPersonnelApi.java @@ -52,4 +52,5 @@ public interface OrgPersonnelApi { SingleResponse> getOrgPersonnel(); + SingleResponse professionalCapabilityProofMaterialUpdate(ProfessionalCapabilityProofMaterialUpdateCmd cmd); } 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 88cf8ef8..0297d271 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 @@ -1,13 +1,13 @@ package org.qinan.safetyeval.client.co; import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDate; -import java.util.List; - import lombok.Data; import org.qinan.safetyeval.domain.entity.CapabilityAssessmentDTO; import org.qinan.safetyeval.domain.entity.TitleCodeCo; +import java.time.LocalDate; +import java.util.List; + /** * 人员信息CO(Client Object) * @@ -115,7 +115,7 @@ public class OrgPersonnelCO { @ApiModelProperty(value = "工作经历") private String workExperience; - @ApiModelProperty(value = "证明材料附件地址") + @ApiModelProperty(value = "学历证明") private String proofMaterialUrl; @ApiModelProperty(value = "能力认定") 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 de4b9e4c..9b34847f 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 @@ -1,15 +1,15 @@ package org.qinan.safetyeval.client.dto; import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDate; -import java.util.List; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; import lombok.Data; -import org.qinan.safetyeval.client.co.OrgPersonnelCertCO; import org.qinan.safetyeval.domain.entity.CapabilityAssessmentDTO; import org.qinan.safetyeval.domain.entity.TitleCodeCo; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; +import java.time.LocalDate; +import java.util.List; + /** * 人员信息新增命令 * @@ -129,7 +129,7 @@ public class OrgPersonnelAddCmd { private String workExperience; @Size(max = 2000, message = "证明材料地址长度不能超过2000个字符") - @ApiModelProperty(value = "申报专业能力证明材料地址") + @ApiModelProperty(value = "学历证明") private String proofMaterialUrl; @ApiModelProperty(value = "能力认定") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/ProfessionalCapabilityProofMaterialUpdateCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/ProfessionalCapabilityProofMaterialUpdateCmd.java new file mode 100644 index 00000000..e98cdfae --- /dev/null +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/ProfessionalCapabilityProofMaterialUpdateCmd.java @@ -0,0 +1,12 @@ +package org.qinan.safetyeval.client.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class ProfessionalCapabilityProofMaterialUpdateCmd { + @ApiModelProperty(value = "主键ID") + private Long id; + @ApiModelProperty(value = "专业能力证明材料") + private String professionalCapabilityProofMaterial; +}