From 4c967fe5bdc96af202c53b63f64f6a23e9599e05 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 20 二月 2024 11:21:17 +0800
Subject: [PATCH] 修改判断
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 77 ++++++++++++++++++++++++++++++++++++--
1 files changed, 72 insertions(+), 5 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 163df46..e1a99fb 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
@@ -1,8 +1,10 @@
package com.ruoyi.web.controller.project;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.NotRepeatCommit;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.HttpStatus;
@@ -13,6 +15,7 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.tax.TaxtUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -238,7 +241,7 @@
@ApiOperation("鏂板璐圭敤鐢宠涓�")
//@PreAuthorize("@ss.hasPermi('project:fund:add')")
@Log(title = "璐圭敤鐢宠涓�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
@Options(useGeneratedKeys = true, keyProperty = "id")
public AjaxResult add(@RequestBody ServiceFund serviceFund) {
@@ -479,6 +482,7 @@
* 瀹℃牳璐圭敤
*/
@ApiOperation("瀹℃牳璐圭敤")
+ @RepeatSubmit
// @Log(title = "瀹℃牳璐圭敤", businessType = BusinessType.OTHER)
@PostMapping("/checkfund")
public AjaxResult checkFund(@RequestBody CheckFundVO checkFundVO) {
@@ -492,7 +496,6 @@
serviceFundflowrule.setApplytype(serviceFund.getApplytype());
serviceFundflowrule.setCheckuserno(loginUser.getUsername());
log.info("serviceFundController---checkFund---queryList鐨勫叆鍙傚�約erviceFundflowrule:{}", serviceFundflowrule);
-
List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
if (serviceFundflowrules == null || serviceFundflowrules.stream().count() == 0) {
@@ -531,6 +534,18 @@
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();
}
//璁板綍涓�涓嬶紝涓嬩竴绾х殑瀹℃壒锛屼互渚夸簬涓嬩竴绾ч��鍥炲悗锛屽彂璧疯�呮彁浜ゆ椂锛岃兘鍐嶆彁鍒板綋鍓嶅鎵瑰眰绾�
@@ -633,6 +648,7 @@
return toAjax(false);
}
for (ServiceFund sf : infoByInfoIdList) {
+ sf.setApplyTime(new Date());
//濡傛灉绛変簬100锛岃鏄庡凡缁忚蛋鍒板尰闄㈣储鍔￠偅杈逛簡锛涜储鍔￠偅杈瑰彇鏁版嵁鏄粠鍒嗕韩琛ㄥ彇锛屾墍浠ワ紝杩欓噷鐩存帴寰�鍒嗕韩琛ㄩ噷娣诲姞鏁版嵁灏辫浜�
if (sf.getBackflowlevel() != null && sf.getBackflowlevel() == 199) {
//灏唂und琛ㄧ殑瀹℃牳鐘舵�佹敼鎴�100
@@ -693,6 +709,7 @@
return toAjax(false);
}
+
/**
* 鍒犻櫎璐圭敤鐢宠涓�
*/
@@ -744,6 +761,7 @@
}
Map<String, Object> map = new HashMap<>();
map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
+ map.put("downloadName", name + ".doc");
return map;
}
@@ -1019,11 +1037,13 @@
}
Map<String, Object> map = new HashMap<>();
map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
+ map.put("downloadName", name + ".doc");
return map;
}
private void getDataSS(Map dataMap, Long id) {
ServiceFund serviceFund = serviceFundService.getById(id);
+ log.info("閫氳繃id鏌ヨ鏁版嵁鐨勭粨鏋滐細{}", serviceFund);
if (serviceFund == null) {
throw new ServiceException("涓嬭浇澶辫触锛岀敤鎴蜂俊鎭嚭閿�", HttpStatus.NO_CONTENT);
}
@@ -1119,11 +1139,13 @@
}
Map<String, Object> map = new HashMap<>();
map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
+ map.put("downloadName", name + ".doc");
return map;
}
private String getDataYX(Map dataMap, Long id) {
ServiceFund serviceFund = serviceFundService.getById(id);
+ log.info("閫氳繃id鑾峰彇鍖诲銆佸姙鍏�佺哗鏁堟垚鏈殑fund淇℃伅涓猴細{}", serviceFund);
if (serviceFund == null) {
throw new ServiceException("涓嬭浇澶辫触锛岀敤鎴蜂俊鎭嚭閿�", HttpStatus.NO_CONTENT);
}
@@ -1149,7 +1171,8 @@
throw new ServiceException("涓嬭浇澶辫触锛屾病鏈夊搴斾俊鎭�", HttpStatus.NO_CONTENT);
}
- Date dt = serviceFund.getCreateTime();
+// Date dt = serviceFund.getCreateTime();
+ Date dt = serviceFund.getApplyTime();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String date = formatter.format(dt);
String time = date.substring(0, 10);
@@ -1166,8 +1189,12 @@
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() + "鏈堜汉浣撳櫒瀹樿幏鍙栨湇鍔＄鐞嗕腑蹇冨伐浣滀汉鍛樼哗鏁�");
+ if (StringUtils.isEmpty(serviceFund.getRemark())) {
+ dataMap.put("FYMC", LocalDate.now().getYear() + "骞�" + LocalDate.now().getMonthValue() + "鏈堜汉浣撳櫒瀹樿幏鍙栨湇鍔＄鐞嗕腑蹇冨伐浣滀汉鍛樼哗鏁�");
+ } else {
+ dataMap.put("FYMC", serviceFund.getRemark().substring(0, serviceFund.getRemark().length() - 2) + "浜轰綋鍣ㄥ畼鑾峰彇鏈嶅姟绠＄悊涓績宸ヤ綔浜哄憳缁╂晥");
+ }
String bz = "";
int i = 0;
if (!serviceFund.getApplytype().equals("5")) {
@@ -1208,7 +1235,11 @@
Map<String, Object> map = new HashMap<String, Object>();
map.put("seqno", 1);
String fyxm = "";
- fyxm += LocalDate.now().getYear() + "骞�" + LocalDate.now().getMonthValue() + "鏈堜汉浣撳櫒瀹樿幏鍙栨湇鍔＄鐞嗕腑蹇冨伐浣滀汉鍛樼哗鏁�,鍏辫";
+ if (StringUtils.isEmpty(serviceFund.getRemark())) {
+ fyxm += LocalDate.now().getYear() + "骞�" + LocalDate.now().getMonthValue() + "鏈堜汉浣撳櫒瀹樿幏鍙栨湇鍔＄鐞嗕腑蹇冨伐浣滀汉鍛樼哗鏁�,鍏辫";
+ } else {
+ fyxm += serviceFund.getRemark().substring(0, serviceFund.getRemark().length() - 2) + "浜轰綋鍣ㄥ畼鑾峰彇鏈嶅姟绠＄悊涓績宸ヤ綔浜哄憳缁╂晥,鍏辫";
+ }
fyxm += serviceFund.getPretaxcost() + "鍏�";
if (serviceFund.getPretaxcost() == null && serviceFund.getPretaxcost() == 0.0) {
fyxm = "";
@@ -1331,6 +1362,7 @@
}
Map<String, Object> map = new HashMap<>();
map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
+ map.put("downloadName", name + ".doc");
return map;
}
@@ -1399,6 +1431,7 @@
}
Map<String, Object> map = new HashMap<>();
map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
+ map.put("downloadName", name + ".doc");
return map;
}
@@ -1898,6 +1931,7 @@
}
Map<String, Object> map = new HashMap<>();
map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
+ map.put("downloadName", name + ".doc");
return map;
}
@@ -1986,6 +2020,7 @@
}
Map<String, Object> map = new HashMap<>();
map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
+ map.put("downloadName", name + ".doc");
return map;
}
@@ -2084,6 +2119,7 @@
/**
* 璐圭敤绫诲瀷璁℃暟
*/
+// @NotRepeatCommit(key = "param:arg[1]", value = 30000)
@ApiOperation("璐圭敤绫诲瀷璁℃暟")
@GetMapping(value = "/countItem/{infoid}/{itemid}")
public AjaxResult countItem(@PathVariable Long infoid, @PathVariable Long itemid) {
@@ -2105,4 +2141,35 @@
return AjaxResult.success(serviceFundService.performance(serviceFundVO));
}
+ /**
+ * 鍚堣涓◣
+ */
+ @NotRepeatCommit(key = "param:arg[1]", value = 30000)
+ @ApiOperation("鍚堣涓◣")
+ @Log(title = "鍚堣涓◣", businessType = BusinessType.INSERT)
+ @PostMapping("/totaltax")
+ public AjaxResult totaltax(@RequestBody TotalTaxVO totalTaxVO) {
+ Map<String, List<ServiceFunddetailExcel>> totaltax = serviceFundService.totaltax(totalTaxVO);
+ if (ObjectUtils.isEmpty(totaltax)) {
+ throw new BaseException("鍚堣涓◣澶辫触");
+ }
+
+ Set<String> strings = totaltax.keySet();
+ String key2 = null;
+ for (String key : strings) {
+ key2 = key;
+ }
+ ExcelUtil<ServiceFunddetailExcel> util = new ExcelUtil<ServiceFunddetailExcel>(ServiceFunddetailExcel.class);
+ AjaxResult ajaxResult = util.exportExcel(totaltax.get(key2), key2);
+ String msg = (String) ajaxResult.get("msg");
+
+ Map dataMap = new HashMap();
+ dataMap.put("downloadUrl", "/profile/download/" + msg);
+ dataMap.put("downloadName", msg);
+
+ return AjaxResult.success(dataMap);
+
+
+ }
+
}
--
Gitblit v1.9.3