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 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java | 18 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 282 ++++++++++++++++++++++++++++++++--
ruoyi-admin/src/main/resources/application.yml | 23 +-
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundSharedMapper.java | 9
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java | 7
ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml | 9
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml | 8
ruoyi-admin/src/main/resources/application-druid.yml | 4
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml | 8
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java | 18 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java | 27 +--
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundSharedServiceImpl.java | 12 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundSharedController.java | 7
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundSharedService.java | 3
15 files changed, 378 insertions(+), 71 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
index 863f73d..df35e04 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -1,14 +1,20 @@
package com.ruoyi.web.controller.project;
-import java.io.*;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.HttpClientKit;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.vo.*;
import com.ruoyi.project.service.*;
@@ -18,23 +24,13 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.ibatis.annotations.Options;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.*;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.*;
import static com.ruoyi.web.controller.project.ServiceReimbursementController.convert;
@@ -66,6 +62,9 @@
@Autowired
private IServiceSystemmessageService ServiceSystemmessage;
+
+ @Autowired
+ private IServiceFundSharedService fundServiceShare;
public ServiceFundController() {
@@ -202,7 +201,239 @@
{
boolean b = serviceFundService.save(serviceFund);
Long id = serviceFund.getId();
+ if(b)
+ {
+ addReiSharedDatd(serviceFund,1);
+ }
return AjaxResult.success(id);
+ }
+
+
+ public int addReiSharedDatd(ServiceFund serviceFund,int nType)
+ {
+ //remShare = ;
+ ServiceFundShared remShare = null;
+ if(nType == 1)
+ {
+ remShare = new ServiceFundShared();
+ remShare.setSerfunid(serviceFund.getId());
+ }
+ else //modify
+ {
+ List<ServiceFundShared> remlist = fundServiceShare.getFundShareInfoById(serviceFund.getId());
+ if(remlist!=null)
+ remShare =remlist.get(0);
+ }
+
+ remShare.setDonorno(serviceFund.getDonorno());
+ remShare.setDonorname(serviceFund.getDonorname());
+ remShare.setUserno(serviceFund.getUserno());
+ remShare.setUsername(serviceFund.getUsername());
+ remShare.setUnitname(serviceFund.getUnitname());
+ remShare.setUnitno(serviceFund.getUnitno());
+ remShare.setUnituserno(serviceFund.getUnituserno());
+ remShare.setPhone(serviceFund.getPhone());
+ remShare.setAnnexbankcard(serviceFund.getAnnexbankcard());
+ remShare.setAnnexregistform(serviceFund.getAnnexregistform());
+ Double nTemp= serviceFund.getPretaxcost();
+ if( nTemp == null) nTemp = 0d;
+ remShare.setPretaxcost(BigDecimal.valueOf(nTemp));
+ //remShare.setAnnexfiles(serviceReimbursement.getAnnexfiles());
+ // remShare.setAmountrequested(BigDecimal.valueOf(serviceReimbursement.getAmountrequested()));
+
+ nTemp= serviceFund.getTaxedcost();
+ if( nTemp == null) nTemp = 0d;
+ remShare.setTaxedcost(BigDecimal.valueOf(nTemp));
+
+ nTemp = serviceFund.getTotalcost();
+ if( nTemp == null) nTemp = 0d;
+ remShare.setTotalcost(BigDecimal.valueOf(nTemp));
+
+ nTemp = serviceFund.getExpertcost();
+ if(nTemp == null) nTemp = 0.0;
+ remShare.setExpertcost(BigDecimal.valueOf(nTemp));
+
+ nTemp = serviceFund.getEthicscost();
+ if(nTemp == null) nTemp = 0.0;
+ remShare.setEthicscost(BigDecimal.valueOf(nTemp));
+
+ nTemp = serviceFund.getMedicalcost();
+ if(nTemp == null) nTemp = 0.0;
+ remShare.setMedicalcost(BigDecimal.valueOf(nTemp));
+
+ nTemp = serviceFund.getFamilycost();
+ if(nTemp == null) nTemp = 0.0;
+ remShare.setFamilycost(BigDecimal.valueOf(nTemp));
+
+ nTemp = serviceFund.getAftercarecost();
+ if(nTemp == null) nTemp = 0.0;
+ remShare.setAftercarecost(BigDecimal.valueOf(nTemp));
+
+ nTemp = serviceFund.getAmountrequested();
+ if(nTemp == null) nTemp = 0.0;
+ remShare.setAmountrequested(BigDecimal.valueOf(nTemp));
+
+
+ remShare.setApplytype(serviceFund.getApplytype());
+
+ nTemp = serviceFund.getPrepaidamount();
+ if(nTemp == null) nTemp = 0.0;
+ remShare.setPrepaidamount(BigDecimal.valueOf(nTemp));
+
+ remShare.setInvoicecount(serviceFund.getInvoicecount());
+ remShare.setAttachcount(serviceFund.getAttachcount());
+ remShare.setManagerno(serviceFund.getManagerno());
+ remShare.setManagername(serviceFund.getManagername());
+ remShare.setDeptmentno(serviceFund.getDeptmentno());
+ remShare.setDeptmentname(serviceFund.getDeptmentname());
+ remShare.setOpochecker(serviceFund.getOpochecker());
+ remShare.setFinvicepresident(serviceFund.getFinvicepresident());
+ remShare.setBusvicepresident(serviceFund.getBusvicepresident());
+ remShare.setOfficedirector(serviceFund.getOfficedirector());
+ remShare.setFinancedirector(serviceFund.getFinancedirector());
+ remShare.setFinancechecher(serviceFund.getFinancechecher());
+ //remShare.setIsdistribute(serviceFund.getIsdistribute());
+ remShare.setRecordstatus(serviceFund.getRecordstatus());
+ remShare.setUploadflag(serviceFund.getUploadflag());
+ remShare.setUploadtime(serviceFund.getUploadtime());
+ long nLevel = serviceFund.getFlowlevel();
+ remShare.setFlowlevel(nLevel);
+
+ remShare.setInfoid(serviceFund.getInfoid());
+
+ //remShare.setOaid(serviceReimbursement.getOaid());
+ //remShare.setDonorno(serviceReimbursement.getDonorno());
+
+ boolean bRet = false;
+ if(nType==1)
+ {
+ bRet = fundServiceShare.save(remShare);
+ }
+ else
+ {
+ //remShare.setId(serviceReimbursement.);
+ bRet = fundServiceShare.updateById(remShare);
+ }
+
+ //if(!bRet) return -1;
+ String strMutfileUrl = remShare.getAnnexbankcard();
+ //鏈夐檮浠舵椂鎵嶈皟鐢ㄧ涓夋柟杩涜涓婁紶
+ if(strMutfileUrl == null) return 0;
+ if(strMutfileUrl.isEmpty()) return 0;
+
+ try
+ {
+ uploadOAFileAndUpdateDb(remShare);
+ }
+ catch (Exception e)
+ {
+ logger.error("璋冪敤绗笁鏂规帴鍙ｅ嚭閿�!");
+ e.printStackTrace();
+ }
+
+ //姝ゅ淇濆瓨鎴愬姛鍚庤涓婁紶OA锛屼繚瀛樿繑鍥炲��
+
+ return 0;
+ }
+
+
+ int uploadOAFileAndUpdateDb(ServiceFundShared remShare)
+ {
+ //涓婁紶OA鏂囦欢
+ //String strUrl = "http://129.88.242.39:8899/seeyon/rest/token?userName=opo&password=127814f8-84e8-4304-84a5-a71573567efd&loginName=demo3";
+ String strUrl = "http://129.88.242.39:8899/seeyon/rest/token";
+ //String strUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/token";
+ //涓婁紶鏂囦欢鎴愬姛鍚庯紝鍘绘洿鏂扮浉鍏崇殑鏁版嵁搴�
+
+
+ Map<String, Object> map = new HashMap<String, Object>();
+ map.put("userName","opo");
+ map.put("password","4126407a-9821-4874-be41-6568abd6dbe5");
+ map.put("loginName","demo3");
+
+ JSONObject jsonObj = new JSONObject(map);
+
+ System.out.println("uploadOAFileAndUpdateDb + jsonObject"+jsonObj.toString() + "\r\n" + jsonObj.toJSONString());
+ String strRes = HttpClientKit.postOpr(strUrl,jsonObj.toString());//
+ //String strRes = HttpClientKit.postMsg(strUrl,jsonObj);//寰楀埌杩斿洖鐨則oken?
+
+ JSONObject json1 = JSONObject.parseObject(strRes);
+ strRes = json1.get("id").toString();
+
+ ///if(strRes.isEmpty() || "" == strRes) return -1;// 涓虹┖浠ｈ〃澶辫触
+
+ //涓嬮潰闇�姹傝皟鐢ㄦ枃浠剁殑鎺ュ彛锛岃皟鐢ㄦ垚鍔熻繑鍥炲悗锛屽緱鍒癴ilename鍜宖ileid 鐢ㄨ繖浜屼釜鍊煎幓鏇存柊鏁版嵁
+
+ String filePath = RuoYiConfig.getUploadPath();
+ String strMutfileUrl = remShare.getAnnexbankcard();//鍙兘瀛樺湪澶氫釜鍦板潃锛屼互,鍒嗗紑
+
+ 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);
+
+ /*File test = null;
+ File file = new File("E:\\YYJQ\\OPO\\WEB\\Upload\\upload\\2023\\02\\17");
+ if (file.exists() && file.isDirectory()) {
+ // 鑾峰彇鎵�鏈夌洸鐩掓枃浠跺す
+ File[] ones = file.listFiles();
+ for (File one : ones) {
+ test = one;
+ }
+ }*/
+
+ String filename = "";
+ String fileid = "";
+
+ String[] urlArray = strMutfileUrl.split(",");
+ for (int i = 0; i < urlArray.length; i++)
+ {
+ String strOneFileName = urlArray[i];
+ String strTemp = strOneFileName.substring(15);
+ String strFile = filePath + strTemp ;
+ //FileUploadUtils.getAbsoluteFile(filePath,strOneFileName);
+ String struploadResult = "";
+ File filetest = new File(strFile);
+ try
+ {
+ struploadResult = HttpClientKit.sendPostWithFile(filetest,strFUrl);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+
+
+ //String strFRes = HttpClientKit.postMsg(strFUrl,jsonFObj);
+ if(struploadResult == null) return 0;
+ if(struploadResult.isEmpty()) return 0;
+
+ JSONObject jsonR = JSONObject.parseObject(struploadResult);
+
+ JSONArray jsonArr = jsonR.getJSONArray("atts");
+ for(int j=0;j<jsonArr.size();j++)
+ {
+ JSONObject jsonRet = jsonArr.getJSONObject(j);
+ String name1= jsonRet.get("filename").toString();
+ String id1 = jsonRet.get("fileUrl").toString();
+ filename+=name1;
+ fileid+=id1;
+ if(i!=urlArray.length-1)
+ {
+ filename+=",";
+ fileid+=",";
+ }
+ }
+
+ }
+
+ long nId = remShare.getId();
+ remShare.setId(nId);
+ remShare.setFilename(filename);
+ remShare.setFileid(fileid);
+ boolean bRet = fundServiceShare.updateById(remShare);
+ if(!bRet) return -1;
+
+ return 0;
}
/**
@@ -217,6 +448,10 @@
{
boolean b = serviceFundService.save(serviceFundVO);
Long id = serviceFundVO.getId();
+ if(b)
+ {
+ addReiSharedDatd(serviceFundVO,1);
+ }
List<ServiceFunddetail> serviceFunddetails=serviceFundVO.getServiceFunddetails();
serviceFunddetails.forEach(item->item.setFundid(id));
serviceFunddetailService.saveBatch(serviceFunddetails);
@@ -351,7 +586,12 @@
@RepeatSubmit
public AjaxResult edit(@RequestBody ServiceFund serviceFund)
{
- return toAjax(serviceFundService.updateById(serviceFund));
+ boolean bret = serviceFundService.updateById(serviceFund);
+ if(bret)
+ {
+ addReiSharedDatd(serviceFund,2);
+ }
+ return toAjax(bret);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundSharedController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundSharedController.java
index a057f07..4b17341 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundSharedController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundSharedController.java
@@ -18,18 +18,15 @@
import java.util.Arrays;
import java.util.List;
-//import com.ruoyi.project.domain.ServiceFundShared;
-//import com.ruoyi.project.service.IServiceFundSharedService;
-
/**
* 璐圭敤鐢宠涓籆ontroller
*
* @author ruoyi
- * @date 2023-01-10
+ * @date 2023-03-27
*/
@Api("璐圭敤鐢宠涓�")
@RestController
-@RequestMapping("/project/shared")
+@RequestMapping("/system/shared")
public class ServiceFundSharedController extends BaseController
{
@Autowired
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java
index 0275790..02d1df8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java
@@ -1,29 +1,22 @@
package com.ruoyi.web.controller.project;
-import java.util.Arrays;
-import java.util.List;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceOrganallocation;
import com.ruoyi.project.service.IServiceOrganallocationService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
/**
* 鍣ㄥ畼鍒嗛厤Controller
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);
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 4479fd8..56e0fcc 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,12 +6,12 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- # 瀹㈡埛鐜
+ # 鍖婚櫌鐜
#url: jdbc:mysql://129.88.242.37:3308/opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#username: JQ
#password: Jqserver88
- # 娴嬭瘯鐜
+ # 寮�鍙戠幆澧�
url: jdbc:mysql://116.62.18.175:6002/lihuopo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
username: opo
password: opo@2022
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index a44e5ec..f9f74c3 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -9,9 +9,10 @@
# 瀹炰緥婕旂ず寮�鍏�
demoEnabled: true
# 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- #profile: C:/YYJQ/OPO/WEB/Upload
- profile: D:/YYJQ/OPO/WEB/Upload
- #profile: E:/YYJQ/OPO/WEB/Upload
+ #寮�鍙戠幆澧�
+ #profile: D:/YYJQ/OPO/WEB/Upload
+ #鍖婚櫌鐜
+ profile: E:/YYJQ/OPO/WEB/Upload
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: false
# 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
@@ -67,15 +68,15 @@
enabled: ALWAYS
# redis 閰嶇疆
redis:
- # 鍦板潃銆佸瘑鐮併�佺鍙ｏ紙榛樿涓�6379锛夛細瀹㈡埛鐜
- #host: 129.88.242.37
- #port: 6379
- #password: jqserver
+ # 鍦板潃銆佸瘑鐮併�佺鍙ｏ紙榛樿涓�6379锛夛細鍖婚櫌鐜
+ host: 129.88.242.37
+ password: jqserver
+ port: 6379
- # 鍦板潃銆佸瘑鐮併�佺鍙ｏ紙榛樿涓�6379锛夛細娴嬭瘯鐜
- host: 116.62.18.175
- password: Smartor
- port: 6020
+ # 鍦板潃銆佸瘑鐮併�佺鍙ｏ紙榛樿涓�6379锛夛細寮�鍙戠幆澧�
+ #host: 116.62.18.175
+ #password: Smartor
+ #port: 6020
# 鏁版嵁搴撶储寮�
database: 0
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java
index b49c4f8..3bd7e20 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java
@@ -1,4 +1,3 @@
-//package com.ruoyi.system.domain;
package com.ruoyi.project.domain;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -17,7 +16,7 @@
* 璐圭敤鐢宠涓诲璞� service_fund_shared
*
* @author ruoyi
- * @date 2023-01-10
+ * @date 2023-03-27
*/
@Data
@ApiModel("璐圭敤鐢宠涓�")
@@ -253,5 +252,9 @@
@Excel(name = "璐㈠姟鎺ュ彛杩斿洖鐨勬枃浠跺悕绉�")
private String fileid;
+ @ApiModelProperty("serverfund鐨処D")
+ @Excel(name = "璁板綍鐘舵��")
+ private long serfunid;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java
index f807b28..306348c 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java
@@ -9,6 +9,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -210,5 +211,22 @@
@ApiModelProperty("璐圭敤褰掑睘鎻忚堪")
private String costtypename;
+ @ApiModelProperty("鎹愮尞瀹跺睘閾惰")
+ private String donorbank;
+
+ @ApiModelProperty("鎹愮尞瀹跺睘閾惰鍗″彿")
+ private String donorbankcard;
+
+ @ApiModelProperty("鎹愮尞瀹跺睘璐圭敤璇存槑")
+ private String donorremark;
+
+ @ApiModelProperty("鎹愮尞瀹跺睘璐圭敤閲戦")
+ private BigDecimal donoramount;
+
+ @ApiModelProperty("鎹愮尞瀹跺睘浜烘暟")
+ private Integer donorrelatives;
+ @ApiModelProperty("鎹愮尞瀹跺睘鏀舵浜�")
+ private String donorpayee;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java
index 5a980a9..4f3303f 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java
@@ -247,5 +247,23 @@
@ApiModelProperty("鍒犻櫎鏍囪瘑")
private Long delFlag;
+ @ApiModelProperty("鎹愮尞瀹跺睘閾惰")
+ private String donorbank;
+
+ @ApiModelProperty("鎹愮尞瀹跺睘閾惰鍗″彿")
+ private String donorbankcard;
+
+ @ApiModelProperty("鎹愮尞瀹跺睘璐圭敤璇存槑")
+ private String donorremark;
+
+ @ApiModelProperty("鎹愮尞瀹跺睘璐圭敤閲戦")
+ private BigDecimal donoramount;
+
+ @ApiModelProperty("鎹愮尞瀹跺睘浜烘暟")
+ private Integer donorrelatives;
+
+ @ApiModelProperty("鎹愮尞瀹跺睘鏀舵浜�")
+ private String donorpayee;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundSharedMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundSharedMapper.java
index 7d8abf7..5308bcb 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundSharedMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundSharedMapper.java
@@ -1,19 +1,16 @@
-//package com.ruoyi.system.mapper;
package com.ruoyi.project.mapper;
+
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.project.domain.ServiceFundShared;
import java.util.List;
-//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-//import com.ruoyi.system.domain.ServiceFundShared;
-
/**
* 璐圭敤鐢宠涓籑apper鎺ュ彛
*
* @author ruoyi
- * @date 2023-01-10
+ * @date 2023-03-27
*/
public interface ServiceFundSharedMapper extends BaseMapper<ServiceFundShared>
{
@@ -24,4 +21,6 @@
* @return 璐圭敤鐢宠涓婚泦鍚�
*/
public List<ServiceFundShared> selectServiceFundSharedList(ServiceFundShared serviceFundShared);
+
+ List<ServiceFundShared> getFundShareInfoById(Long fundid);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundSharedService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundSharedService.java
index cb2d27c..fec5cf7 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundSharedService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundSharedService.java
@@ -9,7 +9,7 @@
* 璐圭敤鐢宠涓籗ervice鎺ュ彛
*
* @author ruoyi
- * @date 2023-01-10
+ * @date 2023-03-27
*/
public interface IServiceFundSharedService extends IService<ServiceFundShared>
{
@@ -21,4 +21,5 @@
* @return 璐圭敤鐢宠涓婚泦鍚�
*/
public List<ServiceFundShared> queryList(ServiceFundShared serviceFundShared);
+ List<ServiceFundShared> getFundShareInfoById(Long fundid);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundSharedServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundSharedServiceImpl.java
index 96c1d23..25b35c3 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundSharedServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundSharedServiceImpl.java
@@ -7,6 +7,7 @@
import com.ruoyi.project.domain.ServiceFundShared;
import com.ruoyi.project.mapper.ServiceFundSharedMapper;
import com.ruoyi.project.service.IServiceFundSharedService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -15,12 +16,15 @@
* 璐圭敤鐢宠涓籗ervice涓氬姟灞傚鐞�
*
* @author ruoyi
- * @date 2023-01-10
+ * @date 2023-03-27
*/
@Service
public class ServiceFundSharedServiceImpl extends ServiceImpl<ServiceFundSharedMapper, ServiceFundShared> implements IServiceFundSharedService
{
+
+ @Autowired
+ ServiceFundSharedMapper serviceFundSharedMapper;
/**
* 鏌ヨ璐圭敤鐢宠涓诲垪琛�
@@ -166,4 +170,10 @@
return this.list(wrappers);
}
+ @Override
+ public List<ServiceFundShared> getFundShareInfoById(Long fundid)
+ {
+ return serviceFundSharedMapper.getFundShareInfoById(fundid);
+ // return null;
+ }
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml
index abc3bf5..62028a4 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundSharedMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.ServiceFundSharedMapper">
+<mapper namespace="com.ruoyi.project.mapper.ServiceFundSharedMapper">
<resultMap type="ServiceFundShared" id="ServiceFundSharedResult">
<result property="id" column="ID" />
@@ -59,9 +59,14 @@
</resultMap>
<sql id="selectServiceFundSharedVo">
- select ID, InfoID, DonorNo, DonorName, del_flag, create_by, create_time, update_by, update_time, UserNo, UserName, UnitName, UnitNo, UnitUserNo, Phone, AnnexBankCard, AnnexRegistForm, PretaxCost, TaxedCost, TotalCost, ProcurementCost, ExpertCost, EthicsCost, MedicalCost, FamilyCost, AftercareCost, AmountRequested, ApplyType, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, Remark, Isdistribute, RecordStatus, uploadflag, uploadtime, FlowLevel, oaid, oabdzt, filename, fileid from service_fund_shared
+ select ID, InfoID, DonorNo, DonorName, create_by, create_time, update_by, update_time, UserNo, UserName, UnitName, UnitNo, UnitUserNo, Phone, AnnexBankCard, AnnexRegistForm, PretaxCost, TaxedCost, TotalCost, ProcurementCost, ExpertCost, EthicsCost, MedicalCost, FamilyCost, AftercareCost, AmountRequested, ApplyType, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, Remark, Isdistribute, RecordStatus, uploadflag, uploadtime, FlowLevel, oaid, oabdzt, filename, fileid,serfunid from service_fund_shared
</sql>
+ <select id="getFundShareInfoById" resultType="com.ruoyi.project.domain.ServiceFundShared" resultMap="ServiceFundSharedResult">
+ <include refid="selectServiceFundSharedVo"/>
+ where serfunid = #{fundid}
+ </select>
+
<select id="selectServiceFundSharedList" parameterType="ServiceFundShared" resultMap="ServiceFundSharedResult">
<include refid="selectServiceFundSharedVo"/>
<where>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
index 802af57..586c8ef 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
@@ -50,10 +50,16 @@
<result property="costtype" column="costtype" />
<result property="costtypename" column="costtypename" />
<result property="fileurl" column="fileurl" />
+ <result property="donorpayee" column="donorpayee" />
+ <result property="donorbank" column="donorbank" />
+ <result property="donorbankcard" column="donorbankcard" />
+ <result property="donorremark" column="donorremark" />
+ <result property="donoramount" column="donoramount" />
+ <result property="donorrelatives" column="donorrelatives" />
</resultMap>
<sql id="selectServiceReimbursementVo">
- select ID, del_flag, create_by, create_time, update_by, update_time, UserNo, UserName, IDCardType, IDCardNo, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexFiles, AmountRequested, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, InfoID, DonorNo, remark, RecordStatus, uploadflag, uploadtime, Travelers, DonorName, Reason, FlowLevel, costtype, costtypename,fileurl from service_reimbursement
+ select ID, del_flag, create_by, create_time, update_by, update_time, UserNo, UserName, IDCardType, IDCardNo, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexFiles, AmountRequested, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, InfoID, DonorNo, remark, RecordStatus, uploadflag, uploadtime, Travelers, DonorName, Reason, FlowLevel, costtype, costtypename,fileurl,donorbank,donorbankcard,donorremark, donoramount,donorrelatives,donorpayee from service_reimbursement
</sql>
<select id="selectServiceReimbursementList" parameterType="ServiceReimbursement" resultMap="ServiceReimbursementResult">
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
index c19ca10..8e1d076 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
@@ -54,10 +54,16 @@
<result property="filename" column="filename" />
<result property="fileid" column="fileid" />
<result property="reimid" column="reimid" />
+ <result property="donorpayee" column="donorpayee" />
+ <result property="donorbank" column="donorbank" />
+ <result property="donorbankcard" column="donorbankcard" />
+ <result property="donorremark" column="donorremark" />
+ <result property="donoramount" column="donoramount" />
+ <result property="donorrelatives" column="donorrelatives" />
</resultMap>
<sql id="selectServiceReimbursementSharedVo">
- select ID, del_flag, create_by, create_time, update_by, update_time, UserNo, UserName, Travelers, IDCardType, IDCardNo, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexFiles, AmountRequested, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, InfoID, DonorNo, DonorName, Reason, remark, RecordStatus, uploadflag, uploadtime, totalAmount, bigStrMoney, FlowLevel, costtype, costtypename, oaid, oabdzt, filename, fileid,reimid from service_reimbursement_shared
+ select ID, del_flag, create_by, create_time, update_by, update_time, UserNo, UserName, Travelers, IDCardType, IDCardNo, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexFiles, AmountRequested, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, InfoID, DonorNo, DonorName, Reason, remark, RecordStatus, uploadflag, uploadtime, totalAmount, bigStrMoney, FlowLevel, costtype, costtypename, oaid, oabdzt, filename, fileid,reimid ,donorbank,donorbankcard,donorremark,donoramount,donorrelatives,donorpayee from service_reimbursement_shared
</sql>
<select id="getRemShareInfoByRemId" resultType="com.ruoyi.project.domain.ServiceReimbursementShared" resultMap="ServiceReimbursementSharedResult">
--
Gitblit v1.9.3