From 5c911f322411eb56131ebe72d793f05b90d1b48f Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Thu, 21 Aug 2025 14:33:31 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=E5=AE=9A=E6=97=B6=E8=AE=A1?=
=?UTF-8?q?=E7=AE=97=E9=94=80=E5=94=AE=E9=A2=9D=E5=BA=A6/=E5=AE=9E?=
=?UTF-8?q?=E6=97=B6=E8=AE=A1=E7=AE=97=E6=94=AF=E6=8C=81=E8=AE=A1=E7=AE=97?=
=?UTF-8?q?=E9=94=80=E5=94=AE=E7=90=86=E8=B5=94=E9=87=91=E9=A2=9D-?=
=?UTF-8?q?=E4=BC=98=E5=8C=96=E6=80=A7=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
committer: heyu
---
.../erp/emis/mapper/EmisSettleBillMapper.java | 43 ++++++++++++-------
.../erp/emis/service/EmisBaseService.java | 13 +++---
.../resources/mapper/EmisSettleBillMapper.xml | 8 ++++
3 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleBillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleBillMapper.java
index ac1944105..de451f371 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleBillMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleBillMapper.java
@@ -1,10 +1,10 @@
-/**
+/**
* @Project: emis
* @Title: EmisSettleBillMapper.java
* @author linfso
* @date 2024-07-03 18:54:51
* @Copyright: ShangHai Doitinfo 2022 All rights reserved.
- * @version v1.0
+ * @version v1.0
* @Description: 结算总账单 Mapper 接口
* Warning : This file is generate by ai tools,don't edit!!!
*/
@@ -21,6 +21,7 @@ import com.xdadan.erp.emis.domain.stat.BillPayStatInfo;
import com.xdadan.erp.emis.domain.stat.OpenBillStatInfo;
import com.xdadan.erp.emis.service.impl.EmisSettleBillServiceImpl;
import com.xdadan.erp.emis.service.impl.EmisSettleSubBillServiceImpl;
+import org.apache.ibatis.annotations.Param;
/**
* @ClassName EmisSettleBillMapper
@@ -33,7 +34,7 @@ public interface EmisSettleBillMapper extends BaseMapper
/**
* 主键查询
* @param id
- * @return
+ * @return
*/
public EmisSettleBill selectEmisSettleBillById(Long id);
@@ -41,6 +42,16 @@ public interface EmisSettleBillMapper extends BaseMapper
public EmisSettleBill selectSettleBillBySettleBillNo(String settleBillNo);
+ /**
+ * 批量查询结算账单的理赔金额
+ *
+ * @param settleBillNoList 结算账单号列表
+ * @return 结算账单列表
+ */
+ public List selectSettleBillBySettleBillNoList(
+ @Param("settleBillNoList") List settleBillNoList);
+
+
/**
* 获取统计数据
* @param emisSettleBill
@@ -68,8 +79,8 @@ public interface EmisSettleBillMapper extends BaseMapper
/**
* 查询列表
- *
- * @param emisSettleBill
+ *
+ * @param emisSettleBill
* @return 集合
*/
public List selectEmisSettleBillList(EmisSettleBill emisSettleBill);
@@ -77,33 +88,33 @@ public interface EmisSettleBillMapper extends BaseMapper
/**
* 检查是否重复
- *
- * @param emisSettleBill
+ *
+ * @param emisSettleBill
* @return 数量
*/
public int checkUnique(EmisSettleBill emisSettleBill);
-
+
/**
- * 新增
- *
+ * 新增
+ *
* @param emisSettleBill
- * @return
+ * @return
*/
public int insertEmisSettleBill(EmisSettleBill emisSettleBill);
/**
* 修改
- *
- * @param emisSettleBill
- * @return
+ *
+ * @param emisSettleBill
+ * @return
*/
@DataAuditLog(operateType= OperateType.UPDATE,serviceClass= EmisSettleBillServiceImpl.class)
public int updateEmisSettleBill(EmisSettleBill emisSettleBill);
/**
* 删除
- *
+ *
* @param id 主键
* @return 结果
*/
@@ -112,7 +123,7 @@ public interface EmisSettleBillMapper extends BaseMapper
/**
* 批量删除
- *
+ *
* @param ids 需要删除的数据主键集合
* @return 结果
*/
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 3bab4d5ee..0570127a7 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -1743,7 +1743,8 @@ public class EmisBaseService {
log.info("开始计算理赔金额，运单号列表: {}", billCodeList);
// 根据billCode查询emis_settle_sub_bill获取settle_bill_no
- List emisSettleSubBillList = emisSettleSubBillMapper.querysSettleSubBillByBillCodeList(billCodeList);
+ List emisSettleSubBillList = emisSettleSubBillMapper
+ .querysSettleSubBillByBillCodeList(billCodeList);
if (CollectionUtil.isEmpty(emisSettleSubBillList)) {
log.info("未找到对应的结算子账单记录");
return BigDecimal.ZERO;
@@ -1762,13 +1763,15 @@ public class EmisBaseService {
log.info("找到的结算账单号: {}", settleBillNoSet);
- // 根据settle_bill_no查询emis_settle_bill获取satisfy_money
+ // 根据settle_bill_no批量查询emis_settle_bill获取satisfy_money
+ List settleBillNoList = new ArrayList<>(settleBillNoSet);
+ List settleBillList = emisSettleBillMapper.selectSettleBillBySettleBillNoList(settleBillNoList);
+
BigDecimal totalSatisfyMoney = BigDecimal.ZERO;
- for (String settleBillNo : settleBillNoSet) {
- EmisSettleBill settleBill = emisSettleBillMapper.selectSettleBillBySettleBillNo(settleBillNo);
+ for (EmisSettleBill settleBill : settleBillList) {
if (settleBill != null && settleBill.getSatisfyMoney() != null) {
totalSatisfyMoney = totalSatisfyMoney.add(settleBill.getSatisfyMoney());
- log.debug("结算账单[{}]的理赔金额: {}", settleBillNo, settleBill.getSatisfyMoney());
+ log.debug("结算账单[{}]的理赔金额: {}", settleBill.getSettleBillNo(), settleBill.getSatisfyMoney());
}
}
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
index f5597f43d..56b66fa5a 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
@@ -1020,6 +1020,14 @@
where a.settle_bill_no = #{settleBillNo} and del_flag='0'
+
insert into emis_settle_bill