v2.2.2bug修改-审批记录查询

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/FlowApproveResult.java

@@ -51,6 +51,15 @@ public class FlowApproveResult extends TFFlowApproveLog implements Serializable
     @ApiModelProperty(value = "当前处理人")
     private String currentApproveUserName;
 
+    @ApiModelProperty(value = "科目代码")
+    private String courseCode;
+
+    @ApiModelProperty(value = "科目名称")
+    private String courseName;
+
+    @ApiModelProperty(value = "试卷编号")
+    private String paperNumber;
+
     public String getThreeApproveName() {
         return threeApproveName;
     }
@@ -134,4 +143,28 @@ public class FlowApproveResult extends TFFlowApproveLog implements Serializable
     public void setCurrentApproveUserName(String currentApproveUserName) {
         this.currentApproveUserName = currentApproveUserName;
     }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getPaperNumber() {
+        return paperNumber;
+    }
+
+    public void setPaperNumber(String paperNumber) {
+        this.paperNumber = paperNumber;
+    }
 }

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

@@ -39,7 +39,7 @@ public interface TFFlowMapper extends BaseMapper<TFFlow> {
      * @param flowId
      * @return
      */
-    IPage<FlowApproveResult> flowApproveList(IPage<Map> iPage, @Param("status") String status, @Param("startName") String startName, @Param("createStartTime") Long createStartTime, @Param("createEndTime") Long createEndTime, @Param("schoolId") Long schoolId, @Param("orgId") Long orgId, @Param("flowId") Long flowId);
+    IPage<FlowApproveResult> flowApproveList(IPage<Map> iPage, @Param("status") String status, @Param("startName") String startName, @Param("teachingRoomId") Long teachingRoomId, @Param("createStartTime") Long createStartTime, @Param("createEndTime") Long createEndTime, @Param("schoolId") Long schoolId, @Param("orgId") Long orgId, @Param("flowId") Long flowId);
 
     /**
      * 流程审批记录找人

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

@@ -38,7 +38,7 @@ public interface TFFlowService extends IService<TFFlow> {
      * @param flowId
      * @return
      */
-    public IPage<FlowApproveResult> flowApproveList(IPage<Map> iPage, String status, String startName, Long createStartTime, Long createEndTime, Long schoolId, Long orgId, Long flowId);
+    public IPage<FlowApproveResult> flowApproveList(IPage<Map> iPage, String status, String startName, Long teachingRoomId, Long createStartTime, Long createEndTime, Long schoolId, Long orgId, Long flowId);
 
     /**
      * 流程审批记录找人

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

@@ -14,6 +14,7 @@ import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.FlowApproveSetupEnum;
 import com.qmth.teachcloud.common.service.SysUserService;
 import com.qmth.teachcloud.common.util.ServletUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -68,12 +69,12 @@ public class TFFlowServiceImpl extends ServiceImpl<TFFlowMapper, TFFlow> impleme
      * @return
      */
     @Override
-    public IPage<FlowApproveResult> flowApproveList(IPage<Map> iPage, String status, String startName, Long createStartTime, Long createEndTime, Long schoolId, Long orgId, Long flowId) {
-        IPage<FlowApproveResult> flowApproveResultIPage = tfFlowMapper.flowApproveList(iPage, status, startName, createStartTime, createEndTime, schoolId, orgId, flowId);
+    public IPage<FlowApproveResult> flowApproveList(IPage<Map> iPage, String status, String startName, Long teachingRoomId, Long createStartTime, Long createEndTime, Long schoolId, Long orgId, Long flowId) {
+        IPage<FlowApproveResult> flowApproveResultIPage = tfFlowMapper.flowApproveList(iPage, status, startName, teachingRoomId, createStartTime, createEndTime, schoolId, orgId, flowId);
         for (FlowApproveResult record : flowApproveResultIPage.getRecords()) {
             record.setStatusStr(record.getStatus().getTitle());
             // FlowApproveSetupEnum
-            if (!(FlowApproveSetupEnum.END.getSetup() == record.getSetup())) {
+            if (FlowApproveSetupEnum.FINISH.getSetup() == record.getSetup()) {
                 record.setSetupStr("结束节点");
             } else if (FlowApproveSetupEnum.SUBMIT.getSetup() == record.getSetup()) {
                 record.setSetupStr("开始节点");
@@ -87,12 +88,14 @@ public class TFFlowServiceImpl extends ServiceImpl<TFFlowMapper, TFFlow> impleme
                 TFFlowLog tfFlowLog = flowLogs.stream().sorted(Comparator.comparingLong(TFFlowLog::getCreateTime).reversed()).findFirst().orElse(null);
                 if (Objects.nonNull(tfFlowLog)) {
                     String pendApproveId = tfFlowLog.getPendApproveId();
-                    StringJoiner sj = new StringJoiner(",");
-                    for (String id : pendApproveId.split(",")) {
-                        SysUser sysUser = sysUserService.getById(id);
-                        sj.add(sysUser.getRealName());
+                    if (StringUtils.isNotBlank(pendApproveId)) {
+                        StringJoiner sj = new StringJoiner(",");
+                        for (String id : pendApproveId.split(",")) {
+                            SysUser sysUser = sysUserService.getById(id);
+                            sj.add(sysUser.getRealName());
+                        }
+                        record.setCurrentApproveUserName(sj.toString());
                     }
-                    record.setCurrentApproveUserName(sj.toString());
                 }
             }
 

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

@@ -26,11 +26,15 @@
             su.real_name as startName,
             tffal.create_time as createTime,
             tffa.setup,
-            tffa.status
+            tffa.status,
+            et.course_code courseCode,
+            et.course_name courseName,
+            et.paper_number paperNumber
         from
             t_f_flow_approve_log tffal
         left join t_f_flow_approve tffa on tffa.flow_id = tffal.flow_id
         left join sys_user su on su.id = tffal.start_id
+        left join exam_task et on tffal.flow_id = et.flow_id
         <where>
             <if test="schoolId != null and schoolId != ''">
                 and tffal.school_id = #{schoolId}
@@ -38,6 +42,9 @@
             <if test="status != null and status != ''">
                 and tffa.status = #{status}
             </if>
+            <if test="teachingRoomId != null and teachingRoomId != ''">
+                and et.teaching_room_id = #{teachingRoomId}
+            </if>
             <if test="startName != null and startName != ''">
                 and su.real_name like concat('%',#{startName},'%')
             </if>

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

@@ -220,12 +220,13 @@ public class TFFlowController {
     @RequestMapping(value = "/approve/list", method = RequestMethod.POST)
     public Result taskApproveList(@ApiParam(value = "状态", required = false) @RequestParam(required = false) String status,
                                   @ApiParam(value = "发起人名称", required = false) @RequestParam(required = false) String startName,
+                                  @ApiParam(value = "教研室", required = false) @RequestParam(required = false) Long teachingRoomId,
                                   @ApiParam(value = "提交开始时间", required = false) @RequestParam(required = false) Long createStartTime,
                                   @ApiParam(value = "提交结束时间", required = false) @RequestParam(required = false) Long createEndTime,
                                   @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(tfFlowService.flowApproveList(new Page<>(pageNumber, pageSize), status, startName, createStartTime, createEndTime, SystemConstant.getHeadOrUserSchoolId(), sysUser.getOrgId(), null));
+        return ResultUtil.ok(tfFlowService.flowApproveList(new Page<>(pageNumber, pageSize), status, startName, teachingRoomId, createStartTime, createEndTime, SystemConstant.getHeadOrUserSchoolId(), sysUser.getOrgId(), null));
     }
 
     @ApiOperation(value = "流程审批记录逻辑删除")