工控网分析程序状态问题修复

yangys

2025-09-18 a3048fa6fa72fa3cc5da2c43c59bd000e00c9599

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java

@@ -6,14 +6,22 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.HistoryService;
import org.flowable.engine.TaskService;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.mdm.basesetting.producedivision.entity.MdmUser;
import org.springblade.mdm.basesetting.producedivision.service.MdmUserService;
import org.springblade.mdm.flow.service.DoneQueryService;
import org.springblade.mdm.flow.service.FlowBusinessService;
import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.FlowTransferService;
import org.springblade.mdm.flow.vo.DoneQueryVO;
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.system.feign.IUserSearchClient;
import org.springblade.system.pojo.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,22 +40,48 @@
   @Autowired
   private TaskService taskService;
   @Autowired
   private MdmUserService mdmUserService;
   @Autowired
   private FlowBusinessService businessService;
   @Autowired
   private IUserSearchClient userSearchClient;

   @Autowired
   private FlowTransferService flowTransferService;
   @Autowired
   private FlowCommonService flowCommonService;

   @Autowired
   private DoneQueryService doneQueryService;
   /**
    * 待办任务列表页
    */
   @GetMapping("todo-list")
   @ApiOperationSupport(order = 3)
   @Operation(summary = "待办任务", description = "传入流程信息")
   public R<IPage<FlowVO>> todoList(@Parameter(description = "关键字") String keyword, @Parameter(description = "创建时间开始") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime createTimeBegin, @Parameter(description = "创建时间截止")  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime createTimeEnd, Query query) {
      IPage<FlowVO> pages = businessService.selectTodoPage(Condition.getPage(query), createTimeBegin,createTimeEnd,keyword);
   public R<IPage<FlowVO>> todoList(TodoQueryVO queryVO) {
      IPage<FlowVO> pages = businessService.selectTodoPage(Condition.getPage(queryVO),queryVO);

      return R.data(pages);
   }
   @GetMapping("done-list-old")
   @ApiOperationSupport(order = 3)
   @Operation(summary = "当前用户已办任务分页", description = "传入流程信息")
   public R<IPage<FlowVO>> doneList(@Parameter(description = "关键字") String keyword, @Parameter(description = "创建时间开始") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime createTimeBegin, @Parameter(description = "创建时间截止")  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime createTimeEnd, Query query) {
      IPage<FlowVO> pages = businessService.selectDonePage(Condition.getPage(query),"" ,createTimeBegin,createTimeEnd,keyword);

      return R.data(pages);
   }
   @GetMapping("done-list")
   @ApiOperationSupport(order = 3)
   @Operation(summary = "当前用户已办任务分页2", description = "传入流程信息2")
   //public R<IPage<FlowVO>> doneList2(@Parameter(description = "关键字") String keyword, @Parameter(description = "创建时间开始") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime createTimeBegin, @Parameter(description = "创建时间截止")  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime createTimeEnd, Query query) {
   public R<IPage<FlowVO>> doneList2(DoneQueryVO query) {
      IPage<FlowVO> pages = doneQueryService.selectDonePage(query);

      return R.data(pages);
   }


   /**
    * 待办任务列表页
@@ -64,15 +98,6 @@
   @PostMapping("transferTask")
   public R<Void> transferTask(String taskId,String newAssigneeId, String processInstanceId, String comment) {
      // 增加评论
      /*
      if (StringUtil.isNoneBlank(processInstanceId, comment)) {
         taskService.addComment(taskId, processInstanceId, comment);
      }

      // 完成任务
      taskService.setAssignee(taskId, newAssigneeId);

       */
      try {
         this.flowTransferService.transferTask(taskId, newAssigneeId, comment);
         return R.success("流程转派成功");
@@ -82,13 +107,30 @@
   }

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

   @Operation(summary = "处理人下拉数据", description = "处理人下拉数据")
   public R<List<MdmUser>> flowUserList(@Parameter(description = "部门ID") String deptId, String taskId) {
      return R.data(mdmUserService.listByDeptAndRoleAlias());
   }

   @GetMapping("flow-user-tree")
   @ApiOperationSupport(order = 3)
   @Operation(summary = "处理人下拉数据-树形", description = "处理人下拉数据")
   public R<List<ProgramNodeVO>> flowUserTree(@Parameter(description = "部门ID") String deptId, String taskId) {
      return R.data(mdmUserService.flowUserTree());
   }

   /**
    * 上一步审批人查询
    */
   /*
   @GetMapping("previus-approve-user")
   @ApiOperationSupport(order = 3)
   @Operation(summary = "上一步审批人查询", description = "上一步审批人查询，返回审批人id")
   public R<String> previusApproveUserId(@Parameter(description = "部门ID") String processInstanceId) {
      return R.data(this.flowCommonService.previusAssignee(processInstanceId));
   }*/
}