feat:showtime
This commit is contained in:
parent
4cd3123d9a
commit
89d1c82b7c
|
@ -49,13 +49,16 @@ public class ApprovalProcessController extends BaseController {
|
|||
startPage();
|
||||
QueryWrapper<ApprovalProcess> queryWrapper = new QueryWrapper<>(approvalProcess);
|
||||
queryWrapper.orderByDesc("create_time");
|
||||
if (approvalProcess.getTimeType() != null) {
|
||||
if (approvalProcess.getTimeType() == 1) {
|
||||
queryWrapper.ge("create_time", System.currentTimeMillis() - 24 * 60 * 60 * 1000);
|
||||
queryWrapper.ge("create_time", System.currentTimeMillis() - 3 * 24 * 60 * 60 * 1000);
|
||||
} else if (approvalProcess.getTimeType() == 2) {
|
||||
queryWrapper.ge("create_time", System.currentTimeMillis() - 7 * 24 * 60 * 60 * 1000);
|
||||
} else if (approvalProcess.getTimeType() == 3) {
|
||||
queryWrapper.ge("create_time", System.currentTimeMillis() - 30 * 24 * 60 * 60 * 1000);
|
||||
}
|
||||
}
|
||||
|
||||
List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper);
|
||||
|
||||
for (ApprovalProcess process : list) {
|
||||
|
@ -135,13 +138,15 @@ public class ApprovalProcessController extends BaseController {
|
|||
|
||||
|
||||
@ApiOperation("根据用户id查")
|
||||
@PostMapping("/getByuserId/{id}")
|
||||
@PostMapping("/getByuserId")
|
||||
public TableDataInfo getByuserId(ApprovalProcess approvalProcess) {
|
||||
List<ApprovalProcess> list = approvalsProcessService.lambdaQuery()
|
||||
.eq(ApprovalProcess::getSubmitterId, approvalProcess.getSubmitterId())
|
||||
.eq(approvalProcess.getApprovalStatus() != null, ApprovalProcess::getApprovalStatus, approvalProcess.getApprovalStatus())
|
||||
.eq(approvalProcess.getCcName() != null, ApprovalProcess::getCcName, approvalProcess.getCcName())
|
||||
.eq(approvalProcess.getProcessTitle() != null, ApprovalProcess::getProcessTitle, approvalProcess.getProcessTitle())
|
||||
.eq(approvalProcess.getSubmitterName() != null, ApprovalProcess::getSubmitterName, approvalProcess.getSubmitterName())
|
||||
.eq(approvalProcess.getTimeType() != null, ApprovalProcess::getTimeType, approvalProcess.getTimeType())
|
||||
.orderByDesc(ApprovalProcess::getCreateTime)
|
||||
.list();
|
||||
|
||||
|
|
Loading…
Reference in New Issue