Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
6cdd8462f6
|
@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue