feat: 立项变更 年度制修订转办接口

laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java

@@ -1,6 +1,8 @@
 package com.jero.modules.activiti.process.common.service;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
 import com.jero.modules.activiti.enums.CommitFlagEnum;
@@ -17,6 +19,7 @@ import org.activiti.engine.repository.ProcessDefinition;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.activiti.engine.task.TaskQuery;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -44,6 +47,9 @@ public class ActFlowCommonService {
     @Resource
     private ProcessApprovalRecordService processApprovalRecordService;
 
+    @Resource
+    private ProcessApprovalRecordService approvalRecordService;
+
     /**
      * 启动流程实例
      */
@@ -159,6 +165,15 @@ public class ActFlowCommonService {
      * 转办
      */
     public void transfer(String taskId, String userId) {
+        //获取审批（未完成的任务id是之前的）
+        ProcessApprovalRecord approvalRecord = approvalRecordService.getToDoByTaskId(taskId);
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+        LambdaUpdateWrapper<ProcessApprovalRecord> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(ProcessApprovalRecord::getId, approvalRecord.getId());
+        updateWrapper.set(ProcessApprovalRecord::getTransferBy,loginUser.getId());
+        updateWrapper.set(ProcessApprovalRecord::getUserId,userId);
+        approvalRecordService.update(updateWrapper);
         taskService.setAssignee(taskId, userId);
         log.info("转办 任务Id:{} 转办用户Id{}", taskId, userId);
     }

laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java

@@ -5,6 +5,8 @@ import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.aspect.annotation.Translation;
 import com.jero.common.constant.enums.YesOrNoEnum;
 
+import com.jero.modules.activiti.process.common.entity.TransferVO;
+import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esAnnualInit.entity.vo.AnnualInitDataVO;
 import com.jero.modules.activiti.process.esAnnualInit.service.ProcessEsAnnualInitService;
 import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange;
@@ -39,6 +41,9 @@ public class ESAnnualInitController {
     @Resource
     private ProcessEsAnnualInitService annualInitService;
 
+    @Resource
+    private ActFlowCommonService actFlowCommonService;
+
     /**
      * 新增立项变更申请
      *
@@ -146,4 +151,16 @@ public class ESAnnualInitController {
         }
     }
 
+    /**
+     * 转办
+     *
+     */
+    @AutoLog(value = "企标年度制修订标准化发起流程-转办")
+    @ApiOperation(value="企标年度制修订标准化发起流程-转办", notes="企标年度制修订标准化发起流程-转办")
+    @PostMapping(value = "/transfer")
+    public Result<?> transfer(@RequestBody TransferVO transferVO) {
+        actFlowCommonService.transfer(transferVO.getTaskId(), transferVO.getUserId());
+        return Result.OK();
+    }
+
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java

@@ -4,6 +4,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.aspect.annotation.Translation;
 import com.jero.modules.activiti.process.common.entity.TransferVO;
+import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange;
 import com.jero.modules.activiti.process.esInitChange.entity.vo.InitChangeDataVO;
 import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChangeService;
@@ -40,6 +41,9 @@ public class ProcessESInitChangeController {
     @Resource
     private EnterpriseStandardPlanService espService;
 
+    @Resource
+    private ActFlowCommonService actFlowCommonService;
+
     /**
      * 新增立项变更申请
      *
@@ -144,4 +148,16 @@ public class ProcessESInitChangeController {
                                 @RequestParam("projectType") String projectType) {
         return Result.OK(espService.getESPList(pageNo, pageSize, esPlanQueryDTO, projectType));
     }
+
+    /**
+     * 转办
+     *
+     */
+    @AutoLog(value = "企标立项变更流程-转办")
+    @ApiOperation(value="企标立项变更流程-转办", notes="企标立项变更流程-转办")
+    @PostMapping(value = "/transfer")
+    public Result<?> transfer(@RequestBody TransferVO transferVO) {
+        actFlowCommonService.transfer(transferVO.getTaskId(), transferVO.getUserId());
+        return Result.OK();
+    }
 }