feat: 问题修复项

1、审批拒绝新增拒绝原因备注信息

feat: 问题修复项
1、审批拒绝新增拒绝原因备注信息
谢茂盛
1 parent 0c3ae01d
Showing 4 changed files with 14 additions and 2 deletions
sql/table.sql
src/main/java/com/order/erp/domain/dto/order/OrderFieldLockApplyDO.java
src/main/java/com/order/erp/domain/vo/order/AuditVO.java
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
@@ -163,6 +163,7 @@ CREATE TABLE `order_field_lock_apply` (
           `status`    INT DEFAULT 0 COMMENT '状态：0 待审批，1 通过，2 拒绝',
           `type`    INT          NOT NULL COMMENT '申请类型',
           `remark`    varchar(64)  DEFAULT NULL COMMENT '申请类型描述',
+          `refuse_remark`    varchar(128)  DEFAULT NULL COMMENT '拒绝原因备注',
           `enable_flag`    INT          NOT NULL COMMENT '是否可用 10-可用 20-删除',
           `create_time`    DATETIME     NOT NULL COMMENT '创建时间',
           `create_by`      varchar(64)  NOT NULL COMMENT '创建人',
@@ -54,4 +54,9 @@ public class OrderFieldLockApplyDO extends BaseDO implements Serializable {
      */
     private String remark;
+    /**
+     * 拒绝原因备注
+     */
+    private String refuseRemark;
+
 }
@@ -30,5 +30,10 @@ public class AuditVO extends BasePageVO implements Serializable {
      */
     @NotNull(message = "状态不能为空")
     private Integer status;
+
+    /**
+     * 拒绝原因备注
+     */
+    private String refuseRemark;
 }
@@ -343,15 +343,16 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             doPass(applyDO, auditUserId);
         }
         if (ApplyStatusEnum.AUDIT_REFUSE.getStatus().equals(auditVO.getStatus())) {
-            doRefuse(applyDO, auditUserId);
+            doRefuse(applyDO, auditUserId, auditVO.getRefuseRemark());
         }
         return ServerResult.success();
     }
     @Transactional(rollbackFor = Exception.class)
-    public void doRefuse(OrderFieldLockApplyDO applyDO, Long auditUserId) {
+    public void doRefuse(OrderFieldLockApplyDO applyDO, Long auditUserId, String refuseRemark) {
         applyDO.setAuditUserId(auditUserId);
         applyDO.setStatus(ApplyStatusEnum.AUDIT_REFUSE.getStatus());
+        applyDO.setRefuseRemark(refuseRemark);
         OrderBaseInfoDO orderBaseInfoDO = orderBaseInfoService.getById(applyDO.getOrderId());
         if (Objects.isNull(orderBaseInfoDO)) {
             throw new BusinessException(ServerResultCode.ORDER_BASE_INFO_EMPTY);