From 6f344e6360751574f7e03b21c00cfa3f4b2bc099 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 10 十一月 2023 15:41:41 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 aaf94e9..2e2f0b6 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
@@ -1,13 +1,10 @@
package com.ruoyi.project.service.impl;
import java.io.File;
-import java.math.BigDecimal;
import java.util.ArrayList;
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 java.util.stream.Collectors;
import com.alibaba.fastjson.JSON;
@@ -15,7 +12,7 @@
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.common.tax.TaxtUtils;
+import com.ruoyi.common.utils.ChineseUtils;
import com.ruoyi.common.utils.HttpClientKit;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -28,7 +25,6 @@
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;
@@ -692,11 +688,19 @@
List<ServiceFunddetailVO> serviceFunddetails = serviceFundVO.getServiceFunddetails();
if (CollectionUtils.isEmpty(serviceFunddetails)) {
- System.out.println("serviceFunddetails涓虹┖鍠�");
- return null;
+ throw new BaseException("serviceFunddetails涓虹┖鍠�");
}
// 淇濆瓨璇︽儏鏁版嵁
for (ServiceFunddetailVO serviceFunddetailVO : serviceFunddetails) {
+ if (StringUtils.isEmpty(serviceFunddetailVO.getIdcardno())) {
+ throw new BaseException("璇锋鏌ヨ韩浠借瘉鍙�,韬唤璇佸彿涓虹┖浜�,濮撳悕锛�" + serviceFunddetailVO.getBeneficiaryname());
+ }
+ if (StringUtils.isEmpty(serviceFunddetailVO.getTitle()) || ChineseUtils.isChinese(serviceFunddetailVO.getTitle())) {
+ throw new BaseException("璇锋鏌ヨ亴绉版槸鍚︿负绌猴紙鎴栦笉鏄腑鏂囷級,濮撳悕锛�" + serviceFunddetailVO.getBeneficiaryname() + " 鑱岀О:" + serviceFunddetailVO.getTitle());
+ }
+ if (StringUtils.isEmpty(serviceFunddetailVO.getBankcardno())) {
+ throw new BaseException("璇锋鏌ラ摱琛屽崱鍙锋槸鍚︿负绌�,濮撳悕锛�" + serviceFunddetailVO.getBeneficiaryname());
+ }
serviceFunddetailVO.setFundid(id);
//灏囬檮浠惰浆鎴恓son
if (!CollectionUtils.isEmpty(serviceFunddetailVO.getAnnexfilesList())) {
--
Gitblit v1.9.3