mdm.git - Gitblit

			@@ -21,6 +21,7 @@
			import org.springblade.mdm.flow.service.FlowCommonService;
			import org.springblade.mdm.flow.service.FlowTransferService;
			import org.springblade.mdm.flow.vo.FlowVO;
			import org.springblade.mdm.flow.vo.TodoQueryVO;
			import org.springblade.mdm.gkw.programnode.vo.ProgramNodeVO;
			import org.springblade.mdm.program.service.NcProgramApprovedService;
			import org.springblade.mdm.program.vo.NcProgramExportDncPageVO;
			@@ -44,7 +45,7 @@
			public class RemindController {

			@Autowired
			NcProgramApprovedService ncProgramApprovedService;
			private NcProgramApprovedService ncProgramApprovedService;
			@Autowired
			private FlowBusinessService businessService;
			@Autowired
			@@ -54,8 +55,8 @@
			*/
			@GetMapping("task-count")
			@ApiOperationSupport(order = 3)
			@Operation(summary = "待办任务", description = "传入流程信息")
			public R<RemindVO> todoList() {
			@Operation(summary = "待办任务数量查询", description = "待办任务数量查询")
			public R<RemindVO> taskCount() {
			RemindVO result = new RemindVO();

			result.setTodoCount(queryTodoCount());
			@@ -65,10 +66,10 @@
			return R.data(result);
			}
			long queryTodoCount(){
			Query query = new Query();
			TodoQueryVO query = new TodoQueryVO();
			query.setCurrent(1);
			query.setSize(1);
			IPage<FlowVO> pages = businessService.selectTodoPage(Condition.getPage(query), null,null,null);
			IPage<FlowVO> pages = businessService.selectTodoPage(Condition.getPage(query), query);
			return pages.getTotal();
			}
			/**
			@@ -79,13 +80,8 @@
			NcProgramExportDncQueryVO query = new NcProgramExportDncQueryVO();
			query.setCurrent(1);
			query.setSize(1);

			List<String> userRoleAliasList = Func.toStrList(",", AuthUtil.getUserRole());//角色别名，多个角色逗号分隔
			String managerRole = paramService.getProgramManagerRoleAlias();
			if(!userRoleAliasList.contains(managerRole) && !AuthUtil.isAdministrator() && !AuthUtil.isAdmin()){
			//非数控管理员角色、管理员，限制未只能导出自己的程序
			query.setUserId(AuthUtil.getUserId());
			}
			query.setUserId(AuthUtil.getUserId());
			query.setQueryType(NcProgramExportDncQueryVO.TYPE_SELF);

			IPage<NcProgramExportDncPageVO> pages = ncProgramApprovedService.exportDncPageQuery(query);
			return pages.getTotal();