From 5f265641217e0a2b5b8160233487e63ff8cfaf39 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 07 九月 2023 14:14:35 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
index 69f9cbe..fcf79de 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -19,6 +19,7 @@
import com.ruoyi.project.domain.vo.*;
import com.ruoyi.project.mapper.ServiceFunddetailMapper;
import com.ruoyi.project.service.*;
+import com.ruoyi.system.service.ISysPostService;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
@@ -78,6 +79,9 @@
@Autowired
private IServiceExternalpersonService externalpersonService;
+
+ @Autowired
+ private ISysPostService postService;
public ServiceFundController() {
@@ -144,6 +148,11 @@
//startPage();
List<SpFinancialExpensesFundOut> list = serviceFundService.getListBypower(loginUser.getUsername(), 2, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE);
+ //閫氳繃鎹愮尞鑰呰繃婊�
+ if (StringUtils.isNotEmpty(spFinancialExpensesIn.getDonorname())) {
+ list = list.stream().filter(obj -> obj.getDonorname().contains(spFinancialExpensesIn.getDonorname())).collect(Collectors.toList());
+ }
+
Collections.sort(list, new Comparator<SpFinancialExpensesFundOut>() {
@Override
public int compare(SpFinancialExpensesFundOut o1, SpFinancialExpensesFundOut o2) {
@@ -558,10 +567,10 @@
/**
- * 淇敼璐圭敤鐢宠
+ * 璐圭敤涓婃姤
*/
- @ApiOperation("淇敼璐圭敤鐢宠")
- @Log(title = "璐圭敤鐢宠涓�", businessType = BusinessType.UPDATE)
+ @ApiOperation("璐圭敤涓婃姤")
+ @Log(title = "璐圭敤涓婃姤", businessType = BusinessType.UPDATE)
@PostMapping("/fundEdit")
@RepeatSubmit
public AjaxResult fundEdit(@RequestBody ServiceFund serviceFund) {
@@ -573,7 +582,7 @@
}
for (ServiceFund sf : infoByInfoIdList) {
//濡傛灉绛変簬100锛岃鏄庡凡缁忚蛋鍒板尰闄㈣储鍔￠偅杈逛簡锛涜储鍔￠偅杈瑰彇鏁版嵁鏄粠鍒嗕韩琛ㄥ彇锛屾墍浠ワ紝杩欓噷鐩存帴寰�鍒嗕韩琛ㄩ噷娣诲姞鏁版嵁灏辫浜�
- if (sf.getBackflowlevel() == 199) {
+ if (sf.getBackflowlevel() != null && sf.getBackflowlevel() == 199) {
//灏唂und琛ㄧ殑瀹℃牳鐘舵�佹敼鎴�100
sf.setBackflowlevel(100);
serviceFundService.updateById(sf);
@@ -583,7 +592,30 @@
return success();
} else {
- serviceFund.setFlowlevel(sf.getBackflowlevel());
+
+ Integer TotalLevel = 0;
+ LoginUser loginUser = getLoginUser();
+ SysUser user = loginUser.getUser();
+ List<Integer> postids = postService.selectPostListByUserId(loginUser.getUserId());
+ if (!postids.contains(2)) {
+ serviceFund.setRecordstatus(2);
+ if (serviceFund.getBackflowlevel() != null) {
+ serviceFund.setFlowlevel(serviceFund.getBackflowlevel());
+ } else {
+ serviceFund.setBackflowlevel(1);
+ serviceFund.setFlowlevel(1);
+ }
+ } else {
+ serviceFund.setRecordstatus(0);
+ if (serviceFund.getBackflowlevel() != null) {
+ serviceFund.setFlowlevel(serviceFund.getBackflowlevel());
+ } else {
+ serviceFund.setFlowlevel(0);
+ serviceFund.setBackflowlevel(0);
+ }
+
+ }
+ // serviceFund.setFlowlevel(sf.getBackflowlevel());
boolean bret = serviceFundService.updateById(serviceFund);
log.info("serviceFundService.updateById杩斿弬:{}", bret);
@@ -1055,11 +1087,14 @@
String fyxm = "";
fyxm += f.getItemname() == null ? "" : f.getItemname();
fyxm += f.getAmount() + "鍏�";
-// fyxm += "(";
-// fyxm += f.getUnitname() == null ? "" : f.getUnitname() + ";";
-// fyxm += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
-// fyxm += f.getBankcardno() == null ? "" : f.getBankcardno();
-// fyxm += ")";
+ //濡傛灉鏄尰鐤楁垚鏈紝鍒欐妸閾惰鍗″姞涓婃瘡鏉℃槑缁嗙殑鍚庨潰
+ if (serviceFund.getApplytype().equals("3")) {
+ fyxm += "(";
+ fyxm += f.getUnitname() == null ? "" : f.getUnitname() + ";";
+ fyxm += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
+ fyxm += f.getBankcardno() == null ? "" : f.getBankcardno();
+ fyxm += ")";
+ }
map.put("FYXM", fyxm);
newList.add(map);
}
@@ -1072,7 +1107,8 @@
// dataMap.put("JEXS", serviceFund.getAmountrequested());
// dataMap.put("JEDS", convert(serviceFund.getAmountrequested()) + "鏁�");
//澶囨敞閲屾斁鐨勬槸缁忓姙浜虹殑閾惰鍗′俊鎭�
- dataMap.put("BXBZ", infoByUserNo == null ? "" : infoByUserNo.getBranchbankname() + " " + infoByUserNo.getBankcardno());
+
+ dataMap.put("BXBZ", serviceFund.getApplytype().equals("3") ? "" : infoByUserNo == null ? "" : infoByUserNo.getBranchbankname() + " " + infoByUserNo.getBankcardno());
dataMap.put("YZ", serviceFund.getPresident() == null ? "" : serviceFund.getPresident());
dataMap.put("CWFYZ", serviceFund.getFinvicepresident() == null ? "" : serviceFund.getFinvicepresident());
dataMap.put("YWFYZ", serviceFund.getBusvicepresident() == null ? "" : serviceFund.getBusvicepresident());
@@ -1926,6 +1962,5 @@
return AjaxResult.success(serviceFundService.countItem(infoid, itemid));
}
-
}
--
Gitblit v1.9.3