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

Compare commits

..

No commits in common. "2fa020173262bcd19c5a69a3b75e8b161871afdf" and "de36e69a7f4435fb40d530f3300b3a1a557222d1" have entirely different histories.
2fa0201732 ... de36e69a7f

1 changed files with 10 additions and 15 deletions
gather-app/src/main/java/com/ruoyi/business/controller
ApprovalProcessController.java

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

@ -49,16 +49,13 @@ public class ApprovalProcessController extends BaseController {
startPage(); startPage();
QueryWrapper<ApprovalProcess> queryWrapper = new QueryWrapper<>(approvalProcess); QueryWrapper<ApprovalProcess> queryWrapper = new QueryWrapper<>(approvalProcess);
queryWrapper.orderByDesc("create_time"); queryWrapper.orderByDesc("create_time");
if (approvalProcess.getTimeType() != null) {
if (approvalProcess.getTimeType() == 1) { if (approvalProcess.getTimeType() == 1) {
queryWrapper.ge("create_time", System.currentTimeMillis() - 3 * 24 * 60 * 60 * 1000); queryWrapper.ge("create_time", System.currentTimeMillis() - 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.ge("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.ge("create_time", System.currentTimeMillis() - 30 * 24 * 60 * 60 * 1000);
} }
}
List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper); List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper);
for (ApprovalProcess process : list) { for (ApprovalProcess process : list) {
@ -138,15 +135,13 @@ public class ApprovalProcessController extends BaseController {
@ApiOperation("根据用户id查") @ApiOperation("根据用户id查")
@PostMapping("/getByuserId") @PostMapping("/getByuserId/{id}")
public TableDataInfo getByuserId(ApprovalProcess approvalProcess) { public TableDataInfo getByuserId(ApprovalProcess approvalProcess) {
List<ApprovalProcess> list = approvalsProcessService.lambdaQuery() List<ApprovalProcess> list = approvalsProcessService.lambdaQuery()
.eq(ApprovalProcess::getSubmitterId, approvalProcess.getSubmitterId()) .eq(ApprovalProcess::getSubmitterId, approvalProcess.getSubmitterId())
.eq(approvalProcess.getApprovalStatus() != null, ApprovalProcess::getApprovalStatus, approvalProcess.getApprovalStatus()) .eq(approvalProcess.getApprovalStatus() != null, ApprovalProcess::getApprovalStatus, approvalProcess.getApprovalStatus())
.eq(approvalProcess.getCcName() != null, ApprovalProcess::getCcName, approvalProcess.getCcName()) .eq(approvalProcess.getCcName() != null, ApprovalProcess::getCcName, approvalProcess.getCcName())
.eq(approvalProcess.getProcessTitle() != null, ApprovalProcess::getProcessTitle, approvalProcess.getProcessTitle()) .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) .orderByDesc(ApprovalProcess::getCreateTime)
.list(); .list();