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

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java
This commit is contained in:
hanrenchun 2025-06-09 22:52:14 +08:00
parent 90b56cb553 41cb9852ca
commit ac57acc4b2
2 changed files with 67 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,6 +219,7 @@ public class ApprovalProcessController extends BaseController {
queryWrapper.eq("submitter_id", getLoginUser().getUserId()); queryWrapper.eq("submitter_id", getLoginUser().getUserId());
List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper); List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper);
for (ApprovalProcess process : list) { for (ApprovalProcess process : list) {
// 如果创建时间为当天的时间 // 如果创建时间为当天的时间
if (process.getCreateTime() > System.currentTimeMillis() - 24 * 60 * 60 * 1000) { if (process.getCreateTime() > System.currentTimeMillis() - 24 * 60 * 60 * 1000) {
// 一分钟之内，显示刚刚 // 一分钟之内，显示刚刚

95
gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java
View File

@ -146,6 +146,7 @@ public class PoliceLeaveApprovalController extends BaseController {
gwglLog gwglLog = new gwglLog(); gwglLog gwglLog = new gwglLog();
gwglLog.setApplyNo(s); gwglLog.setApplyNo(s);
gwglLog.setResult(1); gwglLog.setResult(1);
gwglLog.setCheckState(0);
gwglLog.setDeptId(user.getDeptId()); gwglLog.setDeptId(user.getDeptId());
gwglLog.setDeptName(user.getDept().getDeptName()); gwglLog.setDeptName(user.getDept().getDeptName());
gwglLog.setUserId(user.getUserId()); gwglLog.setUserId(user.getUserId());
@ -219,21 +220,53 @@ public class PoliceLeaveApprovalController extends BaseController {
if (state == 2) { if (state == 2) {
policeLeaveApproval.setState(2); policeLeaveApproval.setState(2);
} }
// gwglLog gwglLog = new gwglLog();
// gwglLog.setApplyNo(policeLeaveApproval.getApplyNo());
// gwglLog.setDeptId(policeLeaveApproval.getDeptId());
// gwglLog.setDeptName(policeLeaveApproval.getDeptName());
// gwglLog.setUserId(policeLeaveApproval.getUserId());
// gwglLog.setUserName(policeLeaveApproval.getName());
// gwglLog.setCreateTime(policeLeaveApproval.getCreateTime());
// gwglLog.setReason(policeLeaveApproval.getReason());
// gwglLog.setResult(state);
// gwglLog.setType(1);
// gwglLog.setReason(policeLeaveApproval.getReason());
// gwglLog.setChecker(user.getNickName());
// gwglLog.setCheckTime(System.currentTimeMillis());
// gwglLog.setCheckState(state);
// boolean result1 = gwglLogService.save(gwglLog);
gwglLog one = gwglLogService.lambdaQuery()
.eq(gwglLog::getApplyNo, policeLeaveApproval.getApplyNo())
.orderByDesc(gwglLog::getCreateTime)
.last("LIMIT 1")
.one();
one.setApplyNo(policeLeaveApproval.getApplyNo());
one.setDeptId(policeLeaveApproval.getDeptId());
one.setDeptName(policeLeaveApproval.getDeptName());
one.setUserId(policeLeaveApproval.getUserId());
one.setUserName(policeLeaveApproval.getName());
one.setCreateTime(policeLeaveApproval.getCreateTime());
one.setReason(policeLeaveApproval.getReason());
one.setResult(state);
one.setType(1);
one.setReason(policeLeaveApproval.getReason());
one.setChecker(user.getNickName());
one.setCheckTime(System.currentTimeMillis());
one.setCheckState(state);
boolean result = gwglLogService.updateById(one);
gwglLog gwglLog = new gwglLog(); gwglLog gwglLog = new gwglLog();
gwglLog.setApplyNo(policeLeaveApproval.getApplyNo()); gwglLog.setApplyNo(policeLeaveApproval.getApplyNo());
gwglLog.setDeptId(policeLeaveApproval.getDeptId()); gwglLog.setResult(1);
gwglLog.setDeptName(policeLeaveApproval.getDeptName()); gwglLog.setDeptId(user.getDeptId());
gwglLog.setUserId(policeLeaveApproval.getUserId()); gwglLog.setDeptName(user.getDept().getDeptName());
gwglLog.setUserName(policeLeaveApproval.getName()); gwglLog.setUserId(user.getUserId());
gwglLog.setCreateTime(policeLeaveApproval.getCreateTime()); gwglLog.setChecker(user.getDept().getLeader());
gwglLog.setReason(policeLeaveApproval.getReason()); gwglLog.setUserName(user.getNickName());
gwglLog.setResult(state); gwglLog.setCheckState(0);
gwglLog.setType(1); gwglLog.setCreateTime(new Date().getTime());
gwglLog.setReason(policeLeaveApproval.getReason()); gwglLogService.save(gwglLog);
gwglLog.setChecker(user.getNickName());
gwglLog.setCheckTime(System.currentTimeMillis());
gwglLog.setCheckState(state);
boolean result1 = gwglLogService.save(gwglLog);
} else if ("096484".equals(user.getUserName())) { } else if ("096484".equals(user.getUserName())) {
//政治处侍昌鑫 //政治处侍昌鑫
policeLeaveApproval.setZzcState(state); policeLeaveApproval.setZzcState(state);
@ -251,7 +284,7 @@ public class PoliceLeaveApprovalController extends BaseController {
gwglLog.setResult(state); gwglLog.setResult(state);
gwglLog.setType(policeLeaveApproval.getLeaveType()); gwglLog.setType(policeLeaveApproval.getLeaveType());
gwglLog.setReason(policeLeaveApproval.getReason()); gwglLog.setReason(policeLeaveApproval.getReason());
gwglLog.setChecker(user.getNickName()); gwglLog.setChecker("刘成志和陈列");
gwglLog.setCheckTime(System.currentTimeMillis()); gwglLog.setCheckTime(System.currentTimeMillis());
gwglLog.setCheckState(state); gwglLog.setCheckState(state);
boolean result1 = gwglLogService.save(gwglLog); boolean result1 = gwglLogService.save(gwglLog);
@ -283,21 +316,25 @@ public class PoliceLeaveApprovalController extends BaseController {
policeLeaveApproval.setState(2); policeLeaveApproval.setState(2);
} }
policeLeaveApproval.setLeaderState(state); policeLeaveApproval.setLeaderState(state);
gwglLog gwglLog = new gwglLog(); gwglLog one = gwglLogService.lambdaQuery()
gwglLog.setApplyNo(policeLeaveApproval.getApplyNo()); .eq(gwglLog::getApplyNo, policeLeaveApproval.getApplyNo())
gwglLog.setDeptId(policeLeaveApproval.getDeptId()); .orderByDesc(gwglLog::getCreateTime)
gwglLog.setDeptName(policeLeaveApproval.getDeptName()); .last("LIMIT 1")
gwglLog.setUserId(policeLeaveApproval.getUserId()); .one();
gwglLog.setUserName(policeLeaveApproval.getName()); one.setApplyNo(policeLeaveApproval.getApplyNo());
gwglLog.setCreateTime(policeLeaveApproval.getCreateTime()); one.setDeptId(policeLeaveApproval.getDeptId());
gwglLog.setReason(policeLeaveApproval.getReason()); one.setDeptName(policeLeaveApproval.getDeptName());
gwglLog.setResult(state); one.setUserId(policeLeaveApproval.getUserId());
gwglLog.setType(policeLeaveApproval.getLeaveType()); one.setUserName(policeLeaveApproval.getName());
gwglLog.setReason(policeLeaveApproval.getReason()); one.setCreateTime(policeLeaveApproval.getCreateTime());
gwglLog.setChecker(user.getNickName()); one.setReason(policeLeaveApproval.getReason());
gwglLog.setCheckTime(System.currentTimeMillis()); one.setResult(state);
gwglLog.setCheckState(state); one.setType(1);
boolean result1 = gwglLogService.save(gwglLog); one.setReason(policeLeaveApproval.getReason());
one.setChecker(user.getNickName());
one.setCheckTime(System.currentTimeMillis());
one.setCheckState(state);
boolean result1 = gwglLogService.updateById(one);
boolean result = approvalsProcessService.lambdaUpdate() boolean result = approvalsProcessService.lambdaUpdate()
.eq(ApprovalProcess::getUuid, policeLeaveApproval.getUuid()) .eq(ApprovalProcess::getUuid, policeLeaveApproval.getUuid())
.set(ApprovalProcess::getApprovalStatus, state) .set(ApprovalProcess::getApprovalStatus, state)