APP提现详情

src/main/java/com/ydtech/modules/admin/model/StatusInfo.java

@@ -0,0 +1,10 @@
+package com.ydtech.modules.admin.model;
+
+import lombok.Data;
+
+@Data
+public class StatusInfo {
+
+    private String processingStatusName;
+    private String processingDate;
+}

src/main/java/com/ydtech/modules/admin/model/vo/SysAgencyFeeApprovalRecordVo.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ydtech.modules.admin.model.StatusInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -50,7 +51,7 @@ public class SysAgencyFeeApprovalRecordVo {
      * 审核状态0未审核 1审核通过 2审核驳回
      */
     @ApiModelProperty(value = "审核状态0未审核 1审核通过 2审核驳回")
-    private List<Map<String,String>> status = new ArrayList<>();
+    private List<StatusInfo> statusList;
 
     /**
      * 创建时间
@@ -59,6 +60,10 @@ public class SysAgencyFeeApprovalRecordVo {
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
 
+    @ApiModelProperty(value = "审批通过时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date auditTime;
+
     /**
      * 审批意见
      */

src/main/java/com/ydtech/modules/admin/service/impl/SysAgencyFeeApprovalServiceImpl.java

@@ -11,10 +11,7 @@ import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.dao.SysAgencyFeeApprovalMapper;
 import com.ydtech.modules.admin.dao.SysAgencyFeeApprovalRecordMapper;
 import com.ydtech.modules.admin.dao.SysDeptMapper;
-import com.ydtech.modules.admin.model.SysAgencyFeeApproval;
-import com.ydtech.modules.admin.model.SysAgencyFeeApprovalRecord;
-import com.ydtech.modules.admin.model.SysDept;
-import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.admin.model.*;
 import com.ydtech.modules.admin.model.dto.SysAgencyFeeApprovalAddDto;
 import com.ydtech.modules.admin.model.dto.SysAgencyFeeApprovalDto;
 import com.ydtech.modules.admin.model.dto.SysAgencyFeeApprovalEditDto;
@@ -36,10 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 机构保费抽成审批表(SysAgencyFeeApproval)表服务实现类
@@ -196,10 +190,10 @@ public class SysAgencyFeeApprovalServiceImpl extends ServiceImpl<SysAgencyFeeApp
         List<SysAgencyFeeApprovalRecord> sysAgencyFeeApprovalRecords = sysAgencyFeeApprovalRecordMapper.selectList(new LambdaQueryWrapper<SysAgencyFeeApprovalRecord>()
                 .eq(SysAgencyFeeApprovalRecord::getApprovalId, id).orderByAsc(SysAgencyFeeApprovalRecord::getId));
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        List<Map<String, String>> list = sysAgencyFeeApprovalRecordVo.getStatus();
+        List<StatusInfo> list = new ArrayList<>();
         if (sysAgencyFeeApprovalRecords.size()>0) {
             for (SysAgencyFeeApprovalRecord sysAgencyFeeApprovalRecord : sysAgencyFeeApprovalRecords) {
-                Map<String, String> hashMap = new LinkedHashMap<>();
+                StatusInfo statusInfo = new StatusInfo();
                 String format;
                 Date auditTime = sysAgencyFeeApprovalRecord.getAuditTime();
                 if (auditTime != null) {
@@ -208,10 +202,16 @@ public class SysAgencyFeeApprovalServiceImpl extends ServiceImpl<SysAgencyFeeApp
                     Date createTime = sysAgencyFeeApprovalRecord.getCreateTime();
                     format = sdf.format(createTime);
                 }
-                hashMap.put(sysAgencyFeeApprovalRecord.getStatus(),format);
-                list.add(hashMap);
+                statusInfo.setProcessingStatusName(sysAgencyFeeApprovalRecord.getStatus());
+                statusInfo.setProcessingDate(format);
+                list.add(statusInfo);
+                if (sysAgencyFeeApprovalRecord.getStatus().equals("1")) {
+                    sysAgencyFeeApprovalRecordVo.setAuditTime(sysAgencyFeeApprovalRecord.getAuditTime());
+                }
+
             }
         }
+        sysAgencyFeeApprovalRecordVo.setStatusList(list);
         return sysAgencyFeeApprovalRecordVo;
     }