From 4c42cd3d556ea72d70ea43a734cc38acd6b81e74 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 15 三月 2024 18:26:43 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 78 ++++++++++++++++++++++++---------------
1 files changed, 48 insertions(+), 30 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 5288147..1734a45 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
@@ -88,6 +88,9 @@
if (serviceFund.getId() != null) {
wrappers.eq(ServiceFund::getId, serviceFund.getId());
}
+ if (serviceFund.getFundTaxId() != null) {
+ wrappers.eq(ServiceFund::getFundTaxId, serviceFund.getFundTaxId());
+ }
if (StringUtils.isNotBlank(serviceFund.getUserno())) {
wrappers.eq(ServiceFund::getUserno, serviceFund.getUserno());
}
@@ -109,8 +112,14 @@
if (serviceFund.getUploadtime() != null) {
wrappers.eq(ServiceFund::getUploadtime, serviceFund.getUploadtime());
}
+ if (serviceFund.getUploadStates() != null) {
+ wrappers.eq(ServiceFund::getUploadStates, serviceFund.getUploadStates());
+ }
if (serviceFund.getFlowlevel() != null) {
wrappers.eq(ServiceFund::getFlowlevel, serviceFund.getFlowlevel());
+ }
+ if (serviceFund.getJxrq() != null) {
+ wrappers.eq(ServiceFund::getJxrq, serviceFund.getJxrq());
}
return this.list(wrappers);
}
@@ -678,6 +687,11 @@
}
@Override
+ public List<SpFinancialExpensesFundOut> getExpertfeeList(SpSelectExpertfee spSelectExpertfee) {
+ return serviceFundMapper.getExpertfeeList(spSelectExpertfee.getPaApplyType(), spSelectExpertfee.getDonorname(), spSelectExpertfee.getPacheckno(), spSelectExpertfee.getCheckstatus(), spSelectExpertfee.getPadepartno(), spSelectExpertfee.getPausername());
+ }
+
+ @Override
public int countItem(Long infoid, Long itemid) {
List<ServiceFund> serviceFunds = serviceFundMapper.getInfoByInfoId(infoid);
int count = 0;
@@ -695,43 +709,47 @@
public Long addOrUpdateNew(ServiceFundVO serviceFundVO) {
Long id = null;
//灏嗘暟鎹繚瀛樺埌fund琛�
+ serviceFundVO.setUploadStates(0);
id = saveFund(serviceFundVO);
List<ServiceFunddetailVO> serviceFunddetails = serviceFundVO.getServiceFunddetails();
- if (CollectionUtils.isEmpty(serviceFunddetails)) {
- throw new BaseException("serviceFunddetails涓虹┖鍠�");
- }
BigDecimal bigDecimal = new BigDecimal(0.0);
- // 淇濆瓨璇︽儏鏁版嵁
- for (ServiceFunddetailVO serviceFunddetailVO : serviceFunddetails) {
+ if (!CollectionUtils.isEmpty(serviceFunddetails)) {
- if (StringUtils.isEmpty(serviceFunddetailVO.getBankcardno())) {
- throw new BaseException("璇锋鏌ラ摱琛屽崱鍙锋槸鍚︿负绌�,濮撳悕锛�" + serviceFunddetailVO.getBeneficiaryname());
+ // 淇濆瓨璇︽儏鏁版嵁
+ for (ServiceFunddetailVO serviceFunddetailVO : serviceFunddetails) {
+ //鍘绘帀韬唤璇佺殑棣栧熬绌烘牸
+ if (StringUtils.isNotEmpty(serviceFunddetailVO.getIdcardno())) {
+ serviceFunddetailVO.setIdcardno(serviceFunddetailVO.getIdcardno().trim());
+ }
+
+ if (StringUtils.isEmpty(serviceFunddetailVO.getBankcardno())) {
+ throw new BaseException("璇锋鏌ラ摱琛屽崱鍙锋槸鍚︿负绌�,濮撳悕锛�" + serviceFunddetailVO.getBeneficiaryname());
+ }
+ serviceFunddetailVO.setFundid(id);
+ //灏囬檮浠惰浆鎴恓son
+ if (!CollectionUtils.isEmpty(serviceFunddetailVO.getAnnexfilesList())) {
+ serviceFunddetailVO.setAnnexfiles(JSON.toJSONString(serviceFunddetailVO.getAnnexfilesList()));
+ } else {
+ serviceFunddetailVO.setAnnexfiles(null);
+ }
+ if (!CollectionUtils.isEmpty(serviceFunddetailVO.getInvoicefilesList())) {
+ serviceFunddetailVO.setInvoicefiles(JSON.toJSONString(serviceFunddetailVO.getInvoicefilesList()));
+ } else {
+ serviceFunddetailVO.setInvoicefiles(null);
+ }
+ ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class);
+
+ if (serviceFunddetailVO.getId() == null) {
+ serviceFunddetailService.save(serviceFunddetail);
+ } else {
+ serviceFunddetailService.updateById(serviceFunddetail);
+ }
+
+ bigDecimal = bigDecimal.add(BigDecimal.valueOf(serviceFunddetailVO.getAmount()));
+
}
- serviceFunddetailVO.setFundid(id);
- //灏囬檮浠惰浆鎴恓son
- if (!CollectionUtils.isEmpty(serviceFunddetailVO.getAnnexfilesList())) {
- serviceFunddetailVO.setAnnexfiles(JSON.toJSONString(serviceFunddetailVO.getAnnexfilesList()));
- } else {
- serviceFunddetailVO.setAnnexfiles(null);
- }
- if (!CollectionUtils.isEmpty(serviceFunddetailVO.getInvoicefilesList())) {
- serviceFunddetailVO.setInvoicefiles(JSON.toJSONString(serviceFunddetailVO.getInvoicefilesList()));
- } else {
- serviceFunddetailVO.setInvoicefiles(null);
- }
- ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class);
-
- if (serviceFunddetailVO.getId() == null) {
- serviceFunddetailService.save(serviceFunddetail);
- } else {
- serviceFunddetailService.updateById(serviceFunddetail);
- }
-
- bigDecimal = bigDecimal.add(BigDecimal.valueOf(serviceFunddetailVO.getAmount()));
-
-
}
serviceFundVO.setPretaxcost(bigDecimal.doubleValue());
serviceFundMapper.updateById(serviceFundVO);
--
Gitblit v1.9.3