绩效管理代办

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

@@ -28,6 +28,7 @@ public enum MesApprovalRecordBizTypeEnum {
     PROCESS_MANAGEMENT_INSPECT("流程管理核查/审核"),
     DISTRIBUTION_CONTROL_ADJUSTMENT("分派控制调整/审核"),
     ALLOCATION_CONFIGURATION_APPROVAL("分派配置审批/审核"),
+    PERFORMANCE_REPORTING("绩效填报/审核"),
     ;
 
     private final String desc;

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

@@ -0,0 +1,31 @@
+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.efficiency.pojo.vo.BsEfficiencyTaskVO;
+import org.springblade.desk.efficiency.service.IBsEfficiencyTaskService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 槽液计划类审核待办策略实现类
+ */
+@Service
+public class MesEfficiencyTaskServiceImpl implements ApprovalRecordDetailStrategy<BsEfficiencyTaskVO> {
+
+    @Resource
+    private IBsEfficiencyTaskService bsEfficiencyTaskService;
+
+
+    @Override
+    public String getBizType() {
+        return MesApprovalRecordBizTypeEnum.PERFORMANCE_REPORTING.getDesc();
+    }
+
+    @Override
+    public BsEfficiencyTaskVO getDetail(Long bizId) {
+        BsEfficiencyTaskVO bsEfficiencyTaskVO = new BsEfficiencyTaskVO();
+        bsEfficiencyTaskVO.setId(bizId);
+        return bsEfficiencyTaskVO;
+    }
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/controller/BsEfficiencyTaskController.java

@@ -17,9 +17,12 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.util.ExcelExtUtil;
+import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum;
+import org.springblade.desk.common.service.IMesApprovalRecordService;
 import org.springblade.desk.efficiency.enums.BsEfficiencyTaskEnum;
 import org.springblade.desk.efficiency.pojo.dto.BsEfficiencyTaskDTO;
 import org.springblade.desk.efficiency.pojo.dto.BsEfficiencyTaskReportDTO;
@@ -34,8 +37,10 @@ import org.springblade.desk.efficiency.service.IBsEfficiencyTaskReportService;
 import org.springblade.desk.efficiency.service.IBsEfficiencyTaskService;
 import org.springblade.desk.efficiency.service.IBsEfficiencyTempParamService;
 import org.springblade.desk.efficiency.util.EasyExcelUtil;
+import org.springblade.desk.order.pojo.enums.PlateGoodsEnum;
 import org.springblade.system.feign.IUserClient;
 import org.springblade.system.pojo.entity.User;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -75,6 +80,9 @@ public class BsEfficiencyTaskController extends BladeController {
 
     private final String TOTAL_SCORE = "总分";
 
+    @Autowired
+    IMesApprovalRecordService mesApprovalRecordService;
+
 
     /**
      * 绩效任务表 自定义分页
@@ -108,7 +116,10 @@ public class BsEfficiencyTaskController extends BladeController {
         BsEfficiencyTaskEntity upd = new BsEfficiencyTaskEntity();
         upd.setId(bsEfficiencyTask.getId());
         upd.setStatus(BsEfficiencyTaskEnum.STATUS_APPROVED.getCode());
-        return R.status(bsEfficiencyTaskService.saveOrUpdate(upd));
+        boolean update = bsEfficiencyTaskService.saveOrUpdate(upd);
+        //审批通过
+        mesApprovalRecordService.passApproval(bsEfficiencyTask.getId(), MesApprovalRecordBizTypeEnum.PERFORMANCE_REPORTING.getDesc(),  AuthUtil.getUserId(), new Date());
+        return R.status(update);
     }
 
     /**
@@ -136,7 +147,10 @@ public class BsEfficiencyTaskController extends BladeController {
                 .set(BsEfficiencyTaskEntity::getReportTime, null)
                 .set(BsEfficiencyTaskEntity::getRemark, bsEfficiencyTask.getRemark())
                 .set(BsEfficiencyTaskEntity::getStatus, BsEfficiencyTaskEnum.STATUS_REJECTED.getCode());
-        return R.status(bsEfficiencyTaskService.update(null, wrapper));
+        boolean update = bsEfficiencyTaskService.update(null, wrapper);
+        //审批驳回
+        mesApprovalRecordService.rejectApproval(task.getId(), MesApprovalRecordBizTypeEnum.PERFORMANCE_REPORTING.getDesc(),  AuthUtil.getUserId(), new Date());
+        return R.status(update);
     }
 
     /**
@@ -424,7 +438,12 @@ public class BsEfficiencyTaskController extends BladeController {
         upd.setAttachId(bsEfficiencyTask.getAttachId());
         upd.setStatus(BsEfficiencyTaskEnum.STATUS_PENDING_APPROVAL.getCode());
         upd.setReportTime(new Date());
-        return R.status(bsEfficiencyTaskService.saveOrUpdate(upd));
+
+        boolean update = bsEfficiencyTaskService.saveOrUpdate(upd);
+        //创建代办
+        mesApprovalRecordService.createApproval
+                (upd.getId(), MesApprovalRecordBizTypeEnum.PERFORMANCE_REPORTING.getDesc(), AuthUtil.getUser().getUserId(),new Date());
+        return R.status(update);
     }
 
     /**