From 96f982f2c64343514cebc05b6c45715a5ac7ce9c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 11 三月 2024 10:26:15 +0800
Subject: [PATCH] 错误修改
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 77 ++++++++++++++++++++++++--------------
1 files changed, 49 insertions(+), 28 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 76c4855..0c78571 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
@@ -11,6 +11,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.annotation.NotRepeatCommit;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.ChineseUtils;
@@ -108,6 +109,9 @@
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());
}
@@ -138,8 +142,18 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public Boolean addFundSharedInfo(Long id) {
+ log.info("fund琛ㄧ殑id锛歿}", id);
+ //鍒ゆ柇涓�涓嬶紝share琛ㄦ槸鍚﹀凡缁忓瓨鍦ㄤ簡
+ Map<String, Object> map = new HashMap<>();
+ map.put("serfunid", id);
+ map.put("del_flag", 0);
+ List<ServiceFundShared> serviceFundSharedList = serviceFundSharedMapper.selectByMap(map);
+ if (!CollectionUtils.isEmpty(serviceFundSharedList)) {
+ return true;
+ }
+
ServiceFund serviceFund = serviceFundMapper.selectById(id);
ServiceFundShared serviceFundShared = DtoConversionUtils.sourceToTarget(serviceFund, ServiceFundShared.class);
serviceFundShared.setSerfunid(serviceFundShared.getId());
@@ -669,7 +683,6 @@
@Override
public int countItem(Long infoid, Long itemid) {
List<ServiceFund> serviceFunds = serviceFundMapper.getInfoByInfoId(infoid);
-
int count = 0;
for (ServiceFund s : serviceFunds) {
long fundid = s.getId();
@@ -685,39 +698,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()));
- }
- if (!CollectionUtils.isEmpty(serviceFunddetailVO.getInvoicefilesList())) {
- serviceFunddetailVO.setInvoicefiles(JSON.toJSONString(serviceFunddetailVO.getInvoicefilesList()));
- }
- 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