add 查询流程审批记录

laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java

@@ -11,6 +11,7 @@ import com.jero.common.util.MessageUtils;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
 import com.jero.modules.activiti.entity.ProcessNode;
+import com.jero.modules.activiti.enums.CommitFlagEnum;
 import com.jero.modules.activiti.enums.FinishFlagEnum;
 import com.jero.modules.activiti.service.*;
 import com.jero.modules.laws.common.constant.ResultCommon;
@@ -156,7 +157,7 @@ public class ActivitiController {
         }
         //更新审批表为完成，填充数据
         ProcessApprovalRecord approvalRecord = processApprovalRecordService.getToDoByTaskId(taskId);
-        approvalRecord.setCommitFlag(commitFlag);
+        approvalRecord.setCommitFlag(commitFlag == 1? CommitFlagEnum.PASS.getValue() : CommitFlagEnum.REJECT.getValue());
         approvalRecord.setCommitText(commitText);
         approvalRecord.setCommitFile(commitFile);
         approvalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue());

laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java

@@ -7,9 +7,11 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.activiti.entity.ProcessAll;
+import com.jero.modules.activiti.entity.ProcessApprovalRecord;
 import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.service.ProcessDraftService;
 import com.jero.modules.activiti.service.ProcessAllService;
+import com.jero.modules.activiti.service.ProcessApprovalRecordService;
 import com.jero.modules.activiti.vo.DelegateTaskParam;
 import com.jero.modules.activiti.vo.ResolveTaskParam;
 import io.swagger.annotations.Api;
@@ -44,6 +46,8 @@ public class WorkCenterController {
     private ProcessAllService processAllService;
     @Resource
     private ProcessDraftService processDraftService;
+    @Resource
+    private ProcessApprovalRecordService processApprovalRecordService;
 
     @ApiOperation(value = "查询待办流程列表")
     @GetMapping("/getTodoList")
@@ -108,6 +112,17 @@ public class WorkCenterController {
         return Result.OK(sentList);
     }
 
+    @ApiOperation(value = "查询流程审批记录")
+    @GetMapping("/getApprovalRecordList")
+    public Result<Page<ProcessApprovalRecord>> getApprovalRecordList(ProcessApprovalRecord processApprovalRecord,
+                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                       HttpServletRequest req) {
+        Page<ProcessApprovalRecord> page = new Page<>(pageNo, pageSize);
+        Page<ProcessApprovalRecord> pageList = processApprovalRecordService.pageList(page, processApprovalRecord, req);
+        return Result.OK(pageList);
+    }
+
     @ApiOperation(value = "查询草稿")
     @GetMapping("/getDraftList")
     public Result<?> getDraftList(ProcessDraft processDraft,