修改bug：

应付账款-提现申请，拒绝付款界面增加驳回理由、驳回时间、驳回人
增加提现金额总计，根据筛选进行统计（待领取、待付款、已付款、拒绝付款都需要加）

commons/src/main/java/com/jzg/commons/entity/po/SysAmountAuditing.java

@@ -65,6 +65,13 @@ public class SysAmountAuditing extends BaseModel {
     @Schema(description = "驳回原因")
     private String rejectReason;
 
+    @Schema(description = "驳回时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime rejectTime;
+
+    @Schema(description = "驳回人")
+    private String rejectPerson;
+
     @Schema(description = "账户名称")
     private String accountName;
 

commons/src/main/java/com/jzg/commons/entity/vo/AmountAuditVo.java

@@ -1,5 +1,6 @@
 package com.jzg.commons.entity.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -77,6 +78,17 @@ public class AmountAuditVo  extends BaseModel {
     @Schema(description = "内部银行卡开户行号")
     private String bankNum;
 
+    @ExcelProperty("驳回原因")
+    @Schema(description = "驳回原因")
+    private String rejectReason;
 
+    @ExcelProperty("驳回时间")
+    @Schema(description = "驳回时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime rejectTime;
+
+    @ExcelProperty("驳回人")
+    @Schema(description = "驳回人")
+    private String rejectPerson;
 
 }

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

@@ -14,6 +14,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
+
 @Tag(name="提现申请管理接口")
 @RestController
 @RequestMapping("/amountAuditing")
@@ -33,6 +35,17 @@ public class AmountAuditingController extends BaseController {
         return HttpResult.ok(result);
     }
 
+    /**
+     * 提现申请列表分页
+     * @return
+     */
+    @PostMapping("/queryTotalWithdrawalAmount")
+    @Operation(summary = "提现金额总计")
+    public HttpResult<BigDecimal> queryTotalWithdrawalAmount(@RequestBody AmountAuditParam param){
+        BigDecimal bigDecimal = sysAmountAuditingService.queryTotalWithdrawalAmount(param);
+        return HttpResult.ok(bigDecimal);
+    }
+
     @PostMapping("/exportAuditList")
     @Operation(summary = "导出申请列表")
     public HttpResult<String> exportAuditList(@RequestBody AmountAuditParam param) {

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

@@ -9,6 +9,8 @@ import com.jzg.commons.entity.dto.ApplyWithdrawParam;
 import com.jzg.commons.entity.po.SysAmountAuditing;
 import com.jzg.commons.entity.vo.AmountAuditVo;
 
+import java.math.BigDecimal;
+
 /**
 * @author dongxin
 * @description 针对表【sys_amount_auditing(提现申请表)】的数据库操作Service
@@ -23,6 +25,13 @@ public interface SysAmountAuditingService extends IService<SysAmountAuditing> {
      */
     Page<AmountAuditVo> queryPage(AmountAuditParam param);
 
+    /**
+     * 查询提现金额总计
+     * @param param
+     * @return
+     */
+    BigDecimal queryTotalWithdrawalAmount(AmountAuditParam param);
+
     /**
      * 领取提现申请
      *

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

@@ -1,5 +1,6 @@
 package com.jzg.organization.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -72,6 +73,21 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
         return page;
     }
 
+    @Override
+    public BigDecimal queryTotalWithdrawalAmount(AmountAuditParam param) {
+        BigDecimal bigDecimal = new BigDecimal(0);
+        Page<AmountAuditVo> page = baseMapper.queryPage(param.getPage(), param);
+        // 计算提现金额总计
+        if (CollUtil.isNotEmpty(page.getRecords())){
+            for (AmountAuditVo record : page.getRecords()) {
+                if (null != record && null != record.getAmount()){
+                    bigDecimal = bigDecimal.add(record.getAmount());
+                }
+            }
+        }
+        return bigDecimal;
+    }
+
     @Override
     public void auditReceive(String id) {
         SysAmountAuditing audit = this.getById(id);
@@ -205,6 +221,8 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
         StateResult stateFailResult = auditStateListener.statusChange(AuditState.AuditStateEnum.FAIL_AUDIT,audit.getAuditingStatus()+"");
         audit.setAuditingStatus(stateFailResult.getCurrentState());
         audit.setRejectReason(param.getRejectReason());
+        audit.setRejectPerson(userName);
+        audit.setRejectTime(LocalDateTime.now());
         this.updateById(audit);
     }
 

tenant/organization/src/main/resources/mapper/SysAmountAuditingMapper.xml

@@ -47,7 +47,7 @@
         sujim.name as managerName,sum.mobile as managerMobile,saa.create_time as createTime,
         saa.amount, saa.balance_amount as balanceAmount,saa.account_name AS accountName,
         saa.bank_card_num as bankCardNum, saa.bank_name as bankName, saa.bank_num as bankNum, suji.id as userJzgInfoId,
-        saa.payment_time as paymentTime
+        saa.payment_time as paymentTime, saa.reject_reason as rejectReason, saa.reject_time as rejectTime, saa.reject_person as rejectPerson
         FROM sys_amount_auditing saa
         LEFT JOIN sys_user_jzg_info suji on saa.user_id = suji.user_id
         LEFT JOIN sys_user su on su.id = saa.user_id