楚江ERP：锁价无规格操作申请单 提交审批以及审批完成通知

@@ -11,6 +11,7 @@ import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto;
 import com.lframework.xingyun.sc.entity.*;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
+import com.lframework.xingyun.sc.service.contract.SpecLockDelayApplicationService;
 import com.lframework.xingyun.sc.service.customer.CorePersonnelHistoryService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditHistoryService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
@@ -66,6 +67,8 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
     private MqProducerService mqProducerService;
     @Resource
     private TransactorHandler transactorHandler;
+    @Resource
+    private SpecLockDelayApplicationService specLockDelayApplicationService;
 
 
     /**
@@ -118,6 +121,9 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             case "SPEC_CHANGE_CONFIRM":
                 handleOrderSpecChangeData(flowStatus, businessId);
                 break;
+            case "SPEC_LOCK_DELAY":
+                handleSpecLockDelayAuditData(flowStatus, businessId);
+                break;
             default:
                 break;
         }
@@ -150,6 +156,19 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
         }
     }
 
+    private void handleSpecLockDelayAuditData(String flowStatus, String businessId) {
+        if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
+                || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
+            specLockDelayApplicationService.updateAuditStatus(businessId, "PASS");
+        } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {
+            specLockDelayApplicationService.updateAuditStatus(businessId, "REFUSE");
+        } else if (FlowInstanceStatus.UNDO.getCode().equals(flowStatus)) {
+            specLockDelayApplicationService.updateAuditStatus(businessId, "CANCEL");
+        }
+    }
+
     /**
      * 客户开发业务数据处理
      *
@@ -347,8 +366,8 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
     /**
      * 处理订货单变更相关数据
      *
-     * @param flowStatus    审核结果
-     * @param businessId    业务ID
+     * @param flowStatus 审核结果
+     * @param businessId 业务ID
      */
     private void handleOrderSpecChangeData(String flowStatus, String businessId) {
         if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)

 package com.lframework.xingyun.sc.impl.contract;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.common.utils.ObjectUtil;
 import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.IdUtil;
 import com.lframework.starter.web.core.utils.OpLogUtil;
@@ -20,17 +23,25 @@ import com.lframework.xingyun.sc.service.contract.SpecLockDelayApplicationServic
 import com.lframework.xingyun.sc.vo.contract.createVo.CreateSpecLockDelayApplicationVo;
 import com.lframework.xingyun.sc.vo.contract.queryVo.QuerySpecLockDelayApplicationVo;
 import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateSpecLockDelayApplicationVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Service
 public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecLockDelayApplicationMapper, SpecLockDelayApplication> implements SpecLockDelayApplicationService {
 
+    private static final String SPEC_LOCK_DELAY_FLAY = "SPEC_LOCK_DELAY"; // 未锁规格申请单审批
+
+    @Autowired
+    private FlowInstanceWrapperService flowInstanceWrapperService;
+
     @Override
     public PageResult<SpecLockDelayApplication> query(Integer pageIndex, Integer pageSize, QuerySpecLockDelayApplicationVo vo) {
 
@@ -74,6 +85,8 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
 
+        // 开启审核
+        flowInstanceWrapperService.startInstance(SPEC_LOCK_DELAY_FLAY, data.getId(), SPEC_LOCK_DELAY_FLAY, data);
         return data.getId();
     }
 
@@ -101,6 +114,34 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
         OpLogUtil.setExtra(vo);
     }
 
+    @Override
+    @OpLog(type = OtherOpLogType.class, name = "锁价无规格操作申请单审批完成，ID：{}， 审批状态：{}", params = {"#id", "#approvedStatus"})
+    @Transactional(rollbackFor = Exception.class)
+    public void updateAuditStatus(String id, String approvedStatus) {
+        if (StringUtils.isBlank(id) || StringUtils.isBlank(approvedStatus)) {
+            return;
+        }
+
+        Wrapper<SpecLockDelayApplication> wrapper = Wrappers.lambdaUpdate(SpecLockDelayApplication.class)
+                .set(SpecLockDelayApplication::getApprovalStatus, approvedStatus)
+                .set(SpecLockDelayApplication::getApprovedAt, LocalDateTime.now())
+                .set(SpecLockDelayApplication::getApproverId, SecurityUtil.getCurrentUser().getId())
+                .eq(SpecLockDelayApplication::getId, id);
+
+        getBaseMapper().update(wrapper);
+
+        UpdateSpecLockDelayApplicationVo vo = new UpdateSpecLockDelayApplicationVo();
+        vo.setId(id);
+        vo.setApprovalStatus(approvedStatus);
+        vo.setApprovedAt(LocalDateTime.now());
+        vo.setApproverId(SecurityUtil.getCurrentUser().getId());
+
+        OpLogUtil.setVariable("id", id);
+        OpLogUtil.setExtra(vo);
+
+        cleanCacheByKey(id);
+    }
+
     @CacheEvict(value = SpecLockDelayApplication.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @Override
     public void cleanCacheByKey(Serializable key) {

@@ -52,5 +52,13 @@ public interface SpecLockDelayApplicationService extends BaseMpService<SpecLockD
      */
     void update(UpdateSpecLockDelayApplicationVo vo);
 
+    /**
+     * 更新审核状态
+     *
+     * @param id
+     * @param approvedStatus
+     */
+    void updateAuditStatus(String id, String approvedStatus);
+
 }
 

@@ -8,6 +8,7 @@ import org.hibernate.validator.constraints.Length;
 
 import java.io.Serializable;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 @Data
 public class UpdateSpecLockDelayApplicationVo implements BaseVo, Serializable {
@@ -55,4 +56,15 @@ public class UpdateSpecLockDelayApplicationVo implements BaseVo, Serializable {
     @Length(message = "审核状态最多允许50个字符！")
     private String approvalStatus;
 
+    /**
+     * 审核人
+     */
+    @ApiModelProperty(value = "审核人")
+    private String approverId;
+
+    /**
+     * 审核时间
+     */
+    @ApiModelProperty(value = "审核时间")
+    private LocalDateTime approvedAt;
 }