From c1594b6c8de0005a53b03f0d23179d7a5b7537fb Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 10 十一月 2026 09:10:08 +0800
Subject: [PATCH] 发票管理

---
 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceInvoice.java                           |    7 +++
 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceInvoiceServiceImpl.java          |    3 +
 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java |   26 +++++++++++++
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceInvoiceController.java           |   19 +++++----
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java   |    2 
 ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonorchargeorganService.java         |    9 ++++
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java  |    9 ++++
 7 files changed, 66 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java
index 817b176..e06e536 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java
@@ -166,7 +166,7 @@
                 serviceDonatecompletion.setId(serviceDonatecomporgans.get(0).getId());
                 i = serviceDonatecomporganService.updateById(serviceDonatecompletion);
             }
-            if (i) {
+            if (i&&!serviceDonorchargeorgan.getOrganname().equals("閬椾綋")) {
                 serviceDonorchargeorgan.setId(null);
                 QueryWrapper<ServiceDonorchargeorgan> queryWrapper = new QueryWrapper();
                 queryWrapper.eq("InfoID", serviceDonorchargeorgan.getInfoid())
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
index fd5dfd4..efb42a1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
@@ -112,6 +112,15 @@
     }
 
     /**
+     * 鍣ㄥ畼璐圭敤姹囨�伙紙搴旀敹/瀹炴敹/鏈洖娆撅級锛屾寜褰撳墠鏌ヨ鏉′欢缁熻鍏ㄩ儴缁撴灉
+     */
+    @ApiOperation("鍣ㄥ畼璐圭敤姹囨��")
+    @GetMapping("/organfeeSummary")
+    public AjaxResult organfeeSummary(ServiceDonorchargeorgan serviceDonorchargeorgan) {
+        return AjaxResult.success(serviceDonorchargeorganService.organfeeSummary(serviceDonorchargeorgan));
+    }
+
+    /**
      * 鍣ㄥ畼鐘舵�佸�艰浆鏂囨湰
      */
     private String organStateName(String organState) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceInvoiceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceInvoiceController.java
index f656021..3394cd3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceInvoiceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceInvoiceController.java
@@ -168,6 +168,7 @@
             String url = url1 + fileName;
             String base64= Base64.getEncoder().encodeToString(file.getBytes());
             List<Map<String,Object>> lists=aliOCR(base64,userId,caseId);
+            logger.info(JSON.toJSONString(lists));
             List<ServiceInvoice> invoiceList=new ArrayList<>();
             for(Map<String,Object> row : lists){
                 ServiceInvoice invoice=new ServiceInvoice();
@@ -177,14 +178,14 @@
                 if(ObjectUtils.isNotEmpty(caseId)) {
                     invoice.setCaseId(Long.parseLong(caseId));
                 }
-                invoice.setInvoiceType(row.get("鍙戠エ鍒嗙被")+"");
+                invoice.setInvoiceType(row.get("type")+"");
                 invoice.setInvoiceNo(row.get("鍙戠エ鍙风爜")+"");
                 invoice.setOccurDate(row.get("寮�绁ㄦ棩鏈�")+"");
-                invoice.setInvoiceAmount(row.get("閲戦")+"");
+                invoice.setInvoiceAmount(row.get("鍙戠エ閲戦")+"");
                 invoice.setSellerName(row.get("鍙楃エ鏂瑰悕绉�")+"");
                 invoice.setInvoiceUrl(url);
                 String invoiceName=newFilename.isEmpty() ? filename : newFilename;
-                invoice.setInvoiceName(invoiceName.split(".")[0]);
+                invoice.setInvoiceName(invoiceName.substring(0, invoiceName.lastIndexOf(".")));
                 invoice.setExtContent(JSON.toJSONString(row));
                 invoice.setCreateBy(userId);
                 invoice.setCreateTime(DateUtils.getNowDate());
@@ -221,6 +222,7 @@
             HttpResponse response = HttpUtils.doPost(host, path, method, headers, querys, bodys);
             //鑾峰彇response鐨刡ody
             String content= EntityUtils.toString(response.getEntity());
+            logger.info(content);
             JSONObject jsonContent=JSONObject.parseObject(content);
             JSONArray subMsgs=jsonContent.getJSONArray("subMsgs");
 
@@ -234,19 +236,20 @@
                 for(Map.Entry<String, Object> entry : result.entrySet()){
                     tempList.put(entry.getKey(),entry.getValue());
                 }
-                if(rowObject.getString("鍙戠エ鍒嗙被").equals("閾惰鎵垮厬姹囩エ")){
+                if(rowObject.getString("type").equals("閾惰鎵垮厬姹囩エ")){
                     BigDecimal totalAmount= ChineseUtils.chineseToNumber(result.getString("绁ㄦ嵁閲戦澶у啓"));
-                    tempList.put("閲戦",totalAmount);
+                    tempList.put("鍙戠エ閲戦",totalAmount);
                 }
-                if(rowObject.getString("鍙戠エ鍒嗙被").equals("鐏溅绁�")){
-                    tempList.put("閲戦",result.getString("绁ㄤ环"));
+                if(rowObject.getString("type").equals("鐏溅绁�")){
+                    tempList.put("鍙戠エ閲戦",result.getString("绁ㄤ环"));
                 }
-
+                tempList.put("type",rowObject.getString("type"));
                 lists.add(tempList);
             }
 
             return lists;
         } catch (Exception e) {
+            logger.error(e.getMessage());
             return lists;
         }
     }
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceInvoice.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceInvoice.java
index aafc12c..38fa2ed 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceInvoice.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceInvoice.java
@@ -119,6 +119,13 @@
     private String reimburseState;
 
     /**
+     * 鎶ラ攢ID
+     */
+    @ApiModelProperty("鎶ラ攢ID")
+    @Excel(name = "鎶ラ攢ID")
+    private String reimburseId;
+
+    /**
      * 鎵╁睍鍐呭锛坖son瀛橈級
      */
     @ApiModelProperty("鎵╁睍鍐呭锛坖son瀛橈級")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonorchargeorganService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonorchargeorganService.java
index 198da0e..61973b1 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonorchargeorganService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonorchargeorganService.java
@@ -8,6 +8,7 @@
 import com.ruoyi.project.domain.SpStatChangeReq;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 鎹愮尞鍣ㄥ畼Service鎺ュ彛
@@ -48,4 +49,12 @@
      * @return 鏄庣粏闆嗗悎
      */
     public List<SpStatChangeDetail> getSpStatChangeDetail(SpStatChangeDetailReq req);
+
+    /**
+     * 鍣ㄥ畼璐圭敤姹囨�伙紙搴旀敹/瀹炴敹/鏈洖娆撅級锛屾寜鏌ヨ鏉′欢缁熻鍏ㄩ儴缁撴灉
+     *
+     * @param serviceDonorchargeorgan 鏌ヨ鏉′欢
+     * @return 姹囨�荤粨鏋�
+     */
+    public Map<String, Object> organfeeSummary(ServiceDonorchargeorgan serviceDonorchargeorgan);
 }
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java
index c610b67..d88abef 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java
@@ -14,7 +14,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 鎹愮尞鍣ㄥ畼Service涓氬姟灞傚鐞�
@@ -120,6 +123,29 @@
     }
 
     @Override
+    public Map<String, Object> organfeeSummary(ServiceDonorchargeorgan serviceDonorchargeorgan) {
+        List<ServiceDonorchargeorgan> list = Boolean.TRUE.equals(serviceDonorchargeorgan.getPaymentidIsNotNull())
+                ? queryList(serviceDonorchargeorgan)
+                : queryListBypaymentidIsNull(serviceDonorchargeorgan);
+        BigDecimal organchargeTotal = BigDecimal.ZERO;
+        BigDecimal amountTotal = BigDecimal.ZERO;
+        for (ServiceDonorchargeorgan item : list) {
+            if (item.getOrgancharge() != null) {
+                organchargeTotal = organchargeTotal.add(item.getOrgancharge());
+            }
+            if (item.getAmount() != null) {
+                amountTotal = amountTotal.add(item.getAmount());
+            }
+        }
+        Map<String, Object> summary = new HashMap<>(4);
+        summary.put("organchargeTotal", organchargeTotal);
+        summary.put("amountTotal", amountTotal);
+        summary.put("unreceivedTotal", organchargeTotal.subtract(amountTotal));
+        summary.put("rowCount", list.size());
+        return summary;
+    }
+
+    @Override
     public List<SpStatChange> getListBySpStatChange(SpStatChangeReq spStatChangeReq) {
         return serviceDonorchargeorganMapper.getListBySpStatChange(
                 spStatChangeReq.getPabegtime(),
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceInvoiceServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceInvoiceServiceImpl.java
index 334b47c..96b68f5 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceInvoiceServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceInvoiceServiceImpl.java
@@ -68,6 +68,9 @@
         if (StringUtils.isNotBlank(serviceInvoice.getReimburseState())) {
             wrappers.eq(ServiceInvoice::getReimburseState, serviceInvoice.getReimburseState());
         }
+        if (StringUtils.isNotBlank(serviceInvoice.getReimburseId())) {
+            wrappers.eq(ServiceInvoice::getReimburseId, serviceInvoice.getReimburseId());
+        }
         wrappers.orderByDesc(ServiceInvoice::getCreateTime).orderByDesc(ServiceInvoice::getId);
         return this.list(wrappers);
     }

--
Gitblit v1.9.3