增加车床程序处理；退回改为实际编程员

yangys

2025-09-03 a3a9933cf1b49006edf470615236f94ebdaa4cb9

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

@@ -12,6 +12,9 @@
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;
@@ -34,7 +37,7 @@
   @Autowired
   private TaskService taskService;
   @Autowired
   private HistoryService historyService;
   private MdmUserService mdmUserService;
   @Autowired
   private FlowBusinessService businessService;
   @Autowired
@@ -44,6 +47,9 @@
   private FlowTransferService flowTransferService;
   @Autowired
   private FlowCommonService flowCommonService;

   @Autowired
   private DoneQueryService doneQueryService;
   /**
    * 待办任务列表页
    */
@@ -57,11 +63,19 @@

      return R.data(pages);
   }
   @GetMapping("done-list")
   @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) {
      IPage<FlowVO> pages = doneQueryService.selectDonePage(Condition.getPage(query) ,createTimeBegin,createTimeEnd,keyword);

      return R.data(pages);
   }
@@ -96,19 +110,19 @@
   @GetMapping("flow-user-list")
   @ApiOperationSupport(order = 3)
   @Operation(summary = "用户下拉数据", description = "用户下拉数据")
   public R<List<User>> flowUserList(@Parameter(description = "部门ID") String deptId,String taskId) {
      //userSearchClient.listByRole()
      return userSearchClient.listByDept(deptId);
   public R<List<MdmUser>> flowUserList(@Parameter(description = "部门ID") String deptId, String taskId) {

      return R.data(mdmUserService.listByDeptAndRoleAlias());
   }

   /**
    * 上一步审批人查询
    */
   /*
   @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));
   }
   }*/
}