lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
@@ -446,8 +446,6 @@ } orderDetailService.updateBatchById(collect); values.put("NextAssignee", userApprovalList); entity.setPrecisionCheckCompleted(CommonConstant.STATUS_1); values.put("NextAssignee", userApprovalList); entity.setOtherCheckCompleted(CommonConstant.STATUS_1); } } lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml
@@ -46,8 +46,8 @@ <select id="ListMyBusiness" resultType="org.jeecg.modules.flowable.domain.dto.FlowTaskDto"> SELECT fmb.task_id AS 'taskId', fmb.process_instance_id AS 'procInsId', latest_task.ID_ AS 'taskId', latest_task.PROC_DEF_ID_ AS 'procInsId', ACT_RE_PROCDEF.CATEGORY_ AS 'category', ACT_RE_PROCDEF.NAME_ AS 'procDefName', fmb.title AS 'Description', @@ -55,16 +55,14 @@ fmb.process_definition_key AS 'processDefinitionKey', fmb.process_definition_id AS 'processDefinitionId', fmb.proposer, fmb.todo_users, fmb.task_name, -- fmb.todo_users, -- fmb.task_name, latest_task.NAME_ AS taskName, fmb.create_time AS createTime, latest_task.END_TIME_ AS finishTime -- fmb.create_time AS createTime, latest_task.END_TIME_ AS finishTime, latest_task.TASK_DEF_KEY_ AS taskDefKey FROM flow_my_business fmb LEFT JOIN ACT_RE_PROCDEF ON fmb.process_definition_id = ACT_RE_PROCDEF.ID_ LEFT JOIN ACT_HI_PROCINST ON fmb.process_instance_id = ACT_HI_PROCINST.ID_ LEFT JOIN ( ( SELECT *, ROW_NUMBER() OVER ( @@ -80,13 +78,11 @@ AND END_TIME_ <= #{dto.endTime} </if> ) latest_task ON fmb.process_instance_id = latest_task.PROC_INST_ID_ AND latest_task.rn = 1 WHERE LEFT JOIN (select DISTINCT process_definition_key, process_definition_id, process_instance_id, title, data_id, proposer from flow_my_business) fmb ON fmb.process_instance_id = latest_task.PROC_INST_ID_ LEFT JOIN ACT_RE_PROCDEF ON fmb.process_definition_id = ACT_RE_PROCDEF.ID_ LEFT JOIN ACT_HI_PROCINST ON fmb.process_instance_id = ACT_HI_PROCINST.ID_ WHERE latest_task.rn = 1 <!-- 动态条件统一使用 dto --> <if test="dto.currentUser != null and dto.currentUser != ''"> fmb.done_users like concat('%',#{dto.currentUser},'%') </if> <if test="dto.category != null and dto.category != ''"> AND ACT_RE_PROCDEF.CATEGORY_ = #{dto.category} </if> lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/domain/dto/FlowTaskDto.java
@@ -45,9 +45,11 @@ private String assigneeName; @ApiModelProperty("流程发起人Id") @Deprecated //不采用此流程发起人 private String startUserId; @ApiModelProperty("流程发起人名称") @Deprecated //不采用此流程发起人 private String startUserName; @ApiModelProperty("流程类型") @@ -118,4 +120,8 @@ @ApiModelProperty(value = "当前的节点可以处理的用户名") @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") private String todoUsers; @ApiModelProperty("流程发起人名称") @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") private String proposer; } lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java
@@ -1150,28 +1150,28 @@ String username = iFlowThirdService.getLoginUser().getUsername(); flowMyBusinessDto.setCurrentUser(username); List<FlowTaskDto> list = flowMyBusinessService.ListMyBusiness(flowMyBusinessDto); list.forEach(flowTaskDto -> { // 流程发起人信息 HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery() .processInstanceId(flowTaskDto.getProcInsId()) .singleResult(); if (historicProcessInstance != null) { SysUser startUser = iFlowThirdService.getUserByUsername(historicProcessInstance.getStartUserId()); if (startUser != null) { flowTaskDto.setStartUserId(startUser.getUsername()); flowTaskDto.setStartUserName(startUser.getRealname()); } List<String> departNamesByUsername = iFlowThirdService.getDepartNamesByUsername(historicProcessInstance.getStartUserId()); flowTaskDto.setStartDeptName(CollUtil.join(departNamesByUsername, "，")); if (flowTaskDto.getTodoUsers() == null) { flowTaskDto.setTodoUsers(""); } else { //去除[] flowTaskDto.setTodoUsers(flowTaskDto.getTodoUsers().replaceAll("\\[", "").replaceAll("\\]", "")); flowTaskDto.setTodoUsers(flowTaskDto.getTodoUsers().replaceAll("\"", "")); } } }); // list.forEach(flowTaskDto -> { // // 流程发起人信息 // HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery() // .processInstanceId(flowTaskDto.getProcInsId()) // .singleResult(); // if (historicProcessInstance != null) { // SysUser startUser = iFlowThirdService.getUserByUsername(historicProcessInstance.getStartUserId()); // if (startUser != null) { // flowTaskDto.setStartUserId(startUser.getUsername()); // flowTaskDto.setStartUserName(startUser.getRealname()); // } // List<String> departNamesByUsername = iFlowThirdService.getDepartNamesByUsername(historicProcessInstance.getStartUserId()); // flowTaskDto.setStartDeptName(CollUtil.join(departNamesByUsername, "，")); // if (flowTaskDto.getTodoUsers() == null) { // flowTaskDto.setTodoUsers(""); // } else { // //去除[] // flowTaskDto.setTodoUsers(flowTaskDto.getTodoUsers().replaceAll("\\[", "").replaceAll("\\]", "")); // flowTaskDto.setTodoUsers(flowTaskDto.getTodoUsers().replaceAll("\"", "")); // } // } // }); IPage<FlowTaskDto> flowTaskDtoIPage = new Page<>(); flowTaskDtoIPage.setRecords(list); flowTaskDtoIPage.setTotal(page.getTotal());
