From 19f295c9dbc344fe48edce52850a3fc7e2c40b5a Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 17 Sep 2025 10:13:27 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=E8=B4=A2?=
 =?UTF-8?q?=E5=8A=A1=E9=94=80=E8=B4=A6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../web/emis/EmisWriteoffApplyController.java | 30 +++++++++++++++++++
 .../erp/emis/domain/EmisWriteoffApply.java    | 10 +++++++
 2 files changed, 40 insertions(+)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWriteoffApplyController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWriteoffApplyController.java
index 4c8d0a0dd..5f4fd8cc1 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWriteoffApplyController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWriteoffApplyController.java
@@ -26,6 +26,8 @@ import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.Arrays;
 import java.util.List;
+import java.math.BigDecimal;
+import java.util.stream.Collectors;
 
 /**
  * 销账申请Controller
@@ -68,6 +70,34 @@ public class EmisWriteoffApplyController extends EmisBaseController {
 
         startPage();
         List<EmisWriteoffApply> list = emisWriteoffApplyService.selectEmisWriteoffApplyList(emisWriteoffApply);
+        
+        // 计算并设置申请账单相关字段
+        for (EmisWriteoffApply apply : list) {
+            if (apply.getDetailList() != null && !apply.getDetailList().isEmpty()) {
+                // 提取账单名称列表（去重）
+                List<String> billNames = apply.getDetailList().stream()
+                    .map(detail -> detail.getEmisSettleBill() != null ? detail.getEmisSettleBill().getSettleBillName() : null)
+                    .filter(name -> name != null && !name.trim().isEmpty())
+                    .distinct()
+                    .collect(Collectors.toList());
+                apply.setApplySettleBillName(String.join(",", billNames));
+                
+                // 提取账单号列表（去重）
+                List<String> billNos = apply.getDetailList().stream()
+                    .map(detail -> detail.getSettleBillNo())
+                    .filter(no -> no != null && !no.trim().isEmpty())
+                    .distinct()
+                    .collect(Collectors.toList());
+                apply.setApplySettleBillNo(String.join(",", billNos));
+                
+                // 计算账单金额总和
+                BigDecimal totalAmount = apply.getDetailList().stream()
+                    .map(detail -> detail.getEmisSettleBill() != null ? detail.getEmisSettleBill().getRecMoney() : BigDecimal.ZERO)
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+                apply.setApplyRecMoney(totalAmount);
+            }
+        }
+        
         return getDataTable(list);
     }
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWriteoffApply.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWriteoffApply.java
index 2e824fc65..0d53e5acf 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWriteoffApply.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWriteoffApply.java
@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xdadan.erp.common.annotation.Excel;
+import com.xdadan.erp.common.annotation.audit.DataAuditField;
 import com.xdadan.erp.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -42,6 +43,15 @@ public class EmisWriteoffApply extends BaseEntity {
     @Excel(name = "申请编号")
     private String applyNo;
 
+    /* 申请账单名称 */
+    private String applySettleBillName;
+
+    /* 申请账单号 */
+    private String applySettleBillNo;
+
+    /* 申请账单金额 */
+    private BigDecimal applyRecMoney;
+
     /* 申请人编码 */
     @Excel(name = "申请人编码")
     private String applyManCode;