流程管理喝茶

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

@@ -25,6 +25,7 @@ public enum MesApprovalRecordBizTypeEnum {
     PLATE_GOODS_APPLY("镀层物料添加量申报/审核"),
     PROCESS_MANAGEMENT_PROJECT_APPROVAL("流程管理立项审批/审核"),
     PROCESS_MANAGEMENT_EXECUTION("流程管理执行/审核"),
+    PROCESS_MANAGEMENT_INSPECT("流程管理核查/审核"),
     ;
 
     private final String desc;

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

@@ -0,0 +1,33 @@
+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.process.pojo.entity.FmProjectMilestoneEntity;
+import org.springblade.desk.process.service.IFmProjectMilestoneService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 流程管理执行
+ */
+@Service
+public class MesFmProjectMilestoneExecutionServiceImpl implements ApprovalRecordDetailStrategy<FmProjectMilestoneEntity> {
+
+    @Resource
+    private IFmProjectMilestoneService fmProjectMilestoneService;
+
+    @Override
+    public String getBizType() {
+        return MesApprovalRecordBizTypeEnum.PROCESS_MANAGEMENT_EXECUTION.getDesc();
+    }
+
+    @Override
+    public FmProjectMilestoneEntity getDetail(Long bizId) {
+
+        FmProjectMilestoneEntity fmProjectMilestoneEntity = new FmProjectMilestoneEntity();
+        fmProjectMilestoneEntity.setId(bizId);
+        FmProjectMilestoneEntity detail = fmProjectMilestoneService.getDetail(fmProjectMilestoneEntity);
+
+        return detail;
+    }
+}

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

@@ -0,0 +1,33 @@
+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.process.pojo.entity.FmProjectMilestoneEntity;
+import org.springblade.desk.process.service.IFmProjectMilestoneService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 流程管理核查
+ */
+@Service
+public class MesFmProjectMilestoneInspectServiceImpl implements ApprovalRecordDetailStrategy<FmProjectMilestoneEntity> {
+
+    @Resource
+    private IFmProjectMilestoneService fmProjectMilestoneService;
+
+    @Override
+    public String getBizType() {
+        return MesApprovalRecordBizTypeEnum.PROCESS_MANAGEMENT_INSPECT.getDesc();
+    }
+
+    @Override
+    public FmProjectMilestoneEntity getDetail(Long bizId) {
+
+        FmProjectMilestoneEntity fmProjectMilestoneEntity = new FmProjectMilestoneEntity();
+        fmProjectMilestoneEntity.setId(bizId);
+        FmProjectMilestoneEntity detail = fmProjectMilestoneService.getDetail(fmProjectMilestoneEntity);
+
+        return detail;
+    }
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectApplicationServiceImpl.java

@@ -179,10 +179,10 @@ public class FmProjectApplicationServiceImpl extends BaseServiceImpl<FmProjectAp
         sendNotificationToAuditLeader(application);
         this.updateById(application);
 
+
         //创建代办
         mesApprovalRecordService.createApprovalWithUsers
                 (application.getId(), MesApprovalRecordBizTypeEnum.PROCESS_MANAGEMENT_PROJECT_APPROVAL.getDesc(),AuthUtil.getUser().getUserId(),new Date(), Arrays.asList(application.getApprovalMan()));
-
     }
 
     /**

blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java

@@ -45,6 +45,7 @@ import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum;
 import org.springblade.desk.common.feign.MesNotifyMessageClient;
 import org.springblade.desk.common.pojo.entity.MesNotifyMessageEntity;
 import org.springblade.desk.common.service.IMesApprovalRecordService;
+import org.springblade.desk.order.pojo.enums.PlateGoodsEnum;
 import org.springblade.desk.process.excel.FmProjectMilestoneExcel;
 import org.springblade.desk.process.mapper.FmProjectMilestoneMapper;
 import org.springblade.desk.process.pojo.entity.FmProjectApplicationEntity;
@@ -152,13 +153,25 @@ public class FmProjectMilestoneServiceImpl extends BaseServiceImpl<FmProjectMile
             // 设置评价状态为待评价
             fmProjectMilestone.setGrade(FmProjectMilestoneEntity.GRADE_TREAT);
 
+            //审批通过
+            mesApprovalRecordService.passApproval(fmProjectMilestone.getId(), MesApprovalRecordBizTypeEnum.PROCESS_MANAGEMENT_EXECUTION.getDesc(),  AuthUtil.getUserId(), new Date());
+
             //向下一节点审批人发送消息
             sendNotificationToNextApproverA(fmProjectMilestone);
+            //创建代办
+            mesApprovalRecordService.createApprovalWithUsers
+                    (entity.getId(), MesApprovalRecordBizTypeEnum.PROCESS_MANAGEMENT_INSPECT.getDesc(),AuthUtil.getUser().getUserId(),new Date(), Arrays.asList(fmProjectMilestone.getNextApproverId()));
+
+        }
+        if (FmProjectMilestoneEntity.CHECK_RESULT_NO.equals(fmProjectMilestone.getCheckResult())) {
+            //审批驳回
+            mesApprovalRecordService.rejectApproval(fmProjectMilestone.getId(), MesApprovalRecordBizTypeEnum.PROCESS_MANAGEMENT_EXECUTION.getDesc(),  AuthUtil.getUserId(), new Date());
         }
 
         fmProjectMilestone.setCheckTime(new Date());
 
         baseMapper.updateById(fmProjectMilestone);
+
         return true;
 
     }
@@ -193,6 +206,14 @@ public class FmProjectMilestoneServiceImpl extends BaseServiceImpl<FmProjectMile
         fmProjectMilestone.setOkTime(new Date());
         fmProjectMilestone.setEvaluate(fmProjectMilestone.getEvolve());
 
+        if(score < 75){
+            //审批驳回
+            mesApprovalRecordService.rejectApproval(fmProjectMilestone.getId(), MesApprovalRecordBizTypeEnum.PROCESS_MANAGEMENT_INSPECT.getDesc(),  AuthUtil.getUserId(), new Date());
+        }else {
+            //审批通过
+            mesApprovalRecordService.passApproval(fmProjectMilestone.getId(), MesApprovalRecordBizTypeEnum.PROCESS_MANAGEMENT_INSPECT.getDesc(),  AuthUtil.getUserId(), new Date());
+        }
+
         // 如果评价分数在75分以上，并且执行类型不是延期。则代表本节点已经完成
         if (score < 75 && !FmProjectMilestoneEntity.EXECUTE_RESULT_YQ.equals(fmProjectMilestone.getExecuteType())) {
             fmProjectMilestone.setCheckResult(FmProjectMilestoneEntity.CHECK_RESULT_TREAT);