From 53e4e0a0fb2928d153230953c631af6c17e9c385 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 01 九月 2026 20:38:22 +0800
Subject: [PATCH] 修改了排序
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
index a41fe58..f566881 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
@@ -136,7 +136,7 @@
if (serviceReimbursement.getCreateTime() != null) {
wrappers.eq(ServiceReimbursement::getCreateTime, serviceReimbursement.getCreateTime());
}
- if (StringUtils.isNotBlank(serviceReimbursement.getUsername())) {
+ if (StringUtils.isNotBlank(serviceReimbursement.getUsername()) && !serviceReimbursement.getUsername().equals("shenji")) {
wrappers.like(ServiceReimbursement::getUsername, serviceReimbursement.getUsername());
}
if (StringUtils.isNotBlank(serviceReimbursement.getTravelers())) {
@@ -165,6 +165,7 @@
wrappers.between(ServiceReimbursement::getCreateTime ,serviceReimbursement.getStarttime(),serviceReimbursement.getEndtime());
}*/
+ wrappers.orderByDesc(ServiceReimbursement::getApplyTime);
return this.list(wrappers);
}
@@ -447,13 +448,18 @@
map.put("瀹℃壒浜猴細", loginUser.getUser().getUserName());
map.put("瀹℃壒鏃堕棿锛�", new Date());
map.put("鎰忚锛�", "涓嶉�氳繃");
- if (StringUtils.isNotBlank(checkFundVO.getFlowcontent())) map.put("鎰忚锛�", checkFundVO.getFlowcontent());
+ 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);
+ try {
+ DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
+ dingTalkReqVo.setTitle("璐㈠姟绯荤粺椹冲洖淇℃伅");
+ dingTalkReqVo.setNumber(sysUser.getPhonenumber());
+ dingTalkReqVo.setContents(contentList);
+ dingTalkService.sendNotification(dingTalkReqVo);
+ }catch (Exception e){
+ log.error("宸梾---璐㈠姟绯荤粺椹冲洖淇℃伅鎶ラ敊浜�", e);
+ }
}
serviceReimbursement.setRecordstatus(RecordStatus);
@@ -494,22 +500,19 @@
}
//鍔炲叕瀹や富浠诲鎵归�氳繃涔嬪悗锛屽氨闇�瑕佹妸鈥滃姙鍏涓讳换鈥濈殑鍚嶅瓧濉笂
- List<SysUser> sysUsers =null;
- if(StringUtils.isNotEmpty(user.getUserName())) {
- SysUser su = new SysUser();
- su.setUserName(user.getUserName());
- sysUsers = sysUserMapper.selectAllocatedList(su);
- log.info("宸梾sysUsers杩斿洖鐨勫�间负:{}", sysUsers);
+ SysUser sysUser = null;
+ if (StringUtils.isNotEmpty(user.getUserName())) {
+ sysUser = sysUserMapper.selectUserByUserName(user.getUserName());
+ log.info("宸梾sysUsers杩斿洖鐨勫�间负:{}", sysUser);
}
- if (checkFundVO.getFlowconclusion() == 1 && !sysUsers.isEmpty()
- && sysUsers.get(0).getRoles() != null
- && sysUsers.get(0).getRoles().stream().anyMatch(role -> "officedirector".equals(role.getRoleKey()))){
+ if (checkFundVO.getFlowconclusion() == 1 && Objects.nonNull(sysUser) && sysUser.getRoles() != null && sysUser.getRoles().stream().anyMatch(role -> "officedirector".equals(role.getRoleKey()))) {
serviceReimbursement.setOfficedirector(user.getNickName());
serviceReimbursement.setUploadStates(1);
Boolean aBoolean1 = null;
if (newSwitch == 1) {
+ log.info("宸梾newSwitch杩斿洖鐨勫�间负:{}", newSwitch);
aBoolean1 = sendData(serviceReimbursement);
if (!aBoolean1) {
allMap.put("500", "鍙戦�佸け璐�");
@@ -795,8 +798,8 @@
formmain_1209.put("璐㈠姟瀹℃壒", "");
formmain_1209.put("璐㈠姟閮ㄨ礋璐ｄ汉瀹℃壒", getLastApprovalInfo(serviceFundflows, serviceReimbursement.getFinancedirector()));
if (serviceReimbursement.getBackflowlevel() == 3)
- formmain_1209.put("鍔炲叕瀹や富浠诲鎵�", "瀹℃壒浜猴細鍛ㄨ偛鎴� & 瀹℃壒鏃堕棿锛�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃");
- else formmain_1209.put("鍔炲叕瀹や富浠诲鎵�", getLastApprovalInfo(serviceFundflows, "鍛ㄨ偛鎴�"));
+ formmain_1209.put("鍔炲叕瀹や富浠诲鎵�", "瀹℃壒浜猴細鍚村織寮� & 瀹℃壒鏃堕棿锛�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃");
+ else formmain_1209.put("鍔炲叕瀹や富浠诲鎵�", getLastApprovalInfo(serviceFundflows, "鍚村織寮�"));
formmain_1209.put("澶囨敞", serviceReimbursement.getRemark());
formmain_1209.put("涓氬姟鍓櫌闀垮鎵�", serviceReimbursement.getBusvicepresident());
@@ -805,7 +808,8 @@
formmain_1209.put("寮�鎴烽摱琛�-浣滃簾", "");
formmain_1209.put("鍗″彿-浣滃簾", "");
formmain_1209.put("鏀粯鏂瑰紡", serviceReimbursement.getZffs());
- formmain_1209.put("缁勯暱", getLastApprovalInfo(serviceFundflows, serviceReimbursement.getManagername()));
+ String lastApprovalInfo = getLastApprovalInfo(serviceFundflows, serviceReimbursement.getManagername());
+ formmain_1209.put("缁勯暱", lastApprovalInfo.contains("鍚村織寮�") ? null : lastApprovalInfo);
formmain_1209.put("瀹℃壒浜哄憳", getLastApprovalInfo(serviceFundflows, "闄堟厱鍗�"));
formmain_1209.put("鏀粯鏃ユ湡", serviceReimbursement.getRiqi());
formmain_1209.put("涓婁紶闄勪欢", "");
--
Gitblit v1.9.3