From e0bbd21f56757c35dc067eaa8bc67057b65fead4 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 21 十月 2026 15:02:28 +0800
Subject: [PATCH] 新增发票管理

---
 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java |   40 +++++++++++++++++++---------------------
 1 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
index d4ca8c4..17d1ed3 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -559,27 +559,25 @@
                     FlowLevel = 0;
                 }
             }
-
-            SysUser sysUser = sysUserService.selectUserByUserName(serviceFund.getUserno());
-            //瀹℃壒鏈�氳繃锛氬崟鎹俊鎭� + 瀹℃壒浜�/瀹℃壒鏃堕棿/鎰忚锛堟剰瑙� = "瀹℃壒鏈�氳繃銆�" + 椹冲洖鎰忚锛�
-            List<ConcurrentHashMap<String, Object>> contentList = FundNotifyMessageBuilder.newRows();
-            FundNotifyMessageBuilder.addBillInfo(contentList, serviceFund.getApplytype(),
-                    serviceFund.getUsername(), serviceFund.getPretaxcost(), serviceFund.getDonorname(),
-                    FundNotifyMessageBuilder.billNo(serviceFund.getBh(), serviceFund.getId()));
-            FundNotifyMessageBuilder.addAuditResult(contentList, loginUser.getUser().getNickName(), new Date(),
-                    FundNotifyMessageBuilder.opinion(FundNotifyMessageBuilder.CONCLUSION_REJECT,
-                            checkFundVO.getFlowcontent()));
-            try {
-                DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
-                dingTalkReqVo.setTitle(FundNotifyMessageBuilder.TITLE);
-                dingTalkReqVo.setNumber(sysUser.getPhonenumber());
-                dingTalkReqVo.setContents(contentList);
-                dingTalkService.sendNotification(dingTalkReqVo);
-            } catch (Exception e) {
-                log.error("璐圭敤---瀹℃壒鏈�氳繃閽夐拤閫氱煡澶辫触锛宖undId={}", serviceFund.getId(), e);
-            }
         }
-
+        SysUser sysUser = sysUserService.selectUserByUserName(serviceFund.getUserno());
+        //瀹℃壒鏈�氳繃锛氬崟鎹俊鎭� + 瀹℃壒浜�/瀹℃壒鏃堕棿/鎰忚锛堟剰瑙� = "瀹℃壒鏈�氳繃銆�" + 椹冲洖鎰忚锛�
+        List<ConcurrentHashMap<String, Object>> contentList = FundNotifyMessageBuilder.newRows();
+        FundNotifyMessageBuilder.addBillInfo(contentList, serviceFund.getApplytype(),
+                serviceFund.getUsername(), serviceFund.getPretaxcost(), serviceFund.getDonorname(),
+                FundNotifyMessageBuilder.billNo(serviceFund.getBh(), serviceFund.getId()));
+        FundNotifyMessageBuilder.addAuditResult(contentList, loginUser.getUser().getNickName(), new Date(),
+                FundNotifyMessageBuilder.opinion(checkFundVO.getFlowconclusion()+"",
+                        checkFundVO.getFlowcontent()));
+        try {
+            DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
+            dingTalkReqVo.setTitle(FundNotifyMessageBuilder.TITLE);
+            dingTalkReqVo.setNumber(sysUser.getPhonenumber());
+            dingTalkReqVo.setContents(contentList);
+            dingTalkService.sendNotification(dingTalkReqVo);
+        } catch (Exception e) {
+            log.error("璐圭敤---瀹℃壒鏈�氳繃閽夐拤閫氱煡澶辫触锛宖undId={}", serviceFund.getId(), e);
+        }
         serviceFund.setRecordstatus(RecordStatus);
         serviceFund.setFlowlevel(FlowLevel.longValue());
         //  serviceFund.setBackflowlevel(serviceFund.getFlowlevel());
@@ -1854,7 +1852,7 @@
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("userName", "opo");
         map.put("password", "4126407a-9821-4874-be41-6568abd6dbe5");
-        map.put("loginName", "OPO绯荤粺瀹℃壒");
+        map.put("loginName", "OPO绯荤粺");
 
         JSONObject jsonObj = new JSONObject(map);
 

--
Gitblit v1.9.3