From 52df965c9cbaa015520b4379393a0041eb9ae8da Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 23 二月 2024 18:46:36 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 83f25d9..758c8cc 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
@@ -109,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());
}
@@ -145,6 +148,7 @@
//鍒ゆ柇涓�涓嬶紝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;
@@ -704,6 +708,10 @@
BigDecimal bigDecimal = new BigDecimal(0.0);
// 淇濆瓨璇︽儏鏁版嵁
for (ServiceFunddetailVO serviceFunddetailVO : serviceFunddetails) {
+ //鍘绘帀韬唤璇佺殑棣栧熬绌烘牸
+ if (StringUtils.isNotEmpty(serviceFunddetailVO.getIdcardno())) {
+ serviceFunddetailVO.setIdcardno(serviceFunddetailVO.getIdcardno().trim());
+ }
if (StringUtils.isEmpty(serviceFunddetailVO.getBankcardno())) {
throw new BaseException("璇锋鏌ラ摱琛屽崱鍙锋槸鍚︿负绌�,濮撳悕锛�" + serviceFunddetailVO.getBeneficiaryname());
@@ -712,9 +720,13 @@
//灏囬檮浠惰浆鎴恓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);
--
Gitblit v1.9.3