自定义流程接口-流程加入短信通知

distributed-print/src/main/java/com/qmth/distributed/print/api/TFCustomFlowController.java

@@ -145,21 +145,6 @@ public class TFCustomFlowController {
         return ResultUtil.ok(true);
     }
 
-//    @ApiOperation(value = "测试启动流程")
-//    @ApiResponses({@ApiResponse(code = 200, message = "常规信息", response = ResultUtil.class)})
-//    @RequestMapping(value = "/testStart", method = RequestMethod.POST)
-//    @Transactional
-//    public Result testStart(@ApiParam(value = "实体id", required = true) @RequestParam String objectId,
-//                            @ApiParam(value = "命题老师id", required = true) @RequestParam String approveId,
-//                            @ApiParam(value = "实体表", required = true) @RequestParam TFCustomTypeEnum flowType) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.computeIfAbsent(SystemConstant.OBJECT_ID, v -> SystemConstant.convertIdToLong(objectId));
-//        map.computeIfAbsent(SystemConstant.APPROVE_ID, v -> SystemConstant.convertIdToLong(approveId));
-//        map.computeIfAbsent(SystemConstant.FLOW_TYPE, v -> flowType);
-//        activitiService.customFlowStart(map);
-//        return ResultUtil.ok(true);
-//    }
-
     @ApiOperation(value = "审批流程")
     @ApiResponses({@ApiResponse(code = 200, message = "常规信息", response = ResultUtil.class)})
     @RequestMapping(value = "/task/approve", method = RequestMethod.POST)
@@ -173,15 +158,6 @@ public class TFCustomFlowController {
         map.computeIfAbsent(SystemConstant.APPROVE_REMARK, v -> flowTaskApproveParam.getRemark());
         map.computeIfAbsent(SystemConstant.APPROVE_SETUP, v -> flowTaskApproveParam.getSetup());
         activitiService.taskApprove(map);
-//            // 驳回短信（驳回给提交老师）
-//            if (tfFlowApprove.getStatus() == FlowStatusEnum.REJECT
-//                    && (tfFlowApprove.getSetup().intValue() == FlowApproveSetupEnum.SUBMIT.getSetup())
-//                    || tfFlowApprove.getSetup().intValue() == FlowApproveSetupEnum.THREE_APPROVE.getSetup()) {
-//                List<SysUser> sysUsers = sysUserService.listByIds(Arrays.asList(examTask.getUserId()));
-//                List<ApproveUserResult> sysUserList = new Gson().fromJson(JacksonUtil.parseJson(sysUsers), new TypeToken<List<ApproveUserResult>>() {
-//                }.getType());
-//                basicMessageService.sendNoticeTaskAuditFlow(examTask, sysUserList, MessageEnum.NOTICE_OF_AUDIT_REJECT);
-//            }
         return ResultUtil.ok(true);
     }
 
@@ -207,7 +183,7 @@ public class TFCustomFlowController {
                        @ApiParam(value = "页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                        @ApiParam(value = "数量", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(tfCustomFlowService.list(new Page<>(pageNumber, pageSize), name, SystemConstant.getHeadOrUserSchoolId(), null));
+        return ResultUtil.ok(tfCustomFlowService.list(new Page<>(pageNumber, pageSize), name, sysUser.getSchoolId(), null));
     }
 
     @ApiOperation(value = "流程编辑")