lijingtong
/
PublicAffairs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
hanrenchun 2025-06-09 19:42:21 +08:00
parent 99bd9edd43 34b457f2e7
commit 6cdd8462f6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java
View File

@ -52,15 +52,15 @@ public class ApprovalProcessController extends BaseController {
queryWrapper.orderByDesc("create_time"); queryWrapper.orderByDesc("create_time");
if (approvalProcess.getTimeType() != null) { if (approvalProcess.getTimeType() != null) {
if (approvalProcess.getTimeType() == 1) { if (approvalProcess.getTimeType() == 1) {
queryWrapper.ge("create_time", System.currentTimeMillis() - 3 * 24 * 60 * 60 * 1000); queryWrapper.le("create_time", System.currentTimeMillis() - 3 * 24 * 60 * 60 * 1000);
} else if (approvalProcess.getTimeType() == 2) { } else if (approvalProcess.getTimeType() == 2) {
queryWrapper.ge("create_time", System.currentTimeMillis() - 7 * 24 * 60 * 60 * 1000); queryWrapper.le("create_time", System.currentTimeMillis() - 7 * 24 * 60 * 60 * 1000);
} else if (approvalProcess.getTimeType() == 3) { } else if (approvalProcess.getTimeType() == 3) {
queryWrapper.ge("create_time", System.currentTimeMillis() - 30 * 24 * 60 * 60 * 1000); queryWrapper.le("create_time", System.currentTimeMillis() - 30 * 24 * 60 * 60 * 1000);
} }
} }
if (approvalProcess.getSubmitterId() != null){ if (approvalProcess.getSubmitterId() != null) {
queryWrapper.eq("submitter_id", getLoginUser().getUserId()); queryWrapper.eq("submitter_id", getLoginUser().getUserId());
} }
List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper); List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper);
@ -216,9 +216,9 @@ public class ApprovalProcessController extends BaseController {
.one(); .one();
one.setDestinationIdCn(byId.getBusinessTripDestination()); one.setDestinationIdCn(byId.getBusinessTripDestination());
String togUserIds = one.getTogUserIds(); String togUserIds = one.getTogUserIds();
if (togUserIds != null && !"".equals(togUserIds)){ if (togUserIds != null && !"".equals(togUserIds)) {
List<SysUser> userList = new ArrayList<>(); List<SysUser> userList = new ArrayList<>();
if (togUserIds.contains(",")){ if (togUserIds.contains(",")) {
String[] split = togUserIds.split(","); String[] split = togUserIds.split(",");
for (String s : split) { for (String s : split) {
s = s.trim(); // 移除首尾空格 s = s.trim(); // 移除首尾空格
@ -228,7 +228,7 @@ public class ApprovalProcessController extends BaseController {
} }
} }
one.setTogUserList(userList); one.setTogUserList(userList);
}else { } else {
SysUser user = sysUserService.selectUserById(Long.parseLong(togUserIds)); SysUser user = sysUserService.selectUserById(Long.parseLong(togUserIds));
userList.add(user); userList.add(user);
one.setTogUserList(userList); one.setTogUserList(userList);