From 323e4e535e3539d9aa49aecaa25c46ed00c2c9dd Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 07 四月 2023 20:29:20 +0800
Subject: [PATCH] yxh
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
index 5f4147b..b2726d0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -239,6 +239,7 @@
remShare.setBranchbankname(serviceReimbursement.getBranchbankname());
remShare.setAnnexbankcard(serviceReimbursement.getAnnexbankcard());
remShare.setAnnexfiles(serviceReimbursement.getAnnexfiles());
+ //remShare.setAnnexfiles(serviceReimbursement.getAnnexfiles());
// remShare.setAmountrequested(BigDecimal.valueOf(serviceReimbursement.getAmountrequested()));
Double nTemp = serviceReimbursement.getAmountrequested();
@@ -278,7 +279,16 @@
remShare.setFlowlevel(serviceReimbursement.getFlowlevel());
remShare.setCosttype(serviceReimbursement.getCosttype());
remShare.setCosttypename(serviceReimbursement.getCosttypename());
- remShare.setFileurl(serviceReimbursement.getFileurl());
+ remShare.setFileurl(serviceReimbursement.getAnnexfiles());
+ remShare.setDonorbank(serviceReimbursement.getDonorbank());
+ remShare.setDonorbankcard(serviceReimbursement.getDonorbankcard());
+ remShare.setDonorremark(serviceReimbursement.getDonorremark());
+ remShare.setDonorpayee(serviceReimbursement.getDonorpayee());
+
+ //nTemp = serviceReimbursement.getDonoramount();
+ //if(nTemp == null) nTemp = 0.0;
+ remShare.setDonoramount(serviceReimbursement.getDonoramount());
+ remShare.setDonorrelatives(serviceReimbursement.getDonorrelatives());
//remShare.setOaid(serviceReimbursement.getOaid());
//remShare.setDonorno(serviceReimbursement.getDonorno());
@@ -345,7 +355,7 @@
String filePath = RuoYiConfig.getUploadPath();
String strMutfileUrl = remShare.getFileurl();//鍙兘瀛樺湪澶氫釜鍦板潃锛屼互,鍒嗗紑
- String strFUrl = "http://129.88.242.39:8899/seeyon/rest/attachment?token=%s"+strRes;
+ String strFUrl = "http://129.88.242.39:8899/seeyon/rest/attachment?token="+strRes;
//String strFUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/attachment?token="+strRes;
//strFUrl = String.format(strFUrl, strRes);
--
Gitblit v1.9.3