From b7cd70a1dc48f2cd2f5ed36d09f92c8ebcc62c8b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 03 十一月 2023 15:20:45 +0800
Subject: [PATCH] 修改审批流程
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 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 115b3f8..89b93c7 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
@@ -6,6 +6,8 @@
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 com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
@@ -23,6 +25,7 @@
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;
@@ -659,8 +662,8 @@
}
@Override
- public List<SpFinancialExpensesFundOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE,Integer CHECKSTATUS) {
- return serviceFundMapper.getListBypower(PAUSERNO, PAFUNDTYPE, PAAPPLICANT, PAAPPLICATIONBEGTIME, PAAPPLICATIONENDTIME, PADEPARTMENT, CHECKFLAG, APPLYTYPE,CHECKSTATUS);
+ public List<SpFinancialExpensesFundOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE, Integer CHECKSTATUS, String donorname) {
+ return serviceFundMapper.getListBypower(PAUSERNO, PAFUNDTYPE, PAAPPLICANT, PAAPPLICATIONBEGTIME, PAAPPLICATIONENDTIME, PADEPARTMENT, CHECKFLAG, APPLYTYPE, CHECKSTATUS, donorname);
}
@Override
@@ -678,7 +681,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public Long addOrUpdateNew(ServiceFundVO serviceFundVO) {
Long id = null;
//灏嗘暟鎹繚瀛樺埌fund琛�
@@ -696,8 +699,8 @@
if (!CollectionUtils.isEmpty(serviceFunddetailVO.getAnnexfilesList())) {
serviceFunddetailVO.setAnnexfiles(JSON.toJSONString(serviceFunddetailVO.getAnnexfilesList()));
}
- if (!CollectionUtils.isEmpty(serviceFunddetailVO.getInvoiceFilesList())) {
- serviceFunddetailVO.setInvoiceFiles(JSON.toJSONString(serviceFunddetailVO.getInvoiceFilesList()));
+ if (!CollectionUtils.isEmpty(serviceFunddetailVO.getInvoicefilesList())) {
+ serviceFunddetailVO.setInvoicefiles(JSON.toJSONString(serviceFunddetailVO.getInvoicefilesList()));
}
ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class);
@@ -747,6 +750,7 @@
return map;
}
+
int uploadOAFileAndUpdateDb(ServiceFunddetailShared remShare) {
//涓婁紶OA鏂囦欢
//String strUrl = "http://129.88.242.39:8899/seeyon/rest/token?userName=opo&password=127814f8-84e8-4304-84a5-a71573567efd&loginName=demo3";
@@ -770,8 +774,24 @@
String filePath = RuoYiConfig.getUploadPath();
String strFUrl = "http://129.88.242.39:8899/seeyon/rest/attachment?token=" + strRes;
List<RbDetailFile> parseArray2 = new ArrayList<>();
+ List<RbDetailFile> invoicefilesList = new ArrayList<>();
+
+ //鏅�氶檮浠�
List<RbDetailFile> parseArray = JSON.parseArray(remShare.getAnnexfiles(), RbDetailFile.class);
- log.info("parseArray鐨勫�� : {}", parseArray);
+ //鍙戠エ闄勪欢
+ List<RbDetailFile> invoicefilesArray = JSON.parseArray(remShare.getInvoicefiles(), RbDetailFile.class);
+ log.info("parseArray鐨勫�� : {}, invoicefilesArray鐨勫�� : {},", parseArray, invoicefilesArray);
+
+ //鏅�氶檮浠�
+ uploadFile(filePath, strFUrl, parseArray2, parseArray, remShare, "1");
+
+ //鍙戠エ闄勪欢
+ uploadFile(filePath, strFUrl, invoicefilesList, invoicefilesArray, remShare, "2");
+ return 0;
+ }
+
+
+ private Integer uploadFile(String filePath, String strFUrl, List<RbDetailFile> parseArray2, List<RbDetailFile> parseArray, ServiceFunddetailShared remShare, String flag) {
if (!CollectionUtils.isEmpty(parseArray)) {
for (int i = 0; i < parseArray.size(); i++) {
RbDetailFile rbDetailFile = parseArray.get(i);
@@ -787,7 +807,7 @@
String struploadResult = HttpClientKit.sendPostWithFile(filetest, strFUrl);
log.info("绗笁鏂逛紶鍥炵殑鏁版嵁: {}", struploadResult);
if (StringUtils.isEmpty(struploadResult)) {
- log.info("HttpClientKit.sendPostWithFile 璇锋眰涓虹┖浜� filetest:{}, strFUrl:{} ", filetest, strFUrl);
+ log.error("HttpClientKit.sendPostWithFile 璇锋眰涓虹┖浜� filetest:{}, strFUrl:{} ", filetest, strFUrl);
return 0;
}
//鑾峰彇fileid
@@ -803,12 +823,17 @@
}
parseArray2.add(rbDetailFile);
}
- remShare.setAnnexfiles(JSON.toJSONString(parseArray2));
+ if (flag.equals("1")) {
+ //濡傛灉flag涓�1,鍒欐槸鏅��
+ remShare.setAnnexfiles(JSON.toJSONString(parseArray2));
+ } else if (flag.equals("2")) {
+ //濡傛灉flag涓�2,鍒欐槸鍙戠エ
+ remShare.setInvoicefiles(JSON.toJSONString(parseArray2));
+ }
log.info("ServiceReimbursementdetailShared 鏄惁鍔犱笂浜唂ileid : {}", remShare);
}
return 0;
}
-
// int uploadOAFileAndUpdateDb(ServiceFundShared remShare) {
// //涓婁紶OA鏂囦欢
--
Gitblit v1.9.3