From dcd3eb3bbbc25b01155493f20f5680fc6d4aee11 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 26 十月 2023 16:02:07 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 230 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 142 insertions(+), 88 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 27aaf49..51d2606 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
@@ -6,6 +6,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.LockSupport;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
@@ -21,7 +23,9 @@
import com.ruoyi.project.service.IServiceFunddetailService;
import com.ruoyi.project.service.IServiceFunddetailSharedService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -29,6 +33,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.service.IServiceFundService;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
/**
* 璐圭敤鐢宠涓籗ervice涓氬姟灞傚鐞�
@@ -103,6 +108,9 @@
if (serviceFund.getUploadtime() != null) {
wrappers.eq(ServiceFund::getUploadtime, serviceFund.getUploadtime());
}
+ if (serviceFund.getFlowlevel() != null) {
+ wrappers.eq(ServiceFund::getFlowlevel, serviceFund.getFlowlevel());
+ }
return this.list(wrappers);
}
@@ -136,6 +144,7 @@
ServiceFundShared serviceFundShared = DtoConversionUtils.sourceToTarget(serviceFund, ServiceFundShared.class);
serviceFundShared.setSerfunid(serviceFundShared.getId());
serviceFundShared.setId(null);
+ log.info("鏁版嵁閮芥彃杩涘幓浜嗗悧锛� {}", serviceFundShared);
sharedService.save(serviceFundShared);
//fundId涓轰富琛ㄧ殑ID
@@ -152,18 +161,20 @@
//鏁版嵁鍙戦�佺粰璐㈠姟
uploadOAFileAndUpdateDb(serviceFunddetailShareds.get(i));
}
- boolean result = detailSharedService.saveBatch(serviceFunddetailShareds);
+ boolean result = false;
+ for (ServiceFunddetailShared serviceFunddetailShared : serviceFunddetailShareds) {
+ if (ObjectUtils.isNotEmpty(serviceFunddetailShared)) {
+ result = detailSharedService.save(serviceFunddetailShared);
+ } else {
+ log.info("serviceFunddetailShared涓虹┖浜嗭紒锛侊紒");
+ }
+ }
return result;
}
@Override
public List<ServiceFund> selectServiceFundList(ServiceFund serviceFund) {
return serviceFundMapper.selectServiceFundList(serviceFund);
- }
-
- @Override
- public List<ServiceFunddetail> getFundDetail(Long id) {
- return serviceFunddetailMapper.selectFundDetailListById(id);
}
@Override
@@ -651,8 +662,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, String donorname) {
+ return serviceFundMapper.getListBypower(PAUSERNO, PAFUNDTYPE, PAAPPLICANT, PAAPPLICATIONBEGTIME, PAAPPLICATIONENDTIME, PADEPARTMENT, CHECKFLAG, APPLYTYPE, CHECKSTATUS, donorname);
}
@Override
@@ -673,67 +684,72 @@
@Transactional
public Long addOrUpdateNew(ServiceFundVO serviceFundVO) {
Long id = null;
- if (serviceFundVO.getId() == null) {
- save(serviceFundVO);
- id = serviceFundVO.getId();
- } else {
- updateById(serviceFundVO);
- id = serviceFundVO.getId();
+ //灏嗘暟鎹繚瀛樺埌fund琛�
+ id = saveFund(serviceFundVO);
+
+ List<ServiceFunddetailVO> serviceFunddetails = serviceFundVO.getServiceFunddetails();
+ if (CollectionUtils.isEmpty(serviceFunddetails)) {
+ System.out.println("serviceFunddetails涓虹┖鍠�");
+ return null;
}
- List<ServiceFunddetail> serviceFunddetails = serviceFundVO.getServiceFunddetails();
-
- // 鐢ㄤ簬璁板綍绋庡墠銆佺◣鍚庣殑鎬诲拰
- double taxBefore = 0.0;
- double taxAfter = 0.0;
-
- for (ServiceFunddetail serviceFunddetail : serviceFunddetails) {
- serviceFunddetail.setFundid(id);
- if (serviceFunddetail.getTaxedamount() != null && serviceFunddetail.getAmount() != null && serviceFunddetail.getTaxedamount() != 0.0 && serviceFunddetail.getAmount() != 0.0) {
- // 绋庡墠绋庡悗閮戒笉涓虹┖
- if (serviceFunddetail.getId() == null) {
- serviceFunddetailService.save(serviceFunddetail);
- } else {
- serviceFunddetailService.updateById(serviceFunddetail);
- }
- continue;
- } else if (serviceFunddetail.getTaxedamount() != null && serviceFunddetail.getTaxedamount() != 0.0) {
- // 绋庡悗姹傜◣鍓�,濡傛灉鏄笓瀹惰垂鐢宠 鎴� 浼︾悊涓撳璐圭敵璇� 鎵嶄細璁＄畻绋庡墠绋庡悗
- if (StringUtils.isNotEmpty(serviceFundVO.getApplytype()) && serviceFundVO.getApplytype().equals("1") || serviceFundVO.getApplytype().equals("2")) {
- Double taxationBefore = Double.valueOf(TaxtUtils.getTaxationBefore(BigDecimal.valueOf(serviceFunddetail.getTaxedamount())));
- // 绋庨噾
- String taxation = TaxtUtils.getTaxation(BigDecimal.valueOf(taxationBefore));
- serviceFunddetail.setAmount(Double.valueOf(taxationBefore));
- serviceFunddetail.setTaxamount(Double.parseDouble(taxation));
- }
- } else if (serviceFunddetail.getAmount() != null && serviceFunddetail.getAmount() != 0.0) {
- // 绋庡墠姹傜◣鍚�,濡傛灉鏄笓瀹惰垂鐢宠 鎴� 浼︾悊涓撳璐圭敵璇� 鎵嶄細璁＄畻绋庡墠绋庡悗
- if (StringUtils.isNotEmpty(serviceFundVO.getApplytype()) && serviceFundVO.getApplytype().equals("1") || serviceFundVO.getApplytype().equals("2")) {
- double tax = Double.parseDouble(TaxtUtils.getTaxation(BigDecimal.valueOf(serviceFunddetail.getAmount())));
- BigDecimal taxAfterMoney = BigDecimal.valueOf(serviceFunddetail.getAmount()).subtract(BigDecimal.valueOf(tax));
- serviceFunddetail.setTaxamount(tax);
- serviceFunddetail.setTaxedamount(taxAfterMoney.doubleValue());
- }
+ // 淇濆瓨璇︽儏鏁版嵁
+ for (ServiceFunddetailVO serviceFunddetailVO : serviceFunddetails) {
+ serviceFunddetailVO.setFundid(id);
+ //灏囬檮浠惰浆鎴恓son
+ 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);
- //鏍规嵁id鍒ゆ柇鏄柊澧炶繕鏄慨鏀�
- if (serviceFunddetail.getId() == null) {
+ if (serviceFunddetailVO.getId() == null) {
serviceFunddetailService.save(serviceFunddetail);
} else {
serviceFunddetailService.updateById(serviceFunddetail);
}
- if (serviceFundVO.getApplytype().equals("1") || serviceFundVO.getApplytype().equals("2")) {
- //濡傛灉鏄笓瀹惰垂鐢宠 鎴� 浼︾悊涓撳璐圭敵璇� 鎵嶄細璁＄畻绋庡墠绋庡悗
- taxBefore = taxBefore + serviceFunddetail.getAmount();
- taxAfter = taxAfter + serviceFunddetail.getTaxedamount();
- }
}
- //灏嗙◣鍓嶃�佺◣鍚庨噾棰濇洿鏂板埌fund琛ㄤ腑
- serviceFundVO.setPretaxcost(taxBefore);
- serviceFundVO.setTaxedcost(taxAfter);
- updateById(serviceFundVO);
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) {
//涓婁紶OA鏂囦欢
@@ -758,42 +774,66 @@
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);
- for (int i = 0; i < parseArray.size(); i++) {
- RbDetailFile rbDetailFile = parseArray.get(i);
- log.info("filePath鐨勪慨鏀�:{}", filePath);
- String url = rbDetailFile.getUrl();
- //file鐢ㄧ殑鏄粷瀵逛綅缃�
- String substring = url.substring(url.indexOf("/profile/upload") + "/profile/upload".length());
-// String strFile = rbDetailFile.getUrl().replace(filePath, "/profile/upload");
- File filetest = new File(filePath + substring);
+ //鍙戠エ闄勪欢
+ List<RbDetailFile> invoicefilesArray = JSON.parseArray(remShare.getInvoicefiles(), RbDetailFile.class);
+ log.info("parseArray鐨勫�� : {}, invoicefilesArray鐨勫�� : {},", parseArray, invoicefilesArray);
- try {
- String struploadResult = HttpClientKit.sendPostWithFile(filetest, strFUrl);
- log.info("绗笁鏂逛紶鍥炵殑鏁版嵁: {}", struploadResult);
- if (StringUtils.isEmpty(struploadResult)) {
- log.info("HttpClientKit.sendPostWithFile 璇锋眰涓虹┖浜� filetest:{}, strFUrl:{} ", filetest, strFUrl);
- return 0;
- }
- //鑾峰彇fileid
- JSONObject jsonR = JSONObject.parseObject(struploadResult);
- JSONArray jsonArr = jsonR.getJSONArray("atts");
- log.info("绗笁鏂逛紶鍥炵殑鏁版嵁鑾峰彇鐨刟tts : {}", jsonArr);
- for (int j = 0; j < jsonArr.size(); j++) {
- JSONObject jsonRet = jsonArr.getJSONObject(j);
- rbDetailFile.setFileid(jsonRet.get("fileUrl").toString());
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- parseArray2.add(rbDetailFile);
- }
- remShare.setAnnexfiles(JSON.toJSONString(parseArray2));
- log.info("ServiceReimbursementdetailShared 鏄惁鍔犱笂浜唂ileid : {}", remShare);
+ //鏅�氶檮浠�
+ 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);
+ log.info("filePath鐨勪慨鏀�:{}", filePath);
+ String url = rbDetailFile.getUrl();
+ //file鐢ㄧ殑鏄粷瀵逛綅缃�
+ String substring = url.substring(url.indexOf("/profile/upload") + "/profile/upload".length());
+// String strFile = rbDetailFile.getUrl().replace(filePath, "/profile/upload");
+ System.out.println("fund鏈嶅姟鐨刦ilePath + substring: " + filePath + substring);
+ File filetest = new File(filePath + substring);
+
+ try {
+ String struploadResult = HttpClientKit.sendPostWithFile(filetest, strFUrl);
+ log.info("绗笁鏂逛紶鍥炵殑鏁版嵁: {}", struploadResult);
+ if (StringUtils.isEmpty(struploadResult)) {
+ log.error("HttpClientKit.sendPostWithFile 璇锋眰涓虹┖浜� filetest:{}, strFUrl:{} ", filetest, strFUrl);
+ return 0;
+ }
+ //鑾峰彇fileid
+ JSONObject jsonR = JSONObject.parseObject(struploadResult);
+ JSONArray jsonArr = jsonR.getJSONArray("atts");
+ log.info("绗笁鏂逛紶鍥炵殑鏁版嵁鑾峰彇鐨刟tts : {}", jsonArr);
+ for (int j = 0; j < jsonArr.size(); j++) {
+ JSONObject jsonRet = jsonArr.getJSONObject(j);
+ rbDetailFile.setFileid(jsonRet.get("fileUrl").toString());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ parseArray2.add(rbDetailFile);
+ }
+ 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鏂囦欢
@@ -887,4 +927,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