From f352146410f49602eaa6b94bb8a09d5913fffe0a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 12 三月 2024 18:24:48 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 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..7362e09 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
@@ -28,6 +28,7 @@
import com.ruoyi.project.service.*;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysPostService;
+import com.ruoyi.system.service.ISysUserService;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
@@ -49,6 +50,7 @@
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;
@@ -104,7 +106,10 @@
private TransactionDefinition transactionDefinition;
@Autowired
- private ISysDeptService sysDeptService;
+ private DingTalkService dingTalkService;
+
+ @Autowired
+ private ISysUserService sysUserService;
public ServiceFundController() {
configuration = new Configuration();
@@ -537,8 +542,8 @@
//璇存槑鏄储鍔￠��鍥炲啀鎻愪氦鐨�.闇�瑕佸嚭绾冲啀鐪嬩竴閬嶏紝娌￠棶棰樹箣鍚庯紝寰�鍒嗕韩琛ㄩ噷鏂板
// serviceFundService.addFundSharedInfo(serviceFund.getId());
serviceFund.setFlowlevel(serviceFundflowrules.get(0).getTotallevel().longValue());
- serviceFund.setFlowlevel(100L);
serviceFund.setRecordstatus(99);
+ serviceFund.setUploadStates(1);
serviceFundService.updateById(serviceFund);
//淇濆瓨瀹℃壒娴佺▼琛�
@@ -571,6 +576,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);
@@ -598,12 +617,13 @@
//001瀹℃壒閫氳繃涔嬪悗锛屽氨闇�瑕佹妸鈥滃姙鍏涓讳换鈥濈殑鍚嶅瓧濉笂
if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) {
serviceFund.setOfficedirector(user.getNickName());
+ serviceFund.setUploadStates(1);
}
System.out.println("serviceFund鐨勫�兼槸--------:" + serviceFund);
log.info("寮�濮嬫洿鏂扮殑鐨勫�兼槸--------");
- ServiceFund updateServiceFund = new ServiceFund();
- updateServiceFund.setRecordstatus(serviceFund.getRecordstatus());
- updateServiceFund.setFlowlevel(serviceFund.getFlowlevel());
+// ServiceFund updateServiceFund = new ServiceFund();
+// updateServiceFund.setRecordstatus(serviceFund.getRecordstatus());
+// updateServiceFund.setFlowlevel(serviceFund.getFlowlevel());
Boolean aBoolean1 = serviceFundService.updateById(serviceFund);
log.info("integer鏇存柊鐨勭殑鍊兼槸-------- :{}", aBoolean1);
@@ -646,22 +666,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();
@@ -2189,8 +2206,5 @@
dataMap.put("downloadName", msg);
return AjaxResult.success(dataMap);
-
-
}
-
}
--
Gitblit v1.9.3