From 4c42cd3d556ea72d70ea43a734cc38acd6b81e74 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 15 三月 2024 18:26:43 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 368 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 301 insertions(+), 67 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 493efff..897976f 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,6 +1,8 @@
package com.ruoyi.web.controller.project;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
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;
@@ -11,7 +13,7 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.tax.TaxtUtils;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
@@ -21,6 +23,7 @@
import com.ruoyi.project.mapper.ServiceFunddetailMapper;
import com.ruoyi.project.service.*;
import com.ruoyi.system.service.ISysPostService;
+import com.ruoyi.system.service.ISysUserService;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
@@ -29,13 +32,17 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Options;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.transaction.TransactionDefinition;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.io.*;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import static com.ruoyi.web.controller.project.ServiceReimbursementController.convert;
@@ -76,7 +83,7 @@
private IServiceSystemmessageService ServiceSystemmessage;
@Autowired
- private IServiceFundSharedService fundServiceShare;
+ private IBaseOnlyvalueService baseOnlyvalueService;
@Autowired
private IServiceExternalpersonService externalpersonService;
@@ -84,6 +91,17 @@
@Autowired
private ISysPostService postService;
+ @Autowired
+ private DataSourceTransactionManager transactionManager;
+
+ @Autowired
+ private TransactionDefinition transactionDefinition;
+
+ @Autowired
+ private DingTalkService dingTalkService;
+
+ @Autowired
+ private ISysUserService sysUserService;
public ServiceFundController() {
configuration = new Configuration();
@@ -128,7 +146,12 @@
Integer APPLYTYPE = spFinancialExpensesIn.getAPPLYTYPE();
Integer pageNum = spFinancialExpensesIn.getPageNum();
Integer pageSize = spFinancialExpensesIn.getPageSize();
+ Integer checkstatus = spFinancialExpensesIn.getCheckstatus();
+ String donorname = spFinancialExpensesIn.getDonorname();
+ if (StringUtils.isEmpty(donorname)) {
+ donorname = null;
+ }
if (pageNum == null) {
pageNum = 1;
}
@@ -150,7 +173,7 @@
}
//startPage();
- List<SpFinancialExpensesFundOut> list = serviceFundService.getListBypower(loginUser.getUsername(), 2, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE);
+ List<SpFinancialExpensesFundOut> list = serviceFundService.getListBypower(loginUser.getUsername(), 2, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE, checkstatus, donorname);
//閫氳繃鎹愮尞鑰呰繃婊�
if (StringUtils.isNotEmpty(spFinancialExpensesIn.getDonorname())) {
list = list.stream().filter(obj -> obj.getDonorname().contains(spFinancialExpensesIn.getDonorname())).collect(Collectors.toList());
@@ -169,6 +192,17 @@
}
});
return getCustomDataTable(list, pageNum, pageSize);
+ }
+
+ /**
+ * 鏍规嵁鏉冮檺鏄剧ず瀹℃牳鍒楄〃
+ */
+ @ApiOperation("鏍规嵁鏉冮檺鏄剧ず瀹℃牳鍒楄〃")
+ @Log(title = "鏍规嵁鏉冮檺鏄剧ず瀹℃牳鍒楄〃", businessType = BusinessType.OTHER)
+ @PostMapping("/getExpertfeeList")
+ public TableDataInfo getExpertfeeList(@RequestBody SpSelectExpertfee spSelectExpertfee) {
+ List<SpFinancialExpensesFundOut> expertfeeList = serviceFundService.getExpertfeeList(spSelectExpertfee);
+ return getCustomDataTable(expertfeeList, spSelectExpertfee.getPageNum(), spSelectExpertfee.getPageSize());
}
@ApiOperation("鏌ヨ璐圭敤鐢宠涓诲垪琛�")
@@ -220,7 +254,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) {
@@ -461,10 +495,11 @@
* 瀹℃牳璐圭敤
*/
@ApiOperation("瀹℃牳璐圭敤")
- @Log(title = "瀹℃牳璐圭敤", businessType = BusinessType.OTHER)
+ @RepeatSubmit
+// @Log(title = "瀹℃牳璐圭敤", businessType = BusinessType.OTHER)
@PostMapping("/checkfund")
public AjaxResult checkFund(@RequestBody CheckFundVO checkFundVO) {
- logger.info("serviceFundController---checkFund鐨勫叆鍙傚�糲heckFundVO :{}", checkFundVO);
+ log.info("serviceFundController---checkFund鐨勫叆鍙傚�糲heckFundVO :{}", checkFundVO);
ServiceFund serviceFund = serviceFundService.getById(checkFundVO.getFundid());
if (serviceFund != null) {
Integer TotalLevel = 0;
@@ -473,8 +508,7 @@
serviceFundflowrule.setFundtype(2);
serviceFundflowrule.setApplytype(serviceFund.getApplytype());
serviceFundflowrule.setCheckuserno(loginUser.getUsername());
- logger.info("serviceFundController---checkFund---queryList鐨勫叆鍙傚�約erviceFundflowrule:{}", serviceFundflowrule);
-
+ log.info("serviceFundController---checkFund---queryList鐨勫叆鍙傚�約erviceFundflowrule:{}", serviceFundflowrule);
List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
if (serviceFundflowrules == null || serviceFundflowrules.stream().count() == 0) {
@@ -505,6 +539,29 @@
}
}
FlowLevel = FlowLevel + 1;
+
+ if (serviceFund.getFlowlevel() == Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1) && serviceFund.getBackflowlevel() == 100) {
+ log.info("璐㈠姟閫�鍥炲啀鎻愪氦锛屽嚭绾冲啀娆″鎵癸紝涔嬪悗鎻愪氦鍒拌储鍔�");
+ //璇存槑鏄储鍔￠��鍥炲啀鎻愪氦鐨�.闇�瑕佸嚭绾冲啀鐪嬩竴閬嶏紝娌￠棶棰樹箣鍚庯紝寰�鍒嗕韩琛ㄩ噷鏂板
+// serviceFundService.addFundSharedInfo(serviceFund.getId());
+ serviceFund.setFlowlevel(serviceFundflowrules.get(0).getTotallevel().longValue());
+ serviceFund.setRecordstatus(99);
+ serviceFund.setUploadStates(1);
+ 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 {
@@ -513,6 +570,8 @@
//搴斿尰闄㈣姹傚鏋滃嚭鐜伴��鍥烇紝鐩存帴閫�鍒板彂璧疯��
FlowLevel = 0;
RecordStatus = -1;
+ logger.info("serviceFund杩涙潵浜嗗悧锛燂紵锛燂紵锛燂紵 :{},{}", RecordStatus, FlowLevel);
+ System.out.println("serviceFund杩涙潵浜嗗悧锛燂紵锛燂紵锛燂紵");
} else {
RecordStatus = (FlowLevel + 1) * 2 - 1;
FlowLevel = (FlowLevel - 1);
@@ -520,6 +579,20 @@
FlowLevel = 0;
}
}
+
+ SysUser sysUser = sysUserService.selectUserByUserName(serviceFund.getUserno());
+ ArrayList<ConcurrentHashMap<String, Object>> contentList = new ArrayList<>();
+ ConcurrentHashMap map = new ConcurrentHashMap();
+ map.put("瀹℃壒浜猴細", loginUser.getUser().getUserName());
+ map.put("瀹℃壒鏃堕棿锛�", new Date());
+ map.put("鎰忚锛�", "涓嶉�氳繃");
+ if (StringUtils.isNotBlank(checkFundVO.getFlowcontent())) map.put("鎰忚锛�", checkFundVO.getFlowcontent());
+ contentList.add(map);
+ DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
+ dingTalkReqVo.setTitle("璐㈠姟绯荤粺椹冲洖淇℃伅");
+ dingTalkReqVo.setNumber(sysUser.getPhonenumber());
+ dingTalkReqVo.setContents(contentList);
+ dingTalkService.sendNotification(dingTalkReqVo);
}
serviceFund.setRecordstatus(RecordStatus);
@@ -540,14 +613,23 @@
serviceFundflow.setFlowcontent(checkFundVO.getFlowconclusion() == 1 ? "閫氳繃" : "涓嶉�氳繃");
}
serviceFundflow.setFlowlevel(OriginalFlowLevel + 1);
- serviceFundflowService.save(serviceFundflow);
+
+ Boolean aBoolean = serviceFundflowService.saveData(serviceFundflow);
+ log.info("sserviceFund淇濆瓨鐨勭殑鍊兼槸-------- :{}", aBoolean);
//001瀹℃壒閫氳繃涔嬪悗锛屽氨闇�瑕佹妸鈥滃姙鍏涓讳换鈥濈殑鍚嶅瓧濉笂
if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) {
serviceFund.setOfficedirector(user.getNickName());
+ serviceFund.setUploadStates(1);
}
- serviceFundService.updateById(serviceFund);
+ System.out.println("serviceFund鐨勫�兼槸--------:" + serviceFund);
+ log.info("寮�濮嬫洿鏂扮殑鐨勫�兼槸--------");
+// ServiceFund updateServiceFund = new ServiceFund();
+// updateServiceFund.setRecordstatus(serviceFund.getRecordstatus());
+// updateServiceFund.setFlowlevel(serviceFund.getFlowlevel());
+ Boolean aBoolean1 = serviceFundService.updateById(serviceFund);
+ log.info("integer鏇存柊鐨勭殑鍊兼槸-------- :{}", aBoolean1);
ServiceSystemmessage serviceSystemmessage = new ServiceSystemmessage();
serviceSystemmessage.setFundtype(2);
serviceSystemmessage.setApplytype(serviceFund.getApplytype());
@@ -555,22 +637,49 @@
serviceSystemmessage.setSendusername(user.getNickName());
serviceSystemmessage.setReceiveuserno(serviceFund.getUserno());
serviceSystemmessage.setReceiveusername(serviceFund.getUsername());
+ serviceSystemmessage.setUpdateTime(new Date());
+ serviceSystemmessage.setUpdateBy(user.getNickName());
serviceSystemmessage.setIsread(0);
serviceSystemmessage.setMessagetype(1);
serviceSystemmessage.setRelevantno(serviceFund.getId());
if (CheckFlag == 1) {
- //閫氳繃
- serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁�氳繃");
- serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勫叧浜庢崘鐚渚嬨��" + serviceFund.getDonorname() + "銆戠殑璐圭敤鐢宠宸查�氳繃" + (OriginalFlowLevel + 1) + "绾у鏍�");
- if (TotalLevel == OriginalFlowLevel + 1) {
- serviceFundService.addFundSharedInfo(checkFundVO.getFundid());
- }
+ //閫氳繃
+ if (serviceFund.getApplytype().equals("1")) {
+ serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁�氳繃");
+ serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勪笓瀹跺姵鍔¤垂鎹愮尞妗堜緥銆�" + serviceFund.getDonorname() + "銆戠殑璐圭敤鐢宠宸查�氳繃");
+ } else if (serviceFund.getApplytype().equals("2")) {
+ serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁�氳繃");
+ serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勪鸡鐞嗕笓瀹跺姵鍔¤垂鎹愮尞妗堜緥銆�" + serviceFund.getDonorname() + "銆戠殑璐圭敤鐢宠宸查�氳繃");
+ } else if (serviceFund.getApplytype().equals("3")) {
+ serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁�氳繃");
+ serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勫尰瀛︽垚鏈崘鐚渚嬨��" + serviceFund.getDonorname() + "銆戠殑璐圭敤鐢宠宸查�氳繃");
+ } else if (serviceFund.getApplytype().equals("4")) {
+ serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁�氳繃");
+ serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勫姙鍏垂鐢ㄧ敵璇峰凡閫氳繃");
+ } else if (serviceFund.getApplytype().equals("5")) {
+ serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁�氳繃");
+ serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勭哗鏁堢敵璇峰凡閫氳繃");
+ }
} else {
//椹冲洖
- serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁┏鍥�");
- serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勫叧浜庢崘鐚渚嬨��" + serviceFund.getDonorname() + "銆戠殑璐圭敤鐢宠宸茶" + (OriginalFlowLevel + 1) + "绾у鏍搁┏鍥烇紝鍘熷洜涓�" + checkFundVO.getFlowcontent() + "");
+ if (serviceFund.getApplytype().equals("1")) {
+ serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁┏鍥�");
+ serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勪笓瀹跺姵鍔¤垂鎹愮尞妗堜緥銆�" + serviceFund.getDonorname() + "銆戠殑璐圭敤鐢宠宸茶椹冲洖锛屽師鍥�: " + checkFundVO.getFlowcontent() + "");
+ } else if (serviceFund.getApplytype().equals("2")) {
+ serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁┏鍥�");
+ serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勪鸡鐞嗕笓瀹跺姵鍔¤垂鎹愮尞妗堜緥銆�" + serviceFund.getDonorname() + "銆戠殑璐圭敤鐢宠宸茶椹冲洖锛屽師鍥�: " + checkFundVO.getFlowcontent() + "");
+ } else if (serviceFund.getApplytype().equals("3")) {
+ serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁┏鍥�");
+ serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勫尰瀛︽垚鏈崘鐚渚嬨��" + serviceFund.getDonorname() + "銆戠殑璐圭敤鐢宠宸茶椹冲洖锛屽師鍥�: " + checkFundVO.getFlowcontent() + "");
+ } else if (serviceFund.getApplytype().equals("4")) {
+ serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁┏鍥�");
+ serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勫姙鍏垂鐢ㄧ敵璇峰凡椹冲洖锛屽師鍥�: " + checkFundVO.getFlowcontent() + "");
+ } else if (serviceFund.getApplytype().equals("5")) {
+ serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁┏鍥�");
+ serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勭哗鏁堢敵璇峰凡椹冲洖锛屽師鍥�: " + checkFundVO.getFlowcontent() + "");
+ }
}
ServiceSystemmessage.save(serviceSystemmessage);
return AjaxResult.success();
@@ -587,37 +696,65 @@
@Log(title = "璐圭敤涓婃姤", businessType = BusinessType.UPDATE)
@PostMapping("/fundEdit")
@RepeatSubmit
- public AjaxResult fundEdit(@RequestBody ServiceFund serviceFund) {
+ public AjaxResult fundEdit(@RequestBody ServiceFundVO serviceFundVO) {
+ ServiceFund serviceFund = DtoConversionUtils.sourceToTarget(serviceFundVO, ServiceFund.class);
log.info("淇敼璐圭敤鐢宠鍏ュ弬:{}", serviceFund);
List<ServiceFund> infoByInfoIdList = serviceFundService.queryInfoById(serviceFund);
log.info("淇敼璐圭敤鐢宠锛岄�氳繃鍏ュ弬鏌ヨ serviceFundService.queryInfoById鏁版嵁涓虹┖,鍏ュ弬:{}", infoByInfoIdList.size());
if (CollectionUtils.isEmpty(infoByInfoIdList)) {
- return toAjax(false);
+ Long id = serviceFundService.addOrUpdateNew(serviceFundVO);
+ serviceFund.setId(id);
}
+
+ Long flowLavel = null;
+
+ LoginUser loginUser = getLoginUser();
+
+ //鏌ヨ蹇呭浜�
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setApplytype(serviceFund.getApplytype());
+ serviceFundflowrule.setMustAudite(1);
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ log.info("fund蹇呭浜虹殑绛夌骇涓猴細{}", serviceFundflowrules.get(0).getFlowlevel());
+
for (ServiceFund sf : infoByInfoIdList) {
+ sf.setApplyTime(new Date());
//濡傛灉绛変簬100锛岃鏄庡凡缁忚蛋鍒板尰闄㈣储鍔￠偅杈逛簡锛涜储鍔￠偅杈瑰彇鏁版嵁鏄粠鍒嗕韩琛ㄥ彇锛屾墍浠ワ紝杩欓噷鐩存帴寰�鍒嗕韩琛ㄩ噷娣诲姞鏁版嵁灏辫浜�
if (sf.getBackflowlevel() != null && sf.getBackflowlevel() == 199) {
//灏唂und琛ㄧ殑瀹℃牳鐘舵�佹敼鎴�100
sf.setBackflowlevel(100);
+
+ //閫�鍥炲啀鎻愪氦锛岄渶瑕佸啀鍒板嚭绾抽偅閲�
+ sf.setFlowlevel(Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1));
+ 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(Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1));
+ sf.setRecordstatus(2);
+ serviceFundService.updateById(sf);
+ } else if (sf.getBackflowlevel() != null && sf.getBackflowlevel() >= serviceFundflowrules.get(0).getFlowlevel()) {
+ //鑱傜閫�鍥炵殑锛屼篃闇�瑕佸厛鍒板嚭绾抽偅閲�
+ sf.setFlowlevel(Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1));
+ sf.setRecordstatus(2);
+ serviceFundService.updateById(sf);
} else {
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().longValue());
} else {
- serviceFund.setBackflowlevel(1);
- serviceFund.setFlowlevel(1L);
+ serviceFund.setBackflowlevel(serviceFundflowrules.get(0).getFlowlevel() - 1);
+ serviceFund.setFlowlevel(Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1));
}
} else {
serviceFund.setRecordstatus(0);
@@ -639,6 +776,7 @@
return toAjax(false);
}
+
/**
* 鍒犻櫎璐圭敤鐢宠涓�
@@ -691,6 +829,7 @@
}
Map<String, Object> map = new HashMap<>();
map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
+ map.put("downloadName", name + ".doc");
return map;
}
@@ -707,7 +846,7 @@
dataMap.put("XZBH", serviceFund.getBh() == null ? "" : serviceFund.getBh());
dataMap.put("ZB", serviceFund.getDeptmentname() == null ? "" : serviceFund.getDeptmentname());
dataMap.put("TBYYMMDD", time);
- dataMap.put("BXDFJ", serviceFund.getAttachcount() == 0 ? " " : serviceFund.getAttachcount());
+ dataMap.put("BXDFJ", serviceFund.getAttachcount() == null ? " " : serviceFund.getAttachcount());
dataMap.put("JXZXM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname());
dataMap.put("JSR", serviceFund.getUsername() == null ? "" : serviceFund.getUsername());
// dataMap.put("FYXM1", "鏀粯涓撳璐圭敤锛屽叾涓◣鍓嶉噾棰�" + serviceFund.getPretaxcost() + "鍏冿紝绋庡悗閲戦" + serviceFund.getTaxedcost() + "鍏冦��");
@@ -966,11 +1105,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);
}
@@ -1013,9 +1154,9 @@
}
/**
- * 涓嬭浇鎹愮尞鑰呭尰瀛︽垚鏈粺璁¤〃
+ * 涓嬭浇鎹愮尞鑰呭尰瀛︺�佸姙鍏�佺哗鏁堟垚鏈粺璁¤〃
*/
- @ApiOperation("鎹愮尞鑰呭尰瀛︽垚鏈粺璁¤〃")
+ @ApiOperation("鎹愮尞鑰呭尰瀛︺�佸姙鍏�佺哗鏁堟垚鏈粺璁¤〃")
@GetMapping(value = "/downloadYX/{id}")
public Map downloadInfoYX(@PathVariable("id") Long id) throws IOException {
Map dataMap = new HashMap();
@@ -1028,11 +1169,13 @@
Template t = null;
try {
//鎹愮尞琛�.ftl涓鸿瑁呰浇鐨勬ā鏉�
- //涓撳鍔冲姟璐圭敵璇� 1 浼︾悊璇勪及鍔冲姟璐圭敵璇� 2 鍖诲鎴愭湰璐圭敤鐢宠 3 鍔炲叕璐圭敤鎶ラ攢鐢宠 4
+ //涓撳鍔冲姟璐圭敵璇� 1 浼︾悊璇勪及鍔冲姟璐圭敵璇� 2 鍖诲鎴愭湰璐圭敤鐢宠 3 鍔炲叕璐圭敤鎶ラ攢鐢宠 4 缁╂晥璐圭敤鎶ラ攢鐢宠 5
if (dataYX.equals("3")) {
t = configuration.getTemplate("鍖诲鎴愭湰璐圭敤鐢宠鍗�.ftl");
} else if (dataYX.equals("4")) {
t = configuration.getTemplate("鍔炲叕璐圭敤鐢宠鍗�.ftl");
+ } else if (dataYX.equals("5")) {
+ t = configuration.getTemplate("缁╂晥璐圭敤鐢宠鍗�.ftl");
}
} catch (IOException e) {
e.printStackTrace();
@@ -1043,6 +1186,8 @@
name = "鍖诲鎴愭湰璐圭敤鐢宠鍗昣" + dataMap.get("XM") + "_" + newTime;
} else if (dataYX.equals("4")) {
name = "鍔炲叕璐圭敤鐢宠鍗昣" + dataMap.get("XM") + "_" + newTime;
+ } else if (dataYX.equals("5")) {
+ name = "缁╂晥璐圭敤鐢宠鍗昣" + dataMap.get("XM") + "_" + newTime;
}
//杈撳嚭鏂囨。璺緞鍙婂悕绉�
File outFile = new File(RuoYiConfig.getProfile() + "/download/wordtemplate/" + name + ".doc");
@@ -1055,17 +1200,20 @@
e1.printStackTrace();
}
try {
+
t.process(dataMap, out);
} catch (TemplateException e) {
e.printStackTrace();
}
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);
}
@@ -1075,11 +1223,24 @@
}
List<ServiceFunddetail> fd = serviceFunddetailService.getAllDetailsByFDIDHZ(id);
+ if (serviceFund.getApplytype().equals("5")) {
+ //缁╂晥鐨勮鎯呭鏋滃皬浜�3琛岋紝榛樿瑕佺瓑浜�3琛�
+ if (fd.size() < 3) {
+ for (int i = 0; i <= 3 - fd.size(); i++) {
+ ServiceFunddetail serviceFunddetail = new ServiceFunddetail();
+ serviceFunddetail.setQuantity(0.00);
+ serviceFunddetail.setPrice(0.00);
+ serviceFunddetail.setAmount(0.00);
+ fd.add(serviceFunddetail);
+ }
+ }
+ }
if (fd == null) {
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);
@@ -1096,48 +1257,75 @@
dataMap.put("YWZ", serviceFund.getDeptmentname() == null ? "" : serviceFund.getDeptmentname());
dataMap.put("ZHUZANG", serviceFund.getManagername() == null ? "" : serviceFund.getManagername());
+
+ 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;
- 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 (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 = "";
+ }
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);
@@ -1171,7 +1359,7 @@
count++;
map.put("XH", count);
map.put("FWNR", f.getItemname() == null ? "" : f.getItemname());
- map.put("DW", f.getUnitname() == null ? "" : f.getUnitname());
+ map.put("DW", f.getBeneficiaryname() == null ? "" : f.getBeneficiaryname());
map.put("SL", f.getQuantity() == 0.00 ? "" : f.getQuantity());
map.put("JG", f.getPrice() == 0.00 ? "" : f.getPrice());
@@ -1242,6 +1430,7 @@
}
Map<String, Object> map = new HashMap<>();
map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
+ map.put("downloadName", name + ".doc");
return map;
}
@@ -1310,6 +1499,7 @@
}
Map<String, Object> map = new HashMap<>();
map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
+ map.put("downloadName", name + ".doc");
return map;
}
@@ -1809,6 +1999,7 @@
}
Map<String, Object> map = new HashMap<>();
map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
+ map.put("downloadName", name + ".doc");
return map;
}
@@ -1897,6 +2088,7 @@
}
Map<String, Object> map = new HashMap<>();
map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
+ map.put("downloadName", name + ".doc");
return map;
}
@@ -1995,6 +2187,7 @@
/**
* 璐圭敤绫诲瀷璁℃暟
*/
+// @NotRepeatCommit(key = "param:arg[1]", value = 30000)
@ApiOperation("璐圭敤绫诲瀷璁℃暟")
@GetMapping(value = "/countItem/{infoid}/{itemid}")
public AjaxResult countItem(@PathVariable Long infoid, @PathVariable Long itemid) {
@@ -2003,4 +2196,45 @@
}
+
+ /**
+ * 缁╂晥璁＄畻
+ */
+ @ApiOperation("缁╂晥璁＄畻")
+ @Log(title = "缁╂晥璁＄畻", businessType = BusinessType.INSERT)
+ @PostMapping("/performance")
+ @RepeatSubmit
+ public AjaxResult performance(@RequestBody ServiceFundVO serviceFundVO) {
+
+ 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