提交ing

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAuditProcessController.java

@@ -7,6 +7,7 @@ import com.daqing.financial.guarantee.model.response.ApprovalNum;
 import com.daqing.financial.guarantee.model.response.TodayApprovalRecordResponse;
 import com.daqing.financial.guarantee.service.IDgAuditProcessService;
 import com.daqing.financial.guarantee.util.R;
+import com.daqing.financial.guarantee.util.TaskNodeUtil;
 import com.daqing.framework.domain.guarantee.DgAuditProcess;
 import com.daqing.framework.domain.guarantee.po.ProcessPO;
 import com.daqing.framework.model.response.ResponseResult;
@@ -82,7 +83,7 @@ public class DgAuditProcessController {
         return ResponseResult.SUCCESS(processPO);
     }
 
-    @ApiOperation(value = "今日审批记录")
+    @ApiOperation(value = "今日审批记录",response = TodayApprovalRecordResponse.class)
     @GetMapping("todayApprovalRecord")
     public R nowadaysAuditProcess(){
         List<TodayApprovalRecordResponse> approvalRecords = auditProcessService.todayApprovalRecord();
@@ -90,6 +91,11 @@ public class DgAuditProcessController {
         //统计状态个数
         approvalRecords.forEach(todayApprovalRecordResponse -> {
             if (todayApprovalRecordResponse.getStatus()!=null){
+                String taskNode = todayApprovalRecordResponse.getTaskNode();
+                if (taskNode!=null){
+                    String converter = TaskNodeUtil.converter(taskNode);
+                    todayApprovalRecordResponse.setTaskNode(converter);
+                }
                 switch (todayApprovalRecordResponse.getStatus()){
                     case "0":
                         approvalNum.setInitiateNum(approvalNum.getInitiateNum()+1);

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/TodayApprovalRecordResponse.java

@@ -1,5 +1,6 @@
 package com.daqing.financial.guarantee.model.response;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -30,6 +31,7 @@ public class TodayApprovalRecordResponse {
     private String taskNode;
 
     @ApiModelProperty("处理时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date processingTime;
 
     @ApiModelProperty("状态")