From e338114af5b96b3d7686ab9b424a9076b94611d3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 27 二月 2024 17:45:28 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 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 08cc619..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
@@ -537,8 +537,8 @@
//璇存槑鏄储鍔￠��鍥炲啀鎻愪氦鐨�.闇�瑕佸嚭绾冲啀鐪嬩竴閬嶏紝娌￠棶棰樹箣鍚庯紝寰�鍒嗕韩琛ㄩ噷鏂板
// serviceFundService.addFundSharedInfo(serviceFund.getId());
serviceFund.setFlowlevel(serviceFundflowrules.get(0).getTotallevel().longValue());
- serviceFund.setFlowlevel(100L);
serviceFund.setRecordstatus(99);
+ serviceFund.setUploadStates(0);
serviceFundService.updateById(serviceFund);
//淇濆瓨瀹℃壒娴佺▼琛�
@@ -646,22 +646,19 @@
@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();
-// SysUser user = loginUser.getUser();
-// //鏌ヨ褰撳墠鐢ㄦ埛鐨勭粍闀�
-// SysDept sysDept = new SysDept();
-// sysDept.setDeptId(loginUser.getDeptId());
-// List<SysDept> sysDepts = sysDeptService.selectDeptList(sysDept);
//鏌ヨ蹇呭浜�
ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
--
Gitblit v1.9.3