diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java index 7bd2f49b..220f7270 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java @@ -497,10 +497,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask childPicture.setTaskId(String.join(",", taskIds)); childPicture.setTaskname(String.join(",", taskNames)); }else{ + taskData = taskList.get(0); childPicture.setTaskId(taskData.getId()); childPicture.setTaskname(taskData.getName()); } - taskData = taskList.get(0); } if (ObjectUtils.isEmpty(taskData)) { model.setFinishtime(System.currentTimeMillis()); @@ -1366,91 +1366,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask taskchildPicture.setPicture(ocrPictureOne); taskchildPicture.setFinishTime(ocrPictureOne.getSubmitDateTimestamp()); } -// -// //查询对应的流程分类 -// Category category = categoryService.selectDtoById(Long.parseLong(taskchildPicture.getCategoryid())); -// taskchildPicture.setCategoryDto(category); -// -// if (StringUtils.isNotBlank(taskchildPicture.getProcessdefinitionid())) { -// -// List taskList = this.nowRunTask(taskchildPicture.getProcessinstanceid(), taskchildPicture.getProcessdefinitionid()); -// if (null != taskList && !taskList.isEmpty()) { -// taskchildPicture.setTaskId(taskList.get(0).getId()); -// -// Task tasknow = taskService.createTaskQuery().taskId(taskchildPicture.getTaskId()).singleResult(); -// BpmnModel bpmnModel = repositoryService.getBpmnModel(tasknow.getProcessDefinitionId()); -// // 获取节点定义id -// String taskDefinitionKey = tasknow.getTaskDefinitionKey(); -// // 根据节点定义id获取节点元素 -// FlowElement flowElement = bpmnModel.getFlowElement(taskDefinitionKey); -// if (flowElement instanceof UserTask) { -// UserTask userTask = (UserTask) flowElement; -// -// taskchildPicture.setDocumentation(userTask.getDocumentation()); -// } -// } -// -// //查询历史 -// List historicTaskInstanceDtos = new ArrayList<>(); -// // 查询当前任务的流转信息 -// List taskHiInstances = historyService.createHistoricTaskInstanceQuery() -// .processInstanceId(taskchildPicture.getProcessinstanceid()) -// .includeProcessVariables() -// .orderByHistoricTaskInstanceStartTime() -// .asc() -// .list(); -// for (HistoricTaskInstance taskHiInstance : taskHiInstances) { -// HistoricTaskInstanceDto dto = new HistoricTaskInstanceDto(); -// dto.setTaskId(taskHiInstance.getId()); -// dto.setTaskName(taskHiInstance.getName()); -// dto.setFinishTime(taskHiInstance.getEndTime()); -// if (taskHiInstance.getDurationInMillis() != null) { -// dto.setDuration(taskHiInstance.getDurationInMillis() / 1000 + "秒"); -// } -// dto.setTaskDefKey(taskHiInstance.getTaskDefinitionKey()); -// -// //Map variables = taskHiInstance.getTaskLocalVariables(); -// -// Map variables = taskHiInstance.getProcessVariables(); -// -// if (null != variables && null != variables.get("approvd")) { -// dto.setState(variables.get("approvd").toString()); -// } -// -// if (StringUtils.isNotBlank(taskHiInstance.getAssignee())) { -// if (SystemConstantsOa.OA_TASK_SKIP_ASSIGINE.equals(taskHiInstance.getAssignee())) { -// dto.setAssigneeName(taskHiInstance.getAssignee()); -// } else { -// User user1 = userService.findByLoginname(taskHiInstance.getAssignee()); -// -// dto.setAssigneeName(user1.getUsername()); -// } -// -// } -// -// BpmnModel bpmnModel = repositoryService.getBpmnModel(taskchildPicture.getProcessdefinitionid()); -// -//// // 根据节点定义id获取节点元素 -// FlowElement flowElement = bpmnModel.getFlowElement(taskHiInstance.getTaskDefinitionKey()); -// if (flowElement instanceof UserTask) { -// UserTask userTask = (UserTask) flowElement; -// -// taskchildPicture.setDocumentation(userTask.getDocumentation()); -// } -// // 还需要根据 HistoricTaskInstance 找到对应的 审批意见 -// List processInstanceComments = taskService.getProcessInstanceComments(taskchildPicture.getProcessinstanceid()); -// for (Comment comment : processInstanceComments) { -// -// if (comment.getTaskId().equals(taskHiInstance.getId())) { -// // 审批意见 -// String fullMessage = comment.getFullMessage(); -// dto.setComment(fullMessage); -// } -// } -// historicTaskInstanceDtos.add(dto); -// } -// taskchildPicture.setTransferRecords(historicTaskInstanceDtos); -// } } pageUtils.setTotalCount(count.intValue()); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataobject/Userapprove.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataobject/Userapprove.java index a366d30d..eb86eb55 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataobject/Userapprove.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataobject/Userapprove.java @@ -61,7 +61,7 @@ public class Userapprove implements BaseDto,java.io.Serializable { @Schema(description = "节点位置，待定字段，") @TableField(value="TASKINDEX") - private Integer taskindex; + private String taskindex; @Schema(description = "节点编号") @TableField(value="TASKNO") diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/impl/UserapproveServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/impl/UserapproveServiceImpl.java index ebae4e76..84f10d72 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/impl/UserapproveServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/impl/UserapproveServiceImpl.java @@ -30,7 +30,7 @@ public class UserapproveServiceImpl extends BaseServiceImpl UNION - select tc.*, uf.COMMENTHIS, uf.TASKNAME as TASKNAMEHIS, uf.TASKINDEX,uf.STATSHIS, uf.TASKNO, op.field6 as fromCustomerLevel, op.releaseArea as fromCity, op.is_repeat, tc.is_repeated_nodules as isRepeatedNodules + select + tc.*, uf.COMMENTHIS, uf.TASKNAME as TASKNAMEHIS, uf.STATSHIS, uf.TASKNO, uf.TASKINDEX as taskNodeIndex, op.field6 as fromCustomerLevel, op.releaseArea as fromCity, op.is_repeat, tc.is_repeated_nodules as isRepeatedNodules from ocr_taskchild_picture tc, OA_USERAPPROVE_T uf, ocr_picture op where tc.ID = uf.FORMID and tc.PICTUREID = op.ID @@ -793,17 +793,20 @@ t1.photo_date_timestamp photoDateTimestamp, t1.similarity_score similarityScore, t1.server_thumbnail_url serverThumbnailUrl, - IF(EXISTS (SELECT STATSHIS FROM oa_userapprove_t WHERE FORMID = t2.ID and STATSHIS = 3), 3, + IF(EXISTS (SELECT STATSHIS + FROM oa_userapprove_t + WHERE FORMID = t2.ID and STATSHIS = 3 and TASKINDEX = #{taskNode}), 3, IFNULL((SELECT t3.STATSHIS FROM oa_userapprove_t t3 WHERE t3.FORMID = t2.ID - and t3.TASKINDEX =#{taskNode} + and t3.TASKINDEX = #{taskNode} LIMIT 1), 1)) AS historyStates FROM ocr_picture t1 LEFT JOIN ocr_taskchild_picture t2 on t1.ID = t2.PICTUREID where t1.suspiciousfile = 0 and t1.ID in + #{item}