From d093fbad07d5553fd80eaee61ac6cc970d37c7f5 Mon Sep 17 00:00:00 2001
From: chen <2710907404@qq.com>
Date: Fri, 1 Nov 2024 14:07:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=201.=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A7=94=E6=89=98=E4=BF=A1=E6=81=AF=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/entrustment/dto/EntrustAlterApplyDTO.java       | 3 +++
 .../platform/entrustment/entity/EntrustAlterApply.java       | 5 +++++
 .../service/impl/EntrustAlterApplyServiceImpl.java           | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/src/main/java/digital/laboratory/platform/entrustment/dto/EntrustAlterApplyDTO.java b/src/main/java/digital/laboratory/platform/entrustment/dto/EntrustAlterApplyDTO.java
index e8f5012..df9397c 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/dto/EntrustAlterApplyDTO.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/dto/EntrustAlterApplyDTO.java
@@ -26,6 +26,9 @@ public class EntrustAlterApplyDTO {
     @NotBlank(message = "关联的委托id不能为空!")
     private String entrustId;
 
+    @ApiModelProperty(value = "申请原因")
+    private String applyReason;
+
     @ApiModelProperty(value = " 0 保存 | 1 提交 (如果调用的是修改接口 1则是撤销操作)")
     private Integer opCode;
 }
\ No newline at end of file
diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustAlterApply.java b/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustAlterApply.java
index ca799da..a619718 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustAlterApply.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustAlterApply.java
@@ -37,6 +37,11 @@ public class EntrustAlterApply extends BaseEntity {
      */
     private LocalDate applyDate;
 
+    /**
+     * 申请原因
+     */
+    private String applyReason;
+
     /**
      * 申请单位
      */
diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java
index 5d4110b..60df118 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java
@@ -58,6 +58,7 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl<EntrustAlterApplyM
             DLPUser user = SecurityUtils.getUser();
             entrustAlterApply.setApplicant(user.getId());
             entrustAlterApply.setApplyOrgId(user.getOrgId());
+            entrustAlterApply.setApplyReason(dto.getApplyReason());
             if (dto.getOpCode() == 0) {
                 entrustAlterApply.setStatus(EntrustAlterApplyStatus.WAIT_SUBMIT_APPLY.getStatus());
             } else if (dto.getOpCode() == 1) {
@@ -109,6 +110,7 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl<EntrustAlterApplyM
         }
         return super.update(Wrappers.<EntrustAlterApply>lambdaUpdate().eq(EntrustAlterApply::getId, dto.getId())
                 .set(EntrustAlterApply::getEntrustId, dto.getEntrustId())
+                .set(StrUtil.isNotBlank(dto.getApplyReason()), EntrustAlterApply::getApplyReason, dto.getApplyReason())
                 .set(dto.getOpCode() == 1,
                         EntrustAlterApply::getStatus, EntrustAlterApplyStatus.WAIT_SUBMIT_APPLY.getStatus()));
     }