审批-已处理列表

mec-education/src/main/java/com/ym/mec/education/service/impl/ApprovalServiceImpl.java

@@ -55,7 +55,16 @@ public class ApprovalServiceImpl implements ApprovalService {
 
     @Override
     public PageResponse<ApprovalResp> getProcessedList(ApprovalReq approvalReq) {
-        return null;
+        if (Objects.isNull(approvalReq.getUserId())) {
+            return PageResponse.errorParam();
+        }
+        Page<WorkItem> page = new Page();
+        page.setPageNo(approvalReq.getPageNo());
+        page.setPageSize(approvalReq.getPageSize());
+        QueryFilter queryFilter = new QueryFilter();
+        queryFilter.setOperator(approvalReq.getUserId().toString());
+        queryService.getHistoryWorkItems(page, queryFilter);
+        return PageResponse.success(workItem2Approval(page));
     }
 
     @Override
@@ -86,7 +95,9 @@ public class ApprovalServiceImpl implements ApprovalService {
             page.getResult().forEach(item -> {
                 ApprovalResp approvalResp = new ApprovalResp();
                 SysUser user = userService.getById(item.getCreator());
-                Optional.ofNullable(user.getRealName()).ifPresent(name -> approvalResp.setApplicant(name));
+                if (Objects.nonNull(user)) {
+                    Optional.ofNullable(user.getRealName()).ifPresent(name -> approvalResp.setApplicant(name));
+                }
                 String orderVariable = item.getOrderVariable();
                 if (StringUtils.isNotBlank(orderVariable)) {
                     JSONObject jsonObject = JSON.parseObject(orderVariable);
@@ -95,8 +106,8 @@ public class ApprovalServiceImpl implements ApprovalService {
                     Optional.ofNullable(jsonObject.getString("endTime")).ifPresent(time -> approvalResp.setEndTime(time));
                     Optional.ofNullable(jsonObject.getString("remark")).ifPresent(remark -> approvalResp.setRemark(remark));
                 }
-                approvalResp.setTaskId(item.getTaskId()).setApprovalType(item.getTaskName())
-                    .setApprovalDate(item.getOrderCreateTime());
+                approvalResp.setTaskId(item.getTaskId()).setApprovalType(item.getProcessName())
+                    .setApprovalDate(item.getOrderCreateTime().substring(0, 10));
                 list.add(approvalResp);
             });
         }