流程数据修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ReviewLogDto.java

@@ -1,27 +1,47 @@
 package com.qmth.distributed.print.business.bean.dto;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.enums.FlowApprovePassEnum;
+
+import java.util.Objects;
+
 /**
  * @Date: 2021/4/1.
  */
 public class ReviewLogDto {
 
-    private String id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+    private FlowApprovePassEnum approvePass;
     private String reviewStatus;
     private String reason;
     private String operateId;
     private String operateName;
     private Long operateTime;
 
-    public String getId() {
+    public FlowApprovePassEnum getApprovePass() {
+        return approvePass;
+    }
+
+    public void setApprovePass(FlowApprovePassEnum approvePass) {
+        this.approvePass = approvePass;
+    }
+
+    public Long getId() {
         return id;
     }
 
-    public void setId(String id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
     public String getReviewStatus() {
-        return reviewStatus;
+        if (Objects.nonNull(approvePass)) {
+            return approvePass.getTitle();
+        } else {
+            return reviewStatus;
+        }
     }
 
     public void setReviewStatus(String reviewStatus) {

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

@@ -16,5 +16,5 @@ import java.util.List;
  */
 public interface ExamTaskReviewLogService extends IService<ExamTaskReviewLog> {
 
-    List<ReviewLogDto> list(Long examTaskId);
+    List<ReviewLogDto> list(Long flowId);
 }

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

@@ -22,7 +22,6 @@ public class ExamTaskReviewLogServiceImpl extends ServiceImpl<ExamTaskReviewLogM
 
     @Override
     public List<ReviewLogDto> list(Long examTaskId) {
-        List<ReviewLogDto> list = this.baseMapper.list(examTaskId);
-        return list;
+        return this.baseMapper.list(examTaskId);
     }
 }

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

@@ -17,21 +17,20 @@
         id,
         exam_task_id, review_status, reason, operate_id, operate_time
     </sql>
+
     <select id="list" resultType="com.qmth.distributed.print.business.bean.dto.ReviewLogDto">
-        SELECT
-            a.id,
-            a.review_status reviewStatus,
-            a.reason,
-            a.operate_id operateId,
-            b.real_name operateName,
-            a.operate_time operateTime
-        FROM
-            exam_task_review_log a
-                LEFT JOIN
-            sys_user b ON a.operate_id = b.id
-        WHERE
-            a.exam_task_id = #{examTaskId}
-        order by a.create_time desc
+        select
+            tffl.id,
+            tffl.approve_operation as approvePass,
+            tffl.approve_remark as reason,
+            tffl.approve_id as operateId,
+            su.real_name as operateName,
+            tffl.create_time as operateTime
+        from
+            t_f_flow_log tffl
+        left join sys_user su on tffl.approve_id = su.id
+        where tffl.flow_id = #{flowId}
+        order by tffl.create_time desc
     </select>
 
 </mapper>

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

@@ -120,8 +120,7 @@ public class ExamTaskController {
                        @RequestParam(required = false) String createName,
                        @RequestParam Integer pageNumber,
                        @RequestParam Integer pageSize) {
-        IPage<ExamTaskDto> examTasks = examTaskService.list(enable, status, SystemConstant.convertIdToLong(cardRuleId), courseCode, paperNumber, startTime, endTime, userName, createName, pageNumber, pageSize);
-        return ResultUtil.ok(examTasks);
+        return ResultUtil.ok(examTaskService.list(enable, status, SystemConstant.convertIdToLong(cardRuleId), courseCode, paperNumber, startTime, endTime, userName, createName, pageNumber, pageSize));
     }
 
     /**
@@ -139,8 +138,7 @@ public class ExamTaskController {
             printPlanId = new ArrayList<>();
         }
         List<Long> printPlanIdList = printPlanId.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList());
-        List<String> list = examTaskService.listPaperNumber(param, printPlanIdList);
-        return ResultUtil.ok(list);
+        return ResultUtil.ok(examTaskService.listPaperNumber(param, printPlanIdList));
     }
 
     /**
@@ -152,8 +150,7 @@ public class ExamTaskController {
     @ApiOperation(value = "命题老师模糊查询")
     @RequestMapping(value = "/user_query", method = RequestMethod.POST)
     public Result userQuery(@RequestParam(value = "param", required = false) String param) {
-        List<BlurryUserDto> list = examTaskService.listUser(param);
-        return ResultUtil.ok(list);
+        return ResultUtil.ok(examTaskService.listUser(param));
     }
 
     /**
@@ -165,8 +162,7 @@ public class ExamTaskController {
     @ApiOperation(value = "更改/指派命题老师")
     @RequestMapping(value = "/assign_user", method = RequestMethod.POST)
     public Result assignUser(@RequestBody ExamTask examTask) {
-        boolean isSuccess = examTaskService.assignUser(examTask);
-        return ResultUtil.ok(isSuccess);
+        return ResultUtil.ok(examTaskService.assignUser(examTask));
     }
 
     /**
@@ -251,16 +247,13 @@ public class ExamTaskController {
     /**
      * 审核历史
      *
-     * @param request
-     * @param examTaskId
+     * @param flowId
      * @return
      */
     @ApiOperation(value = "审核历史")
     @RequestMapping(value = "/review_list", method = RequestMethod.POST)
-    public Result reviewList(HttpServletRequest request,
-                             @RequestParam("examTaskId") Long examTaskId) {
-        List<ReviewLogDto> list = examTaskReviewLogService.list(examTaskId);
-        return ResultUtil.ok(list);
+    public Result reviewList(@ApiParam(value = "流程id", required = true) @RequestParam String flowId) {
+        return ResultUtil.ok(examTaskReviewLogService.list(SystemConstant.convertIdToLong(flowId)));
     }
 
     /**
@@ -290,8 +283,7 @@ public class ExamTaskController {
                                 @RequestParam(value = "userName", required = false) String userName,
                                 @RequestParam("pageNumber") Integer pageNumber,
                                 @RequestParam("pageSize") Integer pageSize) {
-        IPage<ExamTaskDto> list = examTaskService.listTaskApply(auditStatus, reviewStatus, cardRuleId, courseCode, paperNumber, startTime, endTime, userName, pageNumber, pageSize);
-        return ResultUtil.ok(list);
+        return ResultUtil.ok(examTaskService.listTaskApply(auditStatus, reviewStatus, cardRuleId, courseCode, paperNumber, startTime, endTime, userName, pageNumber, pageSize));
     }
 
     /**
@@ -348,8 +340,7 @@ public class ExamTaskController {
     @ApiOperation(value = "撤回")
     @RequestMapping(value = "/apply_status", method = RequestMethod.POST)
     public Result taskApplyStatus(@RequestBody ExamTask examTask) {
-        boolean isSuccess = examTaskService.status(examTask);
-        return ResultUtil.ok(isSuccess);
+        return ResultUtil.ok(examTaskService.status(examTask));
     }
 
     /**
@@ -381,8 +372,7 @@ public class ExamTaskController {
                                           @RequestParam(value = "createName", required = false) String createName,
                                           @RequestParam("pageNumber") Integer pageNumber,
                                           @RequestParam("pageSize") Integer pageSize) {
-        IPage<ExamTaskDto> examTaskDtoIPage = examTaskService.listTaskReviewUnaudited(courseCode, paperNumber, userId, cardRuleId, startTime, endTime, startCreateTime, endCreateTime, createName, pageNumber, pageSize);
-        return ResultUtil.ok(examTaskDtoIPage);
+        return ResultUtil.ok(examTaskService.listTaskReviewUnaudited(courseCode, paperNumber, userId, cardRuleId, startTime, endTime, startCreateTime, endCreateTime, createName, pageNumber, pageSize));
     }
 
     /**
@@ -403,7 +393,8 @@ public class ExamTaskController {
      */
     @ApiOperation(value = "入库审核查询-已审核")
     @RequestMapping(value = "/review_list_audited", method = RequestMethod.POST)
-    public Result taskReviewListAudited(@RequestParam(value = "reviewStatus", required = false) String reviewStatus,
+    public Result taskReviewListAudited(@RequestParam(value = "reviewStatus", required = false) String
+                                                reviewStatus,
                                         @RequestParam(value = "courseCode", required = false) String courseCode,
                                         @RequestParam(value = "paperNumber", required = false) String paperNumber,
                                         @RequestParam(value = "userId", required = false) Long userId,
@@ -415,8 +406,7 @@ public class ExamTaskController {
                                         @RequestParam(value = "createName", required = false) String createName,
                                         @RequestParam("pageNumber") Integer pageNumber,
                                         @RequestParam("pageSize") Integer pageSize) {
-        IPage<ExamTaskDto> examTaskDtoIPage = examTaskService.listTaskReviewAudited(reviewStatus, courseCode, paperNumber, userId, cardRuleId, startTime, endTime, startCreateTime, endCreateTime, createName, pageNumber, pageSize);
-        return ResultUtil.ok(examTaskDtoIPage);
+        return ResultUtil.ok(examTaskService.listTaskReviewAudited(reviewStatus, courseCode, paperNumber, userId, cardRuleId, startTime, endTime, startCreateTime, endCreateTime, createName, pageNumber, pageSize));
     }
 
     /**
@@ -469,7 +459,8 @@ public class ExamTaskController {
 
     @ApiOperation(value = "导出审核样本")
     @RequestMapping(value = "/review_export", method = RequestMethod.POST)
-    public Result taskReviewExport(@Valid @RequestBody ArraysParams arraysParams, BindingResult bindingResult) throws Exception {
+    public Result taskReviewExport(@Valid @RequestBody ArraysParams arraysParams, BindingResult bindingResult) throws
+            Exception {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
@@ -502,8 +493,7 @@ public class ExamTaskController {
                                 @RequestParam(value = "cardRuleId", required = false) Long cardRuleId,
                                 @RequestParam("pageNumber") Integer pageNumber,
                                 @RequestParam("pageSize") Integer pageSize) {
-        IPage<ExamTaskDetailDto> examTaskDtoIPage = examTaskService.listTaskPaper(courseCode, paperNumber, startTime, endTime, makeMethod, cardRuleId, pageNumber, pageSize);
-        return ResultUtil.ok(examTaskDtoIPage);
+        return ResultUtil.ok(examTaskService.listTaskPaper(courseCode, paperNumber, startTime, endTime, makeMethod, cardRuleId, pageNumber, pageSize));
     }
 
 
@@ -656,8 +646,7 @@ public class ExamTaskController {
     @ApiOperation(value = "卷库查询-发布印刷任务-扩展字段列表")
     @RequestMapping(value = "/list_task_print_extend_fields", method = RequestMethod.POST)
     public Result listTaskPrintExtendFields() {
-        List<TaskPrintExtendFieldsDto> extendFieldsDtos = examTaskPrintService.listTaskPrintExtendFields();
-        return ResultUtil.ok(extendFieldsDtos);
+        return ResultUtil.ok(examTaskPrintService.listTaskPrintExtendFields());
     }
 
     /**
@@ -672,8 +661,7 @@ public class ExamTaskController {
                                      @RequestParam(value = "courseCode") String courseCode,
                                      @RequestParam(value = "paperNumber") String paperNumber,
                                      @RequestParam(value = "examTaskPrintId", required = false) Long examTaskPrintId) {
-        List<TaskPrintClassDto> classDtos = examTaskPrintService.listClass(printPlanId, courseCode, paperNumber, examTaskPrintId);
-        return ResultUtil.ok(classDtos);
+        return ResultUtil.ok(examTaskPrintService.listClass(printPlanId, courseCode, paperNumber, examTaskPrintId));
     }
 
     /**
@@ -684,8 +672,7 @@ public class ExamTaskController {
     @ApiOperation(value = "卷库查询-发布印刷任务-印刷室列表")
     @RequestMapping(value = "/list_task_print_house", method = RequestMethod.POST)
     public Result listTaskPrintHouse() {
-        List<TaskPrintHouseDto> houseDtos = examTaskPrintService.listHouse();
-        return ResultUtil.ok(houseDtos);
+        return ResultUtil.ok(examTaskPrintService.listHouse());
     }
 
     /**
@@ -715,8 +702,7 @@ public class ExamTaskController {
     public Result listTaskPrintStudent(@RequestParam(value = "classId") String classId,
                                        @RequestParam Integer pageNumber,
                                        @RequestParam Integer pageSize) {
-        IPage<BasicStudent> students = examTaskPrintService.listStudentByClass(classId, pageNumber, pageSize);
-        return ResultUtil.ok(students);
+        return ResultUtil.ok(examTaskPrintService.listStudentByClass(classId, pageNumber, pageSize));
     }
 
     /**