From 08f0193d8bbd4dd9f68706ac1313f564b7219f95 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 16 十月 2023 16:05:09 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 96 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 82 insertions(+), 14 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 dd8a559..356e921 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
@@ -659,8 +659,8 @@
}
@Override
- public List<SpFinancialExpensesFundOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE) {
- return serviceFundMapper.getListBypower(PAUSERNO, PAFUNDTYPE, PAAPPLICANT, PAAPPLICATIONBEGTIME, PAAPPLICATIONENDTIME, PADEPARTMENT, CHECKFLAG, APPLYTYPE);
+ public List<SpFinancialExpensesFundOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE, Integer CHECKSTATUS) {
+ return serviceFundMapper.getListBypower(PAUSERNO, PAFUNDTYPE, PAAPPLICANT, PAAPPLICATIONBEGTIME, PAAPPLICATIONENDTIME, PADEPARTMENT, CHECKFLAG, APPLYTYPE, CHECKSTATUS);
}
@Override
@@ -682,14 +682,8 @@
public Long addOrUpdateNew(ServiceFundVO serviceFundVO) {
Long id = null;
//灏嗘暟鎹繚瀛樺埌fund琛�
- if (ObjectUtils.isNotEmpty(serviceFundVO) && serviceFundVO.getId() == null) {
- serviceFundVO.setCheckstatus(serviceFundVO.getCheckstatus() == null ? 1 : 2);
- save(serviceFundVO);
- id = serviceFundVO.getId();
- } else {
- updateById(serviceFundVO);
- id = serviceFundVO.getId();
- }
+ id = saveFund(serviceFundVO);
+
List<ServiceFunddetailVO> serviceFunddetails = serviceFundVO.getServiceFunddetails();
if (CollectionUtils.isEmpty(serviceFunddetails)) {
System.out.println("serviceFunddetails涓虹┖鍠�");
@@ -702,6 +696,9 @@
if (!CollectionUtils.isEmpty(serviceFunddetailVO.getAnnexfilesList())) {
serviceFunddetailVO.setAnnexfiles(JSON.toJSONString(serviceFunddetailVO.getAnnexfilesList()));
}
+ if (!CollectionUtils.isEmpty(serviceFunddetailVO.getInvoiceFilesList())) {
+ serviceFunddetailVO.setInvoiceFiles(JSON.toJSONString(serviceFunddetailVO.getInvoiceFilesList()));
+ }
ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class);
if (serviceFunddetailVO.getId() == null) {
@@ -712,6 +709,42 @@
}
return id;
+ }
+
+ @Override
+ public Map<String, Long> performance(ServiceFundVO serviceFundVO) {
+ Long id = null;
+ //灏嗘暟鎹繚瀛樺埌fund琛�
+ id = saveFund(serviceFundVO);
+
+ List<ServiceFunddetailVO> serviceFunddetails = serviceFundVO.getServiceFunddetails();
+ if (CollectionUtils.isEmpty(serviceFunddetails)) {
+ System.out.println("serviceFunddetails涓虹┖鍠�");
+ return null;
+ }
+
+ //鎬荤◣鍓�
+ Double pretaxcosts = 0.00;
+ //鎬荤◣鍚�
+ Double taxedcosts = 0.00;
+ for (ServiceFunddetailVO serviceFunddetailVO : serviceFunddetails) {
+ serviceFunddetailVO.setFundid(id);
+
+ ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class);
+ Map<String, Double> performance = serviceFunddetailService.performance(serviceFunddetail);
+ if (!performance.isEmpty()) {
+ Double amount = performance.get("amount");
+ Double taxedamount = performance.get("taxedamount");
+ pretaxcosts = pretaxcosts + amount;
+ taxedcosts = taxedcosts + taxedamount;
+ }
+ serviceFundVO.setPretaxcost(pretaxcosts);
+ serviceFundVO.setTaxedcost(taxedcosts);
+ updateById(serviceFundVO);
+ }
+ Map map = new HashMap();
+ map.put("fundId", id);
+ return map;
}
int uploadOAFileAndUpdateDb(ServiceFunddetailShared remShare) {
@@ -737,8 +770,24 @@
String filePath = RuoYiConfig.getUploadPath();
String strFUrl = "http://129.88.242.39:8899/seeyon/rest/attachment?token=" + strRes;
List<RbDetailFile> parseArray2 = new ArrayList<>();
+ List<RbDetailFile> invoicefilesList = new ArrayList<>();
+
+ //鏅�氶檮浠�
List<RbDetailFile> parseArray = JSON.parseArray(remShare.getAnnexfiles(), RbDetailFile.class);
- log.info("parseArray鐨勫�� : {}", parseArray);
+ //鍙戠エ闄勪欢
+ List<RbDetailFile> invoicefilesArray = JSON.parseArray(remShare.getInvoicefiles(), RbDetailFile.class);
+ log.info("parseArray鐨勫�� : {}, invoicefilesArray鐨勫�� : {},", parseArray, invoicefilesArray);
+
+ //鏅�氶檮浠�
+ uploadFile(filePath, strFUrl, parseArray2, parseArray, remShare, "1");
+
+ //鍙戠エ闄勪欢
+ uploadFile(filePath, strFUrl, invoicefilesList, invoicefilesArray, remShare, "2");
+ return 0;
+ }
+
+
+ private Integer uploadFile(String filePath, String strFUrl, List<RbDetailFile> parseArray2, List<RbDetailFile> parseArray, ServiceFunddetailShared remShare, String flag) {
if (!CollectionUtils.isEmpty(parseArray)) {
for (int i = 0; i < parseArray.size(); i++) {
RbDetailFile rbDetailFile = parseArray.get(i);
@@ -754,7 +803,7 @@
String struploadResult = HttpClientKit.sendPostWithFile(filetest, strFUrl);
log.info("绗笁鏂逛紶鍥炵殑鏁版嵁: {}", struploadResult);
if (StringUtils.isEmpty(struploadResult)) {
- log.info("HttpClientKit.sendPostWithFile 璇锋眰涓虹┖浜� filetest:{}, strFUrl:{} ", filetest, strFUrl);
+ log.error("HttpClientKit.sendPostWithFile 璇锋眰涓虹┖浜� filetest:{}, strFUrl:{} ", filetest, strFUrl);
return 0;
}
//鑾峰彇fileid
@@ -770,12 +819,17 @@
}
parseArray2.add(rbDetailFile);
}
- remShare.setAnnexfiles(JSON.toJSONString(parseArray2));
+ if (flag.equals("1")) {
+ //濡傛灉flag涓�1,鍒欐槸鏅��
+ remShare.setAnnexfiles(JSON.toJSONString(parseArray2));
+ } else if (flag.equals("2")) {
+ //濡傛灉flag涓�2,鍒欐槸鍙戠エ
+ remShare.setInvoicefiles(JSON.toJSONString(parseArray2));
+ }
log.info("ServiceReimbursementdetailShared 鏄惁鍔犱笂浜唂ileid : {}", remShare);
}
return 0;
}
-
// int uploadOAFileAndUpdateDb(ServiceFundShared remShare) {
// //涓婁紶OA鏂囦欢
@@ -869,4 +923,18 @@
// return 0;
// }
+ public long saveFund(ServiceFundVO serviceFundVO) {
+ Long id = null;
+ //灏嗘暟鎹繚瀛樺埌fund琛�
+ if (ObjectUtils.isNotEmpty(serviceFundVO) && serviceFundVO.getId() == null) {
+ serviceFundVO.setCheckstatus(serviceFundVO.getCheckstatus() == null ? 1 : 2);
+ save(serviceFundVO);
+ id = serviceFundVO.getId();
+ } else {
+ updateById(serviceFundVO);
+ id = serviceFundVO.getId();
+ }
+ return id;
+ }
+
}
--
Gitblit v1.9.3