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

Compare commits

base: lijingtong:b0081791c061a4cddc0c602e12803206dbd69de6
Branches Tags
lijingtong:master
...
compare: lijingtong:c7162afbbbe30948f38e290e1c736f5d52e0ca0e
Branches Tags
lijingtong:master

2 Commits
b0081791c0 ... c7162afbbb

Author SHA1 Message Date
李京通 c7162afbbb Merge remote-tracking branch 'origin/master' 2025-06-09 19:22:27 +08:00
李京通 826544af13 feat: 请假 2025-06-09 19:22:21 +08:00
1 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

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

@ -52,11 +52,11 @@ 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);
} }
} }