From 9b9457b9dd12d639e0d2bdd3bd81030026a94229 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Fri, 28 Apr 2023 10:10:44 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E8=B0=83=E6=95=B4=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=BA=BA=20=E6=B0=B8=E4=B9=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/sys/service/iservice/IUserEoService.java | 14 +++++++++++++- .../define/ActivitDefineController.java | 15 +++++++-------- .../task/TodoTaskController.java | 15 ++++++++++++++- .../mapper/BusProcessApproveMapper.java | 2 ++ .../service/IBusProcessApproveService.java | 7 +++++++ .../impl/BusProcessApproveServiceImpl.java | 13 +++++++++++++ .../adc/da/wkflow/listener/powerApply/aid2.java | 3 +++ .../adc/da/wkflow/listener/powerApply/aid3.java | 3 +++ .../mapper/mysql/BusProcessApproveMapper.xml | 3 +++ 9 files changed, 65 insertions(+), 10 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java index 1262ab6..84394ad 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java @@ -42,6 +42,13 @@ public interface IUserEoService { UserEO getUserEoById(String usid); List getUserByIdList(List userIdList); + + /** + * 不考虑 删除的情况 + * 因流程中 人员被删除，但是审批历史中人要 回显正确 + * @param userIdList + * @return + */ List getUserByIdListNodel(List userIdList); IPage> list(int pageNo, int pageSize, String account, String roleName); @@ -57,6 +64,11 @@ public interface IUserEoService { public void importExcelUser(List list); List> allList(String account, String roleName); - + /** + * 不考虑 删除的情况 + * 因流程中 人员被删除，但是审批历史中人要 回显正确 + * @param userId + * @return + */ UserEO getUserByIdNodel(String userId); } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java index a92fb55..f9e4f4b 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java @@ -5,7 +5,6 @@ import com.adc.da.login.util.UserUtils; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.iservice.IUserEoService; import com.adc.da.wkflow.business_activiti.service.ActivitDefineService; -import com.adc.da.wkflow.business_main.entity.BusProcessApprove; import com.adc.da.wkflow.business_main.entity.BusProcessName; import com.adc.da.wkflow.business_main.service.IBusProcessApproveService; import com.adc.da.wkflow.business_main.service.IBusProcessNameService; @@ -217,13 +216,13 @@ public class ActivitDefineController { ibusprocessnameService.save(one); } - BusProcessApprove busProcessApprove = new BusProcessApprove(); - busProcessApprove.setFromValsJson(JSON.toJSONString(approveData)); - busProcessApprove.setTaskId(task.getId()); - busProcessApprove.setCreateDate(new Date()); - busProcessApprove.setPrcId(pi.getId()); - busProcessApprove.setCreateUserId(UserUtils.getUserId()); - ibusProcessApproveService.save(busProcessApprove); +// BusProcessApprove busProcessApprove = new BusProcessApprove(); +// busProcessApprove.setFromValsJson(JSON.toJSONString(approveData)); +// busProcessApprove.setTaskId(task.getId()); +// busProcessApprove.setCreateDate(new Date()); +// busProcessApprove.setPrcId(pi.getId()); +// busProcessApprove.setCreateUserId(UserUtils.getUserId()); +// ibusProcessApproveService.save(busProcessApprove); log.info("启动流程实例,获取id-->{},实例名称-->{}", pi.getId(), pd.getName()); return WrapMapper.ok(task.getId()); } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java index 898c6d3..4da2ac7 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java @@ -204,12 +204,21 @@ public class TodoTaskController { return WrapMapper.ok("改派成功"); } + /** + * 转办 + * @param taskId + * @param assignee + * @param userId + * @param pId + * @return + */ @ApiOperation(value = "新改派任务") @ApiImplicitParams({@ApiImplicitParam(name = "taskId", value = "任务id"), @ApiImplicitParam(name = "assignee", value = "被改派人员"), @ApiImplicitParam(name = "userId", value = "改派人员"), @ApiImplicitParam(name = "pId", value = "流程实例ID")}) @GetMapping("/changeAssigneeNew") - public Wrapper changeAssigneeNew(String taskId, String assignee, String userId, String pId) { + public Wrapper changeAssigneeNew(String taskId, String assignee, String userId, String pId, + @RequestParam(required = false,value = "replaceMap")String replaceMap) { List list = Arrays.asList(taskId.split(",")); for (String str : list) { @@ -241,6 +250,10 @@ public class TodoTaskController { iBusProcessEntrustService.save(busProcessEntrust); } } + //监控流程中 变更处理人为永久变更 + if (replaceMap != null){ + ibusProcessApproveService.changeAssignee(replaceMap,taskId); + } log.info("task {} find " + taskId); return WrapMapper.ok("改派成功"); diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/mapper/BusProcessApproveMapper.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/mapper/BusProcessApproveMapper.java index deeee66..724ff02 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/mapper/BusProcessApproveMapper.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/mapper/BusProcessApproveMapper.java @@ -20,4 +20,6 @@ public interface BusProcessApproveMapper extends BaseMapper { List selectEoByPrcIdAndTask(@Param("prcId") String prcId); BusProcessApprove selectEoByDataId(@Param("dataId") String dataId); + + BusProcessApprove selectEoByTask(@Param("taskId")String taskId); } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessApproveService.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessApproveService.java index 41b06fe..e71f4cc 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessApproveService.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessApproveService.java @@ -4,6 +4,7 @@ import com.adc.da.wkflow.business_main.entity.BusProcessApprove; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; + /** * 审批历史业务类 * 用于审批历史的查询的存取 @@ -12,4 +13,10 @@ public interface IBusProcessApproveService extends IService { List selectEoByPrcIdAndTask(String prcId); + /** + * 监控流程中 变更处理人为永久变更 + * @param replaceMap + * @param taskId + */ + void changeAssignee(String replaceMap,String taskId); } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessApproveServiceImpl.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessApproveServiceImpl.java index e7afbe8..ab052c0 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessApproveServiceImpl.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessApproveServiceImpl.java @@ -3,6 +3,8 @@ package com.adc.da.wkflow.business_main.service.impl; import com.adc.da.wkflow.business_main.entity.BusProcessApprove; import com.adc.da.wkflow.business_main.mapper.BusProcessApproveMapper; import com.adc.da.wkflow.business_main.service.IBusProcessApproveService; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -26,4 +28,15 @@ public class BusProcessApproveServiceImpl extends ServiceImpl select * from bus_process_approve where data_id =#{dataId} +