应付账款-业务员账户

审核不通过界面应该加个驳回原因/驳回时间

commons/src/main/java/com/jzg/commons/entity/dto/SysUserJzgInfoBankCardDto.java

@@ -5,6 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -65,6 +66,12 @@ public class SysUserJzgInfoBankCardDto implements Serializable {
     @Schema(description = "申请时间")
     private String applyTime;
 
+    @Schema(description = "最新驳回时间")
+    private LocalDateTime lastRejectTime;
+
+    @Schema(description = "最新驳回原因")
+    private String lastRejectReason;
+
     @Schema(description = "审核记录列表")
     private List<SysUserJzgInfoBankCardRecord> sysUserJzgInfoBankCardRecordList;
 }

tenant/organization/src/main/java/com/jzg/organization/controller/UserBankCardController.java

@@ -3,6 +3,7 @@ package com.jzg.organization.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.dto.SysUserJzgInfoBankCardDto;
 import com.jzg.commons.entity.vo.SysUserJzgInfoBankCardVo;
 import com.jzg.organization.service.SysUserJzgInfoBankCardService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +31,7 @@ public class UserBankCardController extends BaseController {
      * @date 2026/4/2 14:26
      */
     @PostMapping("/queryUserBankCardList")
-    public HttpResult queryUserBankCardList(@RequestBody SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo){
+    public HttpResult<Page<SysUserJzgInfoBankCardDto>> queryUserBankCardList(@RequestBody SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo){
         Page page = sysUserJzgInfoBankCardVo.getPage();
         return HttpResult.ok(sysUserJzgInfoBankCardService.getBankCardPageList(page, sysUserJzgInfoBankCardVo));
     }

tenant/organization/src/main/java/com/jzg/organization/service/SysUserJzgInfoBankCardService.java

@@ -18,7 +18,7 @@ public interface SysUserJzgInfoBankCardService extends IService<SysUserJzgInfoBa
      * @author lipf
      * @date 2026/4/2 14:26
      */
-    Page getBankCardPageList(Page page, SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo);
+    Page<SysUserJzgInfoBankCardDto> getBankCardPageList(Page page, SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo);
 
     List<SysUserJzgInfoBankCardDto> getBankCardByUserId(String userInfoId, String systemCode);
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserJzgInfoBankCardServiceImpl.java

@@ -1,5 +1,6 @@
 package com.jzg.organization.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -24,6 +25,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
 
@@ -59,10 +61,11 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
      * @date 2026/4/2 14:26
      */
     @Override
-    public Page getBankCardPageList(Page page, SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo) {
+    public Page<SysUserJzgInfoBankCardDto> getBankCardPageList(Page page, SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo) {
         log.info("查询业务员账户：sysUserJzgInfoBankCardVo=[{}]", JSONUtil.toJsonStr(sysUserJzgInfoBankCardVo));
         Page<SysUserJzgInfoBankCardDto> pageList = sysUserJzgInfoBankCardMapper.getBankCardPageList(page, sysUserJzgInfoBankCardVo);
         pageList.getRecords().forEach(sysUserJzgInfoBankCardDto -> {
+
             if (sysUserJzgInfoBankCardDto.getFileId() != null) {
                 String cardFileId = sysUserJzgInfoBankCardDto.getFileId();
                 SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectById(cardFileId);
@@ -74,6 +77,18 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
                     .selectList(new LambdaQueryWrapper<SysUserJzgInfoBankCardRecord>()
                             .eq(SysUserJzgInfoBankCardRecord::getBankCardId, sysUserJzgInfoBankCardDto.getId()));
             sysUserJzgInfoBankCardDto.setSysUserJzgInfoBankCardRecordList(sysUserJzgInfoBankCardRecordList);
+            // 填充最新的驳回日期和驳回原因
+            if(CollUtil.isNotEmpty(sysUserJzgInfoBankCardRecordList)){
+                List<SysUserJzgInfoBankCardRecord> list = sysUserJzgInfoBankCardRecordList.stream().filter(action -> "2".equals(action.getStatus()))
+                        .sorted(Comparator.comparing(SysUserJzgInfoBankCardRecord::getCreateTime)).toList();
+                if(CollUtil.isNotEmpty(list)){
+                    SysUserJzgInfoBankCardRecord sysUserJzgInfoBankCardRecord = list.get(0);
+                    if(sysUserJzgInfoBankCardRecord != null){
+                        sysUserJzgInfoBankCardDto.setLastRejectTime(sysUserJzgInfoBankCardRecord.getCreateTime());
+                        sysUserJzgInfoBankCardDto.setLastRejectReason(sysUserJzgInfoBankCardRecord.getRemark());
+                    }
+                }
+            }
         });
         return pageList;
     }