From b891387422e8af819a59dafa3c650cd4e3dc43dc Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 26 二月 2024 16:03:09 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 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 bea9174..5897033 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
@@ -10,6 +10,7 @@
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -25,6 +26,7 @@
import com.ruoyi.project.domain.vo.*;
import com.ruoyi.project.mapper.ServiceFunddetailMapper;
import com.ruoyi.project.service.*;
+import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysPostService;
import freemarker.template.Configuration;
import freemarker.template.Template;
@@ -100,6 +102,9 @@
@Autowired
private TransactionDefinition transactionDefinition;
+
+ @Autowired
+ private ISysDeptService sysDeptService;
public ServiceFundController() {
configuration = new Configuration();
@@ -241,7 +246,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) {
@@ -527,12 +532,13 @@
}
FlowLevel = FlowLevel + 1;
- if (serviceFund.getFlowlevel() == 1 && serviceFund.getBackflowlevel() == 100) {
+ if (serviceFund.getFlowlevel() == Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1) && serviceFund.getBackflowlevel() == 100) {
log.info("璐㈠姟閫�鍥炲啀鎻愪氦锛屽嚭绾冲啀娆″鎵癸紝涔嬪悗鎻愪氦鍒拌储鍔�");
//璇存槑鏄储鍔￠��鍥炲啀鎻愪氦鐨�.闇�瑕佸嚭绾冲啀鐪嬩竴閬嶏紝娌￠棶棰樹箣鍚庯紝寰�鍒嗕韩琛ㄩ噷鏂板
- serviceFundService.addFundSharedInfo(serviceFund.getId());
- serviceFund.setFlowlevel(100L);
+// serviceFundService.addFundSharedInfo(serviceFund.getId());
+ serviceFund.setFlowlevel(serviceFundflowrules.get(0).getTotallevel().longValue());
serviceFund.setRecordstatus(99);
+ serviceFund.setUploadStates(0);
serviceFundService.updateById(serviceFund);
//淇濆瓨瀹℃壒娴佺▼琛�
@@ -616,9 +622,9 @@
//閫氳繃
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 (TotalLevel == OriginalFlowLevel + 1) {
+// serviceFundService.addFundSharedInfo(checkFundVO.getFundid());
+// }
} else {
//椹冲洖
@@ -640,13 +646,27 @@
@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锛岃鏄庡凡缁忚蛋鍒板尰闄㈣储鍔￠偅杈逛簡锛涜储鍔￠偅杈瑰彇鏁版嵁鏄粠鍒嗕韩琛ㄥ彇锛屾墍浠ワ紝杩欓噷鐩存帴寰�鍒嗕韩琛ㄩ噷娣诲姞鏁版嵁灏辫浜�
@@ -655,7 +675,7 @@
sf.setBackflowlevel(100);
//閫�鍥炲啀鎻愪氦锛岄渶瑕佸啀鍒板嚭绾抽偅閲�
- sf.setFlowlevel(1L);
+ sf.setFlowlevel(Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1));
sf.setRecordstatus(0);
serviceFundService.updateById(sf);
@@ -666,27 +686,25 @@
} else if (sf.getBackflowlevel() != null && sf.getBackflowlevel() == 100) {
//璐㈠姟閫�鍥炵殑鏁版嵁鍐嶆彁浜わ紝鍒板嚭绾抽偅閲屾病鏈夎繃锛屽啀閫�鍥烇紝瀵艰嚧backflowlevel鏄�100,
//閫�鍥炲啀鎻愪氦锛岄渶瑕佸啀鍒板嚭绾抽偅閲�
- sf.setFlowlevel(1L);
+ sf.setFlowlevel(Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1));
sf.setRecordstatus(2);
serviceFundService.updateById(sf);
- } else if (sf.getBackflowlevel() != null && sf.getBackflowlevel() == 2) {
+ } else if (sf.getBackflowlevel() != null && sf.getBackflowlevel() >= serviceFundflowrules.get(0).getFlowlevel()) {
//鑱傜閫�鍥炵殑锛屼篃闇�瑕佸厛鍒板嚭绾抽偅閲�
- sf.setFlowlevel(1L);
+ 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);
--
Gitblit v1.9.3