From 8b1421310a47b618bbbbc2bee43a2e778ef3ff45 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Tue, 23 Sep 2025 15:53:34 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=A6=96=E8=B4=AD=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=AE=B0=E5=BD=95=E5=8F=AF=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=9B?=
 =?UTF-8?q?2=E3=80=81=E5=AE=A1=E6=A0=B8=E5=BC=80=E7=A5=A8=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E8=B4=AD=E4=B9=B0=E8=AE=B0=E5=BD=95=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../funds/invoice/InvoiceServiceImpl.java     |  6 ++++-
 .../mapper/funds/purchase/PurchaseMapper.xml  | 27 ++++++++++++++++---
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/invoice/InvoiceServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/invoice/InvoiceServiceImpl.java
index 4e8ad0ea9..1fddfd5a4 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/invoice/InvoiceServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/invoice/InvoiceServiceImpl.java
@@ -265,7 +265,7 @@ public class InvoiceServiceImpl implements InvoiceService {
 
         // 查询关联的购买记录
         List<PurchaseRecordDO> purchaseRecordDOS = purchaseRecordMapper.selectList(new LambdaQueryWrapper<PurchaseRecordDO>()
-                .eq(PurchaseRecordDO::getOrganId, getUserOrganId())
+                .eq(PurchaseRecordDO::getOrganId, invoiceRecordsDO.getOrganId())
                 .in(PurchaseRecordDO::getId, purchaseIdList));
 
         List<InvoicePurchaseRecord> invoicePurchaseRecords = new ArrayList<>();
@@ -335,6 +335,10 @@ public class InvoiceServiceImpl implements InvoiceService {
             purchaseRecordDOS.forEach(f -> f.setIsInvocing(InvoiceStatusEnum.INVOICABLE.getCode()));
 
         }
+        // 更新开票人信息
+        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+        invoiceRecordsDO.setInvoicePerson(loginUser.getNickname());
+        invoiceRecordsDO.setInvoicePersonId(loginUser.getId());
 
         invoiceRecordsMapper.updateById(invoiceRecordsDO);
 
diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/purchase/PurchaseMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/purchase/PurchaseMapper.xml
index 47467c688..462441f5c 100644
--- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/purchase/PurchaseMapper.xml
+++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/purchase/PurchaseMapper.xml
@@ -14,9 +14,30 @@
 
     <!--    查询机构下开票金额统计：可开票、开票中、已开票-->
     <select id="getOrgInvoiceAmountStatistics" resultType="com.cf.imes.module.system.controller.admin.funds.invoice.vo.InvoiceAmountRespVO">
-        select sum(case when is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@INVOICABLE.code}' then account_balance_spent else 0 end) as invocable,
-               sum(case when is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@PENDINGINVOICING.code}' then account_balance_spent else 0 end) as inTheInvoice,
-               sum(case when is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@INVOICINGSUCCESSFUL.code}' then account_balance_spent else 0 end) as invoiced
+        SELECT
+            SUM(
+                    CASE
+                        WHEN is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@INVOICABLE.code}'
+                            THEN CASE WHEN initial = TRUE THEN total_amount ELSE account_balance_spent END
+                        ELSE 0
+                        END
+            ) AS invocable,
+
+            SUM(
+                    CASE
+                        WHEN is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@PENDINGINVOICING.code}'
+                            THEN CASE WHEN initial = TRUE THEN total_amount ELSE account_balance_spent END
+                        ELSE 0
+                        END
+            ) AS inTheInvoice,
+
+            SUM(
+                    CASE
+                        WHEN is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@INVOICINGSUCCESSFUL.code}'
+                            THEN CASE WHEN initial = TRUE THEN total_amount ELSE account_balance_spent END
+                        ELSE 0
+                        END
+            ) AS invoiced
         from purchase_record
         where organ_id = #{organId} and deleted = false;
     </select>