mdm.git - Gitblit

			@@ -15,10 +15,14 @@
			import org.springblade.core.tool.utils.StringUtil;
			import org.springblade.mdm.flow.service.FlowBusinessService;
			import org.springblade.mdm.flow.vo.FlowVO;
			import org.springblade.system.feign.IUserClient;
			import org.springblade.system.feign.IUserSearchClient;
			import org.springblade.system.pojo.entity.User;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.web.bind.annotation.*;

			import java.time.LocalDate;
			import java.util.List;
			import java.util.Map;

			@Slf4j
			@@ -30,7 +34,8 @@
			private TaskService taskService;
			@Autowired
			private FlowBusinessService businessService;

			@Autowired
			private IUserSearchClient userSearchClient;
			/**
			* 待办任务列表页
			*/
			@@ -69,4 +74,14 @@
			return R.success("流程转派成功");
			}

			/**
			* 待办任务列表页
			*/
			@GetMapping("flow-user-list")
			@ApiOperationSupport(order = 3)
			@Operation(summary = "用户下拉数据", description = "用户下拉数据")
			public R<List<User>> flowUserList(@Parameter(description = "部门ID") String deptId) {
			return userSearchClient.listByDept(deptId);

			}
			}

			@@ -11,6 +11,7 @@
			import org.springblade.core.secure.utils.AuthUtil;
			import org.springblade.core.tool.utils.*;

			import org.springblade.mdm.basesetting.machine.MachineService;
			import org.springblade.mdm.flow.entity.MdmFlowProcess;
			import org.springblade.mdm.flow.util.MdmFlowCache;
			import org.springblade.mdm.flow.vo.FlowVO;
			@@ -32,7 +33,7 @@

			private final TaskService taskService;
			private final HistoryService historyService;

			private final MachineService machineService;

			public IPage<FlowVO> selectTodoPage(IPage<FlowVO> page, LocalDate createTimeBegin, LocalDate createTimeEnd, String keyword) {
			//String taskUser = TaskUtil.getTaskUser();
			@@ -57,7 +58,11 @@
			// 构建列表数据
			FlowVO bladeFlow = new FlowVO();
			buildFlowTaskList(bladeFlow, flowList, todoQuery);//FlowEngineConstant.STATUS_TODO , "todo"

			flowList.forEach(flowVO -> {
			if(flowVO.getVariables().containsKey("machineCode")){
			//Machine machinemachineService.getByCode((String)flowVO.getVariables().get("machineCode"))
			}
			});
			// 计算总数
			long count = todoQuery.count();
			// 设置页数

	blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史