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

修改

This commit is contained in:
hanrenchun 2025-06-09 21:12:50 +08:00
parent a0e79e24ab
commit 43129b0bca
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,14 +5,8 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.database.domain.ApprovalProcess; import com.ruoyi.database.domain.*;
import com.ruoyi.database.domain.BusinessTripApproval; import com.ruoyi.database.service.*;
import com.ruoyi.database.domain.NonWorkingDayDrinkingReport;
import com.ruoyi.database.domain.PoliceLeaveApproval;
import com.ruoyi.database.service.ApprovalProcessService;
import com.ruoyi.database.service.BusinessTripApprovalService;
import com.ruoyi.database.service.NonWorkingDayDrinkingReportService;
import com.ruoyi.database.service.PoliceLeaveApprovalService;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -42,6 +36,7 @@ public class ApprovalProcessController extends BaseController {
private final NonWorkingDayDrinkingReportService nonWorkingDayDrinkingReportService; private final NonWorkingDayDrinkingReportService nonWorkingDayDrinkingReportService;
private final PoliceLeaveApprovalService policeLeaveApprovalService; private final PoliceLeaveApprovalService policeLeaveApprovalService;
private final ISysUserService sysUserService; private final ISysUserService sysUserService;
private final gwglLogService gwglLogService;
@PostMapping("/list") @PostMapping("/list")
@ -67,6 +62,20 @@ public class ApprovalProcessController extends BaseController {
for (ApprovalProcess process : list) { for (ApprovalProcess process : list) {
if (process.getMatterType() == 2){
gwglLog one = gwglLogService.lambdaQuery()
.eq(gwglLog::getUuid, process.getUuid())
.orderByDesc(gwglLog::getCreateTime)
.last("LIMIT 1")
.one();
if (one != null){
if (one.getCheckState() == 0) {
process.setApprovalStatus(0);
}else {
process.setApprovalStatus(1);
}
}
}
// 如果创建时间为当天的时间 // 如果创建时间为当天的时间
if (process.getCreateTime() > System.currentTimeMillis() - 24 * 60 * 60 * 1000) { if (process.getCreateTime() > System.currentTimeMillis() - 24 * 60 * 60 * 1000) {
// 一分钟之内，显示刚刚 // 一分钟之内，显示刚刚