From 517ecf9879052b2f3fbad25c0469935cc45553a7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 25 七月 2024 18:24:24 +0800
Subject: [PATCH] 变更
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 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 37b6adb..8476f07 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
@@ -77,6 +77,9 @@
private VExpertfeeExpertMapper vExpertfeeExpertMapper;
@Autowired
+ private VExpertfeeDonorMapper vExpertfeeDonorMapper;
+
+ @Autowired
private VExpertfeeTotalMapper vExpertfeeTotalMapper;
@@ -189,7 +192,8 @@
try {
uploadOAFileAndUpdateDb(serviceFunddetailShareds.get(i));
} catch (Exception e) {
- log.error("Exception涓叆鍙傜殑ID涓猴細{}", id);
+ e.printStackTrace();
+ log.error("Exception涓叆鍙傜殑ID涓猴細{},寮傚父淇℃伅涓� 锛� {}", id, e.getMessage());
if (id != null) {
Boolean aBoolean = sharedService.delfundsharedInfoById(null, id);
log.error("fund2鍒嗕韩琛ㄩ噷鐨勬暟鎹槸鍚﹀垹闄ゆ垚鍔燂細{}", aBoolean);
@@ -704,7 +708,8 @@
@Override
public List<SpFinancialExpensesFundOut> getExpertfeeList(SpSelectExpertfee spSelectExpertfee) {
- return serviceFundMapper.getExpertfeeList(spSelectExpertfee.getPaApplyType(), spSelectExpertfee.getDonorname(), spSelectExpertfee.getPacheckno(), spSelectExpertfee.getCheckstatus(), spSelectExpertfee.getPadepartno(), spSelectExpertfee.getPausername());
+ log.info("spSelectExpertfee鐨勫叆鍙備负锛歿}", spSelectExpertfee);
+ return serviceFundMapper.getExpertfeeList(spSelectExpertfee.getPaApplyType(), spSelectExpertfee.getPfundtaxid(), spSelectExpertfee.getDonorname(), spSelectExpertfee.getPadepartid(), spSelectExpertfee.getPausername());
}
@Override
@@ -739,7 +744,7 @@
if (StringUtils.isNotEmpty(serviceFunddetailVO.getIdcardno())) {
serviceFunddetailVO.setIdcardno(serviceFunddetailVO.getIdcardno().trim());
}
-
+ log.info("韬唤璇佸彿涓猴細{}", serviceFunddetailVO.getIdcardno());
if (StringUtils.isEmpty(serviceFunddetailVO.getBankcardno())) {
throw new BaseException("璇锋鏌ラ摱琛屽崱鍙锋槸鍚︿负绌�,濮撳悕锛�" + serviceFunddetailVO.getBeneficiaryname());
}
@@ -929,13 +934,18 @@
AjaxResult ajaxResult = util.exportExcel(list, "vExpertfeeTotal");
String filePath = RuoYiConfig.getDownloadPath() + ajaxResult.get("msg");
- List<VExpertfeeExpert> list2 = vExpertfeeExpertMapper.selectVExpertfeeExpertListByFaxId(faxId);
- ExcelUtil<VExpertfeeExpert> util2 = new ExcelUtil<VExpertfeeExpert>(VExpertfeeExpert.class);
- AjaxResult ajaxResult1 = util2.exportExcel(list2, "vExpertfeeExpert");
+ List<VExpertfeeDonor> list2 = vExpertfeeDonorMapper.selectVExpertfeeDonorList2(faxId);
+ ExcelUtil<VExpertfeeDonor> util2 = new ExcelUtil<VExpertfeeDonor>(VExpertfeeDonor.class);
+ AjaxResult ajaxResult2 = util2.exportExcel(list2, "VExpertfeeDonor");
+
+ List<VExpertfeeExpert> list3 = vExpertfeeExpertMapper.selectVExpertfeeExpertListByFaxId(faxId);
+ ExcelUtil<VExpertfeeExpert> util3 = new ExcelUtil<VExpertfeeExpert>(VExpertfeeExpert.class);
+ AjaxResult ajaxResult3 = util3.exportExcel(list3, "vExpertfeeExpert");
List<String> list1 = new ArrayList<>();
list1.add(ajaxResult.get("msg").toString());
- list1.add(ajaxResult1.get("msg").toString());
+ list1.add(ajaxResult2.get("msg").toString());
+ list1.add(ajaxResult3.get("msg").toString());
String name = "涓撳璐规眹鎬诲崟" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xlsx";
@@ -1014,6 +1024,9 @@
log.info("绗笁鏂逛紶鍥炵殑鏁版嵁鑾峰彇鐨刟tts : {}", jsonArr);
for (int j = 0; j < jsonArr.size(); j++) {
JSONObject jsonRet = jsonArr.getJSONObject(j);
+ if (StringUtils.isEmpty(jsonRet.get("fileUrl").toString())) {
+ throw new BaseException("fileID涓虹┖,璇疯仈绯荤涓夋柟澶勭悊");
+ }
rbDetailFile.setFileid(jsonRet.get("fileUrl").toString());
}
@@ -1177,6 +1190,13 @@
@Transactional(rollbackFor = Exception.class)
public Boolean updateFundTaxIdById(Long id, Long fundTaxId) {
- return serviceFundMapper.updateFundTaxIdById(id, fundTaxId);
+ //灏唂und閲岀殑绠楃◣鏃堕棿锛屼笌璇︽儏閲岀殑鐗堢◣鏃堕棿鍏ㄦ竻绌�
+ Boolean aBoolean = serviceFundMapper.updateFundTaxIdById(id, fundTaxId);
+ ServiceFunddetail serviceFunddetail = new ServiceFunddetail();
+ serviceFunddetail.setFundid(id);
+ serviceFunddetail.setTaxTime(null);
+ serviceFunddetail.setXh(null);
+ boolean b = serviceFunddetailMapper.updateTaxTime(serviceFunddetail);
+ return b;
}
}
--
Gitblit v1.9.3