自定义流程接口-修复命题任务申请BUG

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/TFFlowApproveMapper.java

@@ -32,7 +32,7 @@ public interface TFFlowApproveMapper extends BaseMapper<TFFlowApprove> {
      *
      * @param iPage
      * @param status
-     * @param createUserName
+     * @param teacherUserName
      * @param teachingRoomId
      * @param startTime
      * @param endTime
@@ -43,7 +43,7 @@ public interface TFFlowApproveMapper extends BaseMapper<TFFlowApprove> {
      */
     public IPage<FlowApproveListResult> findApproveList(IPage<Map> iPage,
                                                         @Param("status") String status,
-                                                        @Param("createUserName") String createUserName,
+                                                        @Param("teacherUserName") String teacherUserName,
                                                         @Param("teachingRoomId") Long teachingRoomId,
                                                         @Param("startTime") Long startTime,
                                                         @Param("endTime") Long endTime,

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/TFFlowApproveService.java

@@ -32,7 +32,7 @@ public interface TFFlowApproveService extends IService<TFFlowApprove> {
      *
      * @param iPage
      * @param status
-     * @param createUserName
+     * @param teacherUserName
      * @param teachingRoomId
      * @param startTime
      * @param endTime
@@ -43,7 +43,7 @@ public interface TFFlowApproveService extends IService<TFFlowApprove> {
      */
     public IPage<FlowApproveListResult> findApproveList(IPage<Map> iPage,
                                                         FlowStatusEnum status,
-                                                        String createUserName,
+                                                        String teacherUserName,
                                                         Long teachingRoomId,
                                                         Long startTime,
                                                         Long endTime,

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TFFlowApproveServiceImpl.java

@@ -43,7 +43,7 @@ public class TFFlowApproveServiceImpl extends ServiceImpl<TFFlowApproveMapper, T
      *
      * @param iPage
      * @param status
-     * @param createUserName
+     * @param teacherUserName
      * @param teachingRoomId
      * @param startTime
      * @param endTime
@@ -53,10 +53,10 @@ public class TFFlowApproveServiceImpl extends ServiceImpl<TFFlowApproveMapper, T
      * @return
      */
     @Override
-    public IPage<FlowApproveListResult> findApproveList(IPage<Map> iPage, FlowStatusEnum status, String createUserName, Long teachingRoomId, Long startTime, Long endTime, String pendApproveUserName, Long schoolId, Long orgId) {
+    public IPage<FlowApproveListResult> findApproveList(IPage<Map> iPage, FlowStatusEnum status, String teacherUserName, Long teachingRoomId, Long startTime, Long endTime, String pendApproveUserName, Long schoolId, Long orgId) {
         return tfFlowApproveMapper.findApproveList(iPage,
                 Objects.nonNull(status) ? status.name() : null,
-                createUserName,
+                teacherUserName,
                 teachingRoomId,
                 startTime,
                 endTime,

distributed-print-business/src/main/resources/mapper/TFFlowApproveMapper.xml

@@ -99,8 +99,8 @@
         join t_f_flow_log tffl on
         tffl.id = t.flowLogId
         <where>
-            <if test="createUserName != null and createUserName != ''">
-                and t.teacherUserName like concat('%',#{createUserName},'%')
+            <if test="teacherUserName != null and teacherUserName != ''">
+                and t.teacherUserName like concat('%',#{teacherUserName},'%')
             </if>
         </where>
          ) temp

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

@@ -166,14 +166,14 @@ public class TFCustomFlowController {
     @ApiResponses({@ApiResponse(code = 200, message = "流程审批记录信息", response = FlowApproveListResult.class)})
     @RequestMapping(value = "/approve/list", method = RequestMethod.POST)
     public Result taskApproveList(@ApiParam(value = "状态", required = false) @RequestParam(required = false) FlowStatusEnum status,
-                                  @ApiParam(value = "提交人名称", required = false) @RequestParam(required = false) String createUserName,
+                                  @ApiParam(value = "提交人名称", required = false) @RequestParam(required = false) String teacherUserName,
                                   @ApiParam(value = "教研室", required = false) @RequestParam(required = false) String teachingRoomId,
                                   @ApiParam(value = "提交开始时间", required = false) @RequestParam(required = false) Long startTime,
                                   @ApiParam(value = "提交结束时间", required = false) @RequestParam(required = false) Long endTime,
                                   @ApiParam(value = "提交人名称", required = false) @RequestParam(required = false) String pendApproveUserName,
                                   @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) {
-        return ResultUtil.ok(tfFlowApproveService.findApproveList(new Page<>(pageNumber, pageSize), status, createUserName, SystemConstant.convertIdToLong(teachingRoomId), startTime, endTime, pendApproveUserName, SystemConstant.getHeadOrUserSchoolId(), null));
+        return ResultUtil.ok(tfFlowApproveService.findApproveList(new Page<>(pageNumber, pageSize), status, teacherUserName, SystemConstant.convertIdToLong(teachingRoomId), startTime, endTime, pendApproveUserName, SystemConstant.getHeadOrUserSchoolId(), null));
     }
 
     @ApiOperation(value = "流程列表")