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

Compare commits

base: lijingtong:de36e69a7f4435fb40d530f3300b3a1a557222d1
Branches Tags
lijingtong:master
..
compare: lijingtong:2fa020173262bcd19c5a69a3b75e8b161871afdf
Branches Tags
lijingtong:master

2 Commits
de36e69a7f ... 2fa0201732

Author SHA1 Message Date
李京通 2fa0201732 Merge remote-tracking branch 'origin/master' 2025-06-09 11:55:50 +08:00
李京通 89d1c82b7c feat:showtime 2025-06-09 11:55:44 +08:00
1 changed files with 15 additions and 10 deletions
Show Stats Expand all files Collapse all files

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

@ -49,13 +49,16 @@ public class ApprovalProcessController extends BaseController {
startPage();
QueryWrapper<ApprovalProcess> queryWrapper = new QueryWrapper<>(approvalProcess);
queryWrapper.orderByDesc("create_time");
if (approvalProcess.getTimeType() == 1) {
queryWrapper.ge("create_time", System.currentTimeMillis() - 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);
if (approvalProcess.getTimeType() != null) {
if (approvalProcess.getTimeType() == 1) {
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();
@ -200,7 +205,7 @@ public class ApprovalProcessController extends BaseController {
public AjaxResult getById(@PathVariable Long id) {
ApprovalProcess byId = approvalsProcessService.getById(id);
Integer matterType = byId.getMatterType();
if (matterType == 2){
if (matterType == 2) {
BusinessTripApproval one = businessTripApprovalService.lambdaQuery()
.eq(BusinessTripApproval::getUuid, byId.getUuid())
.last("LIMIT 1")
@ -208,14 +213,14 @@ public class ApprovalProcessController extends BaseController {
one.setDestinationIdCn(byId.getBusinessTripDestination());
return AjaxResult.success(one);
}
if (matterType == 3){
if (matterType == 3) {
PoliceLeaveApproval one = policeLeaveApprovalService.lambdaQuery()
.eq(PoliceLeaveApproval::getUuid, byId.getUuid())
.last("LIMIT 1")
.one();
return AjaxResult.success(one);
}
if (matterType == 4){
if (matterType == 4) {
NonWorkingDayDrinkingReport one = nonWorkingDayDrinkingReportService.lambdaQuery()
.eq(NonWorkingDayDrinkingReport::getUuid, byId.getUuid())
.last("LIMIT 1")