Merge branch 'liweidong'

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/enums/MesApprovalRecordBizTypeEnum.java

@@ -27,6 +27,7 @@ public enum MesApprovalRecordBizTypeEnum {
     PROCESS_MANAGEMENT_EXECUTION("流程管理执行/审核"),
     PROCESS_MANAGEMENT_INSPECT("流程管理核查/审核"),
     DISTRIBUTION_CONTROL_ADJUSTMENT("分派控制调整/审核"),
+    ALLOCATION_CONFIGURATION_APPROVAL("分派配置审批/审核"),
     ;
 
     private final String desc;

blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesDispatchConfigApprovalServiceImpl.java

@@ -0,0 +1,32 @@
+package org.springblade.desk.common.service.impl;
+
+import jakarta.annotation.Resource;
+import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum;
+import org.springblade.desk.common.service.ApprovalRecordDetailStrategy;
+import org.springblade.desk.quality.pojo.entity.DispatchConfigApproval;
+import org.springblade.desk.quality.pojo.vo.DispatchConfigApprovalVO;
+import org.springblade.desk.quality.service.IDispatchConfigApprovalService;
+import org.springblade.desk.quality.wrapper.DispatchConfigApprovalWrapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * 分派配置审批审核待办策略实现类
+ */
+@Service
+public class MesDispatchConfigApprovalServiceImpl implements ApprovalRecordDetailStrategy<DispatchConfigApprovalVO> {
+
+    @Resource
+    private IDispatchConfigApprovalService service;
+
+    @Override
+    public String getBizType() {
+        return MesApprovalRecordBizTypeEnum.ALLOCATION_CONFIGURATION_APPROVAL.getDesc();
+    }
+
+    @Override
+    public DispatchConfigApprovalVO getDetail(Long bizId) {
+        DispatchConfigApproval detail = service.getById(bizId);
+        DispatchConfigApprovalVO detailVO = DispatchConfigApprovalWrapper.build().entityVO(detail);
+        return detailVO;
+    }
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/DispatchConfigApprovalServiceImpl.java

@@ -10,6 +10,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.desk.basic.service.en.impl.EnBaseServiceImpl;
+import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum;
+import org.springblade.desk.common.service.IMesApprovalRecordService;
 import org.springblade.desk.quality.constant.DispatchConfigApprovalConst;
 import org.springblade.desk.quality.excel.DispatchConfigApprovalExcel;
 import org.springblade.desk.quality.mapper.DispatchConfigApprovalMapper;
@@ -22,6 +24,7 @@ import org.springblade.desk.quality.pojo.vo.DispatchConfigApprovalVO;
 import org.springblade.desk.quality.service.IDispatchConfigApprovalService;
 import org.springblade.desk.quality.wrapper.DispatchConfigApprovalWrapper;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -42,6 +45,10 @@ public class DispatchConfigApprovalServiceImpl extends EnBaseServiceImpl<Dispatc
     @jakarta.annotation.Resource
     private DispatchConfigApprovalRecordMapper approvalRecordMapper;
 
+    @Autowired
+    IMesApprovalRecordService mesApprovalRecordService;
+
+
     @Override
     public IPage<DispatchConfigApprovalVO> selectDispatchConfigApprovalPage(IPage<DispatchConfigApproval> page, DispatchConfigApprovalVO entity) {
         QueryWrapper<DispatchConfigApproval> queryWrapper = new QueryWrapper<>();
@@ -184,6 +191,10 @@ public class DispatchConfigApprovalServiceImpl extends EnBaseServiceImpl<Dispatc
         deleteQuery.eq("APPROVAL_ID", id);
         approvalRecordMapper.delete(deleteQuery);
 
+        //创建代办
+        mesApprovalRecordService.createApproval
+                (id, MesApprovalRecordBizTypeEnum.ALLOCATION_CONFIGURATION_APPROVAL.getDesc(),AuthUtil.getUser().getUserId(),new Date());
+
         return R.success("提交审批成功");
     }
 
@@ -295,6 +306,8 @@ public class DispatchConfigApprovalServiceImpl extends EnBaseServiceImpl<Dispatc
             entity.setUpdateUser(currentUserId);
             entity.setUpdateTime(now);
             updateById(entity);
+            //审批驳回
+            mesApprovalRecordService.rejectApproval(id, MesApprovalRecordBizTypeEnum.ALLOCATION_CONFIGURATION_APPROVAL.getDesc(),  currentUserId,now);
             return R.success("审批已驳回");
         }
 
@@ -331,6 +344,8 @@ public class DispatchConfigApprovalServiceImpl extends EnBaseServiceImpl<Dispatc
                 entity.setUpdateUser(currentUserId);
                 entity.setUpdateTime(now);
                 updateById(entity);
+            }else {
+                mesApprovalRecordService.pendingApproval(id, MesApprovalRecordBizTypeEnum.ALLOCATION_CONFIGURATION_APPROVAL.getDesc(), currentUserId, now);
             }
 
         } else if (currentNode == 3) {
@@ -339,6 +354,8 @@ public class DispatchConfigApprovalServiceImpl extends EnBaseServiceImpl<Dispatc
             entity.setUpdateUser(currentUserId);
             entity.setUpdateTime(now);
             updateById(entity);
+            //审批通过
+            mesApprovalRecordService.passApproval(id, MesApprovalRecordBizTypeEnum.ALLOCATION_CONFIGURATION_APPROVAL.getDesc(),currentUserId, now);
         }
 
         return R.success("审批成功");