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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
hanrenchun 2025-06-10 09:48:24 +08:00
parent c23b3bdff7 17632061bf
commit 870b22dd2e
1 changed files with 66 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,8 +83,8 @@ public class PoliceLeaveApprovalController extends BaseController {
// 管理员看所有 // 管理员看所有
} else if ("096001".equals(user.getUserName()) || "096002".equals(user.getUserName())) { } else if ("096001".equals(user.getUserName()) || "096002".equals(user.getUserName())) {
// 主要刘成志和陈列 // 主要刘成志和陈列
queryWrapper.eq("zzc_state", 1); queryWrapper.eq("zzc_state", 1).or().eq("user_type", 2)
queryWrapper.eq("user_type", 2); .or().eq("dept_state", 1);
} else if (leaderLeader.contains(user.getNickName())) { } else if (leaderLeader.contains(user.getNickName())) {
// 分管局 // 分管局
queryWrapper.eq("user_type", 1); queryWrapper.eq("user_type", 1);
@ -212,6 +212,9 @@ public class PoliceLeaveApprovalController extends BaseController {
Long id = dto.getId(); Long id = dto.getId();
SysUser user = getLoginUser().getUser(); SysUser user = getLoginUser().getUser();
SysDept sysDept = deptService.selectDeptById(user.getDeptId());
// 分管局领导
String leaderLeader1 = sysDept.getLeaderLeader();
Integer state = dto.getState(); Integer state = dto.getState();
PoliceLeaveApproval policeLeaveApproval = policeLeaveApprovalService.getById(id); PoliceLeaveApproval policeLeaveApproval = policeLeaveApprovalService.getById(id);
if (leader.contains(user.getNickName())) { if (leader.contains(user.getNickName())) {
@ -220,21 +223,6 @@ 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() gwglLog one = gwglLogService.lambdaQuery()
.eq(gwglLog::getApplyNo, policeLeaveApproval.getApplyNo()) .eq(gwglLog::getApplyNo, policeLeaveApproval.getApplyNo())
.orderByDesc(gwglLog::getCreateTime) .orderByDesc(gwglLog::getCreateTime)
@ -246,48 +234,76 @@ public class PoliceLeaveApprovalController extends BaseController {
one.setUserId(policeLeaveApproval.getUserId()); one.setUserId(policeLeaveApproval.getUserId());
one.setUserName(policeLeaveApproval.getName()); one.setUserName(policeLeaveApproval.getName());
one.setCreateTime(policeLeaveApproval.getCreateTime()); one.setCreateTime(policeLeaveApproval.getCreateTime());
one.setReason(policeLeaveApproval.getReason()); one.setReason(dto.getReason());
one.setResult(state); one.setResult(state);
one.setType(1); one.setType(1);
one.setReason(policeLeaveApproval.getReason());
one.setChecker(user.getNickName()); one.setChecker(user.getNickName());
one.setCheckTime(System.currentTimeMillis()/1000L); one.setCheckTime(System.currentTimeMillis() / 1000L);
one.setCheckState(state); one.setCheckState(state);
boolean result = gwglLogService.updateById(one); boolean result = gwglLogService.updateById(one);
gwglLog gwglLog = new gwglLog(); gwglLog gwglLog = new gwglLog();
gwglLog.setApplyNo(policeLeaveApproval.getApplyNo()); gwglLog.setApplyNo(policeLeaveApproval.getApplyNo());
gwglLog.setResult(1); gwglLog.setDeptId(policeLeaveApproval.getDeptId());
gwglLog.setDeptId(user.getDeptId()); gwglLog.setDeptName(policeLeaveApproval.getDeptName());
gwglLog.setDeptName(user.getDept().getDeptName()); gwglLog.setUserId(policeLeaveApproval.getUserId());
gwglLog.setUserId(user.getUserId()); gwglLog.setUserName(policeLeaveApproval.getName());
gwglLog.setChecker(user.getDept().getLeader()); gwglLog.setCreateTime(System.currentTimeMillis() / 1000L);
gwglLog.setUserName(user.getNickName()); gwglLog.setResult(0);
gwglLog.setType(policeLeaveApproval.getLeaveType());
gwglLog.setChecker("政治处");
gwglLog.setCheckState(0); gwglLog.setCheckState(0);
gwglLog.setCreateTime(new Date().getTime()); boolean result1 = gwglLogService.save(gwglLog);
gwglLogService.save(gwglLog);
} else if ("096484".equals(user.getUserName())) { } else if ("096484".equals(user.getUserName())) {
//政治处侍昌鑫 //政治处侍昌鑫
policeLeaveApproval.setZzcState(state); policeLeaveApproval.setZzcState(state);
if (state == 2) { if (state == 2) {
policeLeaveApproval.setState(2); policeLeaveApproval.setState(2);
} }
if (policeLeaveApproval.getUserType() == 0) {
// 政治处审核普通民警
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(System.currentTimeMillis() / 1000L);
one.setResult(state);
one.setType(1);
one.setReason(dto.getReason());
one.setChecker(user.getNickName());
one.setCheckTime(System.currentTimeMillis() / 1000L);
one.setCheckState(state);
boolean result1 = gwglLogService.updateById(one);
} else {
gwglLog gwglLog = new gwglLog(); gwglLog gwglLog = new gwglLog();
gwglLog.setApplyNo(policeLeaveApproval.getApplyNo()); gwglLog.setApplyNo(policeLeaveApproval.getApplyNo());
gwglLog.setDeptId(policeLeaveApproval.getDeptId()); gwglLog.setDeptId(policeLeaveApproval.getDeptId());
gwglLog.setDeptName(policeLeaveApproval.getDeptName()); gwglLog.setDeptName(policeLeaveApproval.getDeptName());
gwglLog.setUserId(policeLeaveApproval.getUserId()); gwglLog.setUserId(policeLeaveApproval.getUserId());
gwglLog.setUserName(policeLeaveApproval.getName()); gwglLog.setUserName(policeLeaveApproval.getName());
gwglLog.setCreateTime(policeLeaveApproval.getCreateTime()); gwglLog.setCreateTime(System.currentTimeMillis() / 1000L);
gwglLog.setReason(policeLeaveApproval.getReason());
gwglLog.setResult(state); gwglLog.setResult(state);
gwglLog.setType(policeLeaveApproval.getLeaveType()); gwglLog.setType(policeLeaveApproval.getLeaveType());
gwglLog.setReason(policeLeaveApproval.getReason());
gwglLog.setChecker("刘成志和陈列"); gwglLog.setChecker("刘成志和陈列");
gwglLog.setCheckTime(System.currentTimeMillis()/1000L); gwglLog.setCheckTime(System.currentTimeMillis() / 1000L);
gwglLog.setCheckState(state); gwglLog.setCheckState(0);
boolean result1 = gwglLogService.save(gwglLog); boolean result1 = gwglLogService.save(gwglLog);
boolean result = approvalsProcessService.lambdaUpdate()
.eq(ApprovalProcess::getUuid, policeLeaveApproval.getUuid())
.set(ApprovalProcess::getApprovalStatus, state)
.set(ApprovalProcess::getCcName,leaderLeader1)
.set(ApprovalProcess::getReadStatus,0)
.update();
}
} else if ("admin".equals(user.getUserName())) { } else if ("admin".equals(user.getUserName())) {
// 管理员看所有 // 管理员看所有
policeLeaveApproval.setDeptState(state); policeLeaveApproval.setDeptState(state);
@ -306,7 +322,7 @@ public class PoliceLeaveApprovalController extends BaseController {
gwglLog.setType(policeLeaveApproval.getLeaveType()); gwglLog.setType(policeLeaveApproval.getLeaveType());
gwglLog.setReason(policeLeaveApproval.getReason()); gwglLog.setReason(policeLeaveApproval.getReason());
gwglLog.setChecker(user.getNickName()); gwglLog.setChecker(user.getNickName());
gwglLog.setCheckTime(System.currentTimeMillis()/1000L); gwglLog.setCheckTime(System.currentTimeMillis() / 1000L);
gwglLog.setCheckState(state); gwglLog.setCheckState(state);
boolean result1 = gwglLogService.save(gwglLog); boolean result1 = gwglLogService.save(gwglLog);
@ -326,18 +342,19 @@ public class PoliceLeaveApprovalController extends BaseController {
one.setDeptName(policeLeaveApproval.getDeptName()); one.setDeptName(policeLeaveApproval.getDeptName());
one.setUserId(policeLeaveApproval.getUserId()); one.setUserId(policeLeaveApproval.getUserId());
one.setUserName(policeLeaveApproval.getName()); one.setUserName(policeLeaveApproval.getName());
one.setCreateTime(policeLeaveApproval.getCreateTime()); one.setCreateTime(System.currentTimeMillis() / 1000L);
one.setReason(policeLeaveApproval.getReason());
one.setResult(state); one.setResult(state);
one.setType(1); one.setType(1);
one.setReason(policeLeaveApproval.getReason()); one.setReason(dto.getReason());
one.setChecker(user.getNickName()); one.setChecker(user.getNickName());
one.setCheckTime(System.currentTimeMillis()/1000L); one.setCheckTime(System.currentTimeMillis() / 1000L);
one.setCheckState(state); one.setCheckState(state);
boolean result1 = gwglLogService.updateById(one); 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)
.set(ApprovalProcess::getCcName,leaderLeader1)
.set(ApprovalProcess::getReadStatus,0)
.update(); .update();
if (!result && !result1) { if (!result && !result1) {
return AjaxResult.success("审批请（休）假失败"); return AjaxResult.success("审批请（休）假失败");