From b32494580f32a1a75c34bf01794d0673a9c68d97 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Tue, 9 May 2023 18:10:07 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8E=86=E5=8F=B2=20=E8=BD=AC=E5=8A=9E?= =?UTF-8?q?=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TaskController.java | 43 +++++++++++++++--- .../task/TodoTaskController.java | 20 ++++---- .../mapper/BusProcessApproveMapper.java | 2 +- .../mapper/mysql/BusProcessApproveMapper.xml | 2 +- .../task/TaskController$1.class | Bin 1922 -> 1922 bytes .../task/TaskController.class | Bin 11905 -> 13022 bytes .../task/TodoTaskController$1.class | Bin 1573 -> 1573 bytes .../task/TodoTaskController.class | Bin 49052 -> 49117 bytes .../mapper/BusProcessApproveMapper.class | Bin 900 -> 908 bytes .../mapper/mysql/BusProcessApproveMapper.xml | 2 +- 10 files changed, 51 insertions(+), 18 deletions(-) diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java index 0dfc08e..84284ea 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java @@ -74,6 +74,8 @@ public class TaskController { .processInstanceId(one.getPrcId()).orderByTaskCreateTime().asc(); List list2 = historicTaskInstanceQuery.list(); List> list = ActivitiTools.turnHistoricTaskInstance(list2); + List> relistMap = new ArrayList<>(); + for (Map historicTaskInstance : list) { // 获取办理的历史信息 if(historicTaskInstance.get("assignee") == null) { @@ -102,11 +104,37 @@ public class TaskController { QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id")); queryWrapper2.orderByAsc("CREATE_TIME"); - List list1 = iBusProcessEntrustService.list(queryWrapper2); - String str = ""; - if(list1.size()>0){ - UserEO assigneenActual = userEoService.getUserById(list1.get(0).getUserId()); - historicTaskInstance.put("assignee", assignee.getUsname()+"(" + assigneenActual.getUsname() + " 委托)"); + List EOS = iBusProcessEntrustService.list(queryWrapper2); + //委托人 + if(EOS.size()>0){ + for (int i = 0; i < EOS.size(); i++) { + BusProcessEntrust busProcessEntrust = EOS.get(i); + + HashMap map = new HashMap<>(); + UserEO assigneenActual = userEoService.getUserById(busProcessEntrust.getUserId()); + String consigner = assigneenActual.getUsname(); + UserEO userById = userEoService.getUserById(busProcessEntrust.getEnUserId()); + String enUserName = userById.getUsname(); + map.put("assignee", enUserName+"(" + consigner + " 委托)"); + map.put("assigneeId", busProcessEntrust.getEnUserId()); + map.put("prcType",one.getPrcType()); + map.put("prcName",one.getPrcName()); + map.put("prcNum",one.getPrcNum()); + Date createTime = busProcessEntrust.getCreateTime(); + map.put("createTime",createTime); + if (i+1 != EOS.size()){ + BusProcessEntrust busProcessEntrust1 = EOS.get(i + 1); + Date endTime = busProcessEntrust1.getCreateTime(); + map.put("endTime",endTime); + //long approvalTime = disposeApprovalTime(createTime,endTime); + LocalDateTime startDateTime = LocalDateTime.ofInstant(createTime.toInstant(), ZoneId.systemDefault()); + LocalDateTime endDateTime = LocalDateTime.ofInstant(endTime.toInstant(), ZoneId.systemDefault()); + long days = Duration.between(startDateTime.toLocalDate().atStartOfDay(), endDateTime.toLocalDate().atStartOfDay()).toDays() + 1; + historicTaskInstance.put("approvalTime",days + "天"); + } + relistMap.add(map); + } + continue; } } } @@ -145,9 +173,10 @@ public class TaskController { long days = Duration.between(startDateTime.toLocalDate().atStartOfDay(), endDateTime.toLocalDate().atStartOfDay()).toDays() + 1; historicTaskInstance.put("approvalTime",days + "天"); } + relistMap.add(historicTaskInstance); } if(StringUtils.isNotBlank(sortWord)){ - Collections.sort(list, new Comparator>() { + Collections.sort(relistMap, new Comparator>() { @Override public int compare(Map o1, Map o2) { String id1 = (String) o1.get(sortWord); @@ -160,7 +189,7 @@ public class TaskController { } }); } - return list; + return relistMap; } 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 316b359..cf7adca 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 @@ -329,18 +329,19 @@ public class TodoTaskController { if (StrUtil.isEmpty(task.getAssignee())) { taskService.claim(busMes.getTaskId(), busMes.getUserId()); } + if (StringUtils.isNotEmpty(dataJson)){ + //根据业务情况 对业务数据进行saveOrupdate + reportId = activitDefineService.saveOrUpdateDate(busMes.getPrcType(), dataJson, task.getId(), + task.getProcessInstanceId(), reportId); + } BusProcessApprove busProcessApprove = new BusProcessApprove(); busProcessApprove.setTaskId(busMes.getTaskId()); busProcessApprove.setCreateUserId(UserUtils.getUserId()); busProcessApprove.setPrcId(task.getProcessInstanceId()); busProcessApprove.setCreateDate(new Date()); busProcessApprove.setFromValsJson(busMes.getSubmitJson()); + busProcessApprove.setDataId(reportId); ibusProcessApproveService.save(busProcessApprove); - if (StringUtils.isNotEmpty(dataJson)){ - //根据业务情况 对业务数据进行saveOrupdate - activitDefineService.saveOrUpdateDate(busMes.getPrcType(),dataJson, task.getId(), - task.getProcessInstanceId(),reportId); - } taskService.complete(busMes.getTaskId()); } } else { @@ -452,7 +453,8 @@ public class TodoTaskController { // 查找详细业务数据 BusProcessNewVO busProcessNewVO = this.queryDetailDate(busProcessNew, prcType); //审批数据 - BusProcessApprove busProcessApprove = busProcessApproveMapper.selectEoByDataId(busProcessNewVO.getDataId()); + List busProcessApproves1 = busProcessApproveMapper.selectEoByDataId(busProcessNewVO.getDataId()); + BusProcessApprove busProcessApprove = busProcessApproves1.get(0); if (busProcessApprove!=null){ String approveJson = busProcessApprove.getFromValsJson(); busProcessNewVO.setSubmitJson(approveJson); @@ -477,7 +479,8 @@ public class TodoTaskController { List busProcessApproves = busProcessApproveMapper.selectEoByPrcIdAndTask(prcId); busProcessApprove = busProcessApproves.get(0); }else { - busProcessApprove = busProcessApproveMapper.selectEoByDataId(dataId); + List busProcessApproves = busProcessApproveMapper.selectEoByDataId(dataId); + busProcessApprove = busProcessApproves.get(0); } busProcessNewVO.setSubmitJson(busProcessApprove.getFromValsJson()); return Result.success(busProcessNewVO); @@ -592,7 +595,8 @@ public class TodoTaskController { } //存储审批数据 if (StringUtils.isNotEmpty(submitJson)){ - BusProcessApprove busProcessApprove = busProcessApproveMapper.selectEoByDataId(dataId); + List busProcessApproves = busProcessApproveMapper.selectEoByDataId(dataId); + BusProcessApprove busProcessApprove = busProcessApproves.get(0); if (busProcessApprove == null){ busProcessApprove = new BusProcessApprove(); busProcessApprove.setDataId(dataId); 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 724ff02..cc34969 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 @@ -19,7 +19,7 @@ public interface BusProcessApproveMapper extends BaseMapper { List selectEoByPrcIdAndTask(@Param("prcId") String prcId); - BusProcessApprove selectEoByDataId(@Param("dataId") String dataId); + List selectEoByDataId(@Param("dataId") String dataId); BusProcessApprove selectEoByTask(@Param("taskId")String taskId); } diff --git a/report-activity/src/main/resources/mybatis/mapper/mysql/BusProcessApproveMapper.xml b/report-activity/src/main/resources/mybatis/mapper/mysql/BusProcessApproveMapper.xml index f5db867..4105ce6 100644 --- a/report-activity/src/main/resources/mybatis/mapper/mysql/BusProcessApproveMapper.xml +++ b/report-activity/src/main/resources/mybatis/mapper/mysql/BusProcessApproveMapper.xml @@ -7,7 +7,7 @@ Order by CREATE_DATE desc