app提现详情时间

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

@@ -3,13 +3,16 @@ package com.ydtech.modules.admin.model.vo;
 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 io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @Data
 @ApiModel(value = "APP提现详情")
@@ -37,11 +40,6 @@ public class SysAgencyFeeApprovalRecordVo {
     @ApiModelProperty(value = "提现编号")
     private String number;
 
-    /**
-     * 已提现抽成费用
-     */
-    @ApiModelProperty(value = "已提现抽成费用")
-    private BigDecimal historyFee;
     /**
      * 提现金额
      */
@@ -52,11 +50,13 @@ public class SysAgencyFeeApprovalRecordVo {
      * 审核状态0未审核 1审核通过 2审核驳回
      */
     @ApiModelProperty(value = "审核状态0未审核 1审核通过 2审核驳回")
-    private List<String> status;
+    private List<Map<String,String>> status = new ArrayList<>();
+
     /**
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
 
     /**

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

@@ -35,8 +35,11 @@ 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;
 
 /**
  * 机构保费抽成审批表(SysAgencyFeeApproval)表服务实现类
@@ -196,14 +199,32 @@ public class SysAgencyFeeApprovalServiceImpl extends ServiceImpl<SysAgencyFeeApp
     @Override
     public SysAgencyFeeApprovalRecordVo operateInfo(Integer id) {
         SysAgencyFeeApproval sysAgencyFeeApproval = sysAgencyFeeApprovalMapper.selectOne(new LambdaQueryWrapper<SysAgencyFeeApproval>().eq(SysAgencyFeeApproval::getId, id));
-        SysAgencyFeeApprovalRecordVo sysAgencyFeeApprovalRecordVo = BeanUtil.copyProperties(sysAgencyFeeApproval, SysAgencyFeeApprovalRecordVo.class);
+        SysAgencyFeeApprovalRecordVo sysAgencyFeeApprovalRecordVo = new SysAgencyFeeApprovalRecordVo();
+        sysAgencyFeeApprovalRecordVo.setId(sysAgencyFeeApproval.getId());
+        sysAgencyFeeApprovalRecordVo.setCashFee(sysAgencyFeeApproval.getCashFee());
+        sysAgencyFeeApprovalRecordVo.setCreateTime(sysAgencyFeeApproval.getCreateTime());
+        sysAgencyFeeApprovalRecordVo.setNumber(sysAgencyFeeApproval.getNumber());
+        sysAgencyFeeApprovalRecordVo.setRemark(sysAgencyFeeApproval.getRemark());
+        sysAgencyFeeApprovalRecordVo.setBankAccount(sysAgencyFeeApproval.getBankAccount());
+        sysAgencyFeeApprovalRecordVo.setBankNumber(sysAgencyFeeApproval.getBankNumber());
 
         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();
         if (sysAgencyFeeApprovalRecords.size()>0) {
             for (SysAgencyFeeApprovalRecord sysAgencyFeeApprovalRecord : sysAgencyFeeApprovalRecords) {
-                List<String> status = sysAgencyFeeApprovalRecordVo.getStatus();
-                status.add(sysAgencyFeeApprovalRecord.getStatus());
+                Map<String, String> hashMap = new LinkedHashMap<>();
+                String format;
+                Date auditTime = sysAgencyFeeApprovalRecord.getAuditTime();
+                if (auditTime != null) {
+                    format = sdf.format(auditTime);
+                }else {
+                    Date createTime = sysAgencyFeeApprovalRecord.getCreateTime();
+                    format = sdf.format(createTime);
+                }
+                hashMap.put(sysAgencyFeeApprovalRecord.getStatus(),format);
+                list.add(hashMap);
             }
         }
         return sysAgencyFeeApprovalRecordVo;