From dc0ce40d1ae331a054017ae322da930f07094f52 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 08 十一月 2023 16:33:53 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 149 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 111 insertions(+), 38 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 0e26b67..c457492 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
@@ -42,6 +42,7 @@
import java.io.*;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
@@ -143,6 +144,9 @@
Integer checkstatus = spFinancialExpensesIn.getCheckstatus();
String donorname = spFinancialExpensesIn.getDonorname();
+ if (StringUtils.isEmpty(donorname)) {
+ donorname = null;
+ }
if (pageNum == null) {
pageNum = 1;
}
@@ -519,6 +523,28 @@
}
}
FlowLevel = FlowLevel + 1;
+
+ if (serviceFund.getFlowlevel() == 1 && serviceFund.getBackflowlevel() == 100) {
+ log.info("璐㈠姟閫�鍥炲啀鎻愪氦锛屽嚭绾冲啀娆″鎵癸紝涔嬪悗鎻愪氦鍒拌储鍔�");
+ //璇存槑鏄储鍔￠��鍥炲啀鎻愪氦鐨�.闇�瑕佸嚭绾冲啀鐪嬩竴閬嶏紝娌￠棶棰樹箣鍚庯紝寰�鍒嗕韩琛ㄩ噷鏂板
+ serviceFundService.addFundSharedInfo(serviceFund.getId());
+ serviceFund.setFlowlevel(100L);
+ serviceFund.setRecordstatus(99);
+ serviceFundService.updateById(serviceFund);
+
+ //淇濆瓨瀹℃壒娴佺▼琛�
+ ServiceFundflow serviceFundflow = new ServiceFundflow();
+ SysUser user = loginUser.getUser();
+ serviceFundflow.setFundid(serviceFund.getId());
+ serviceFundflow.setCheckuserno(user.getUserName());
+ serviceFundflow.setCheckusername(user.getNickName());
+ serviceFundflow.setFundtype(2);
+ serviceFundflow.setApplytype(serviceFund.getApplytype());
+ serviceFundflow.setFlowconclusion(CheckFlag);
+ serviceFundflow.setFlowcontent("閫氳繃");
+ Boolean aBoolean = serviceFundflowService.saveData(serviceFundflow);
+ return AjaxResult.success();
+ }
//璁板綍涓�涓嬶紝涓嬩竴绾х殑瀹℃壒锛屼互渚夸簬涓嬩竴绾ч��鍥炲悗锛屽彂璧疯�呮彁浜ゆ椂锛岃兘鍐嶆彁鍒板綋鍓嶅鎵瑰眰绾�
serviceFund.setBackflowlevel(FlowLevel);
} else {
@@ -623,12 +649,27 @@
if (sf.getBackflowlevel() != null && sf.getBackflowlevel() == 199) {
//灏唂und琛ㄧ殑瀹℃牳鐘舵�佹敼鎴�100
sf.setBackflowlevel(100);
+
+ //閫�鍥炲啀鎻愪氦锛岄渶瑕佸啀鍒板嚭绾抽偅閲�
+ sf.setFlowlevel(1L);
+ sf.setRecordstatus(0);
serviceFundService.updateById(sf);
- //寰�鍒嗕韩琛ㄩ噷鏂板
- serviceFundService.addFundSharedInfo(serviceFund.getId());
+// //寰�鍒嗕韩琛ㄩ噷鏂板
+// serviceFundService.addFundSharedInfo(serviceFund.getId());
return success();
+ } else if (sf.getBackflowlevel() != null && sf.getBackflowlevel() == 100) {
+ //璐㈠姟閫�鍥炵殑鏁版嵁鍐嶆彁浜わ紝鍒板嚭绾抽偅閲屾病鏈夎繃锛屽啀閫�鍥烇紝瀵艰嚧backflowlevel鏄�100,
+ //閫�鍥炲啀鎻愪氦锛岄渶瑕佸啀鍒板嚭绾抽偅閲�
+ sf.setFlowlevel(1L);
+ sf.setRecordstatus(2);
+ serviceFundService.updateById(sf);
+ } else if (sf.getBackflowlevel() != null && sf.getBackflowlevel() == 2) {
+ //鑱傜閫�鍥炵殑锛屼篃闇�瑕佸厛鍒板嚭绾抽偅閲�
+ sf.setFlowlevel(1L);
+ sf.setRecordstatus(2);
+ serviceFundService.updateById(sf);
} else {
Integer TotalLevel = 0;
@@ -1137,51 +1178,67 @@
dataMap.put("YWZ", serviceFund.getDeptmentname() == null ? "" : serviceFund.getDeptmentname());
dataMap.put("ZHUZANG", serviceFund.getManagername() == null ? "" : serviceFund.getManagername());
+ dataMap.put("FYMC", LocalDate.now().getYear() + "骞�" + LocalDate.now().getMonthValue() + "鏈堜汉浣撳櫒瀹樿幏鍙栨湇鍔＄鐞嗕腑蹇冨伐浣滀汉鍛樼哗鏁�");
+
String bz = "";
int i = 0;
- for (ServiceFunddetail f : fd) {
- seqno++;
+ if (!serviceFund.getApplytype().equals("5")) {
+ for (ServiceFunddetail f : fd) {
+ seqno++;
+ Map<String, Object> map = new HashMap<String, Object>();
+ map.put("seqno", seqno);
+
+ //濡傛灉鏄尰鐤楁垚鏈紝鍒欐妸閾惰鍗″姞涓婃瘡鏉℃槑缁嗙殑鍚庨潰
+ if (serviceFund.getApplytype().equals("3")) {
+ i = i + 1;
+ bz += f.getBeneficiaryname() == null ? "(" + i + ")" : "(" + i + ")" + f.getBeneficiaryname() + "锛�";
+ bz += "閲戦 : " + f.getAmount() + "鍏�" + "锛�";
+ bz += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
+ bz += f.getBankcardno() == null ? "" : f.getBankcardno();
+ bz += "<w:br/>";
+ }
+ if (serviceFund.getApplytype().equals("4")) {
+ i = i + 1;
+ bz += f.getBeneficiaryname() == null ? "(" + i + ")" : "(" + i + ")" + f.getBeneficiaryname() + "锛�";
+ bz += "閲戦 : " + f.getAmount() + "鍏�" + "锛�";
+ bz += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
+ bz += f.getBankcardno() == null ? "" : f.getBankcardno();
+ bz += "<w:br/>";
+ }
+
+
+ String fyxm = "";
+ fyxm += f.getItemname() == null ? "" : f.getItemname();
+ fyxm += f.getAmount() + "鍏�";
+ if (f.getItemname() == null && f.getAmount() == 0.0) {
+ fyxm = "";
+ }
+ map.put("FYXM", fyxm);
+ newList.add(map);
+ }
+ } else {
Map<String, Object> map = new HashMap<String, Object>();
- map.put("seqno", seqno);
-// String fyxm = "";
-// fyxm += f.getItemname() == null ? "" : f.getItemname();
-// fyxm += f.getAmount() + "鍏�";
-// //濡傛灉鏄尰鐤楁垚鏈紝鍒欐妸閾惰鍗″姞涓婃瘡鏉℃槑缁嗙殑鍚庨潰
-// 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 += ")";
-// }
-
- //濡傛灉鏄尰鐤楁垚鏈紝鍒欐妸閾惰鍗″姞涓婃瘡鏉℃槑缁嗙殑鍚庨潰
- if (serviceFund.getApplytype().equals("3")) {
- i = i + 1;
- bz += f.getBeneficiaryname() == null ? "(" + i + ")" : "(" + i + ")" + f.getBeneficiaryname() + "锛�";
- bz += "閲戦 : " + f.getAmount() + "鍏�" + "锛�";
- bz += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
- bz += f.getBankcardno() == null ? "" : f.getBankcardno();
- bz += "<w:br/>";
- }
- if (serviceFund.getApplytype().equals("4")) {
- i = i + 1;
- bz += f.getBeneficiaryname() == null ? "(" + i + ")" : "(" + i + ")" + f.getBeneficiaryname() + "锛�";
- bz += "閲戦 : " + f.getAmount() + "鍏�" + "锛�";
- bz += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
- bz += f.getBankcardno() == null ? "" : f.getBankcardno();
- bz += "<w:br/>";
- }
-
+ map.put("seqno", 1);
String fyxm = "";
- fyxm += f.getItemname() == null ? "" : f.getItemname();
- fyxm += f.getAmount() + "鍏�";
- if (f.getItemname() == null && f.getAmount() == 0.0) {
+ fyxm += LocalDate.now().getYear() + "骞�" + LocalDate.now().getMonthValue() + "鏈堜汉浣撳櫒瀹樿幏鍙栨湇鍔＄鐞嗕腑蹇冨伐浣滀汉鍛樼哗鏁�,鍏辫";
+ fyxm += serviceFund.getPretaxcost() + "鍏�";
+ if (serviceFund.getPretaxcost() == null && serviceFund.getPretaxcost() == 0.0) {
fyxm = "";
}
map.put("FYXM", fyxm);
newList.add(map);
+ Map<String, Object> objectObjectHashMap = new HashMap<>();
+ objectObjectHashMap.put("seqno", 2);
+ objectObjectHashMap.put("FYXM", "");
+ newList.add(objectObjectHashMap);
+
+ Map<String, Object> objectObjectHashMap2 = new HashMap<>();
+ objectObjectHashMap2.put("seqno", 3);
+ objectObjectHashMap2.put("FYXM", "");
+ newList.add(objectObjectHashMap2);
}
+
+
//鍚堝苟鍗曞厓鏍�
checkList(newList);
dataMap.put("items", newList);
@@ -2060,4 +2117,20 @@
return AjaxResult.success(serviceFundService.performance(serviceFundVO));
}
+ /**
+ * 鍚堣涓◣
+ */
+ @ApiOperation("鍚堣涓◣")
+ @Log(title = "鍚堣涓◣", businessType = BusinessType.INSERT)
+ @PostMapping("/totaltax")
+ @RepeatSubmit
+ public AjaxResult totaltax(@RequestBody TotalTaxVO totalTaxVO) {
+ Boolean totaltax = serviceFundService.totaltax(totalTaxVO);
+ if(totaltax){
+ return AjaxResult.success("鍚堣涓◣鎴愬姛,璇峰幓E:\\OPO\\WEB\\Upload\\download 涓煡鎵炬枃浠�");
+ }
+
+ return AjaxResult.success("鍚堣澶辫触锛岃绋嶅悗閲嶈瘯");
+ }
+
}
--
Gitblit v1.9.3