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

Compare commits

base: lijingtong:e5bc9c7dac117f7fdb60a3d6e48dc93d3eaf705f
Branches Tags
lijingtong:master
..
compare: lijingtong:51112f346e155dc693516315a2561a2d9e9a495f
Branches Tags
lijingtong:master

2 Commits
e5bc9c7dac ... 51112f346e

Author SHA1 Message Date
李京通 51112f346e Merge remote-tracking branch 'origin/master' 2025-06-10 00:30:17 +08:00
李京通 d4a3d1097b feat: 时间、reason 2025-06-10 00:30:10 +08:00
1 changed files with 18 additions and 16 deletions
Show Stats Expand all files Collapse all files

34
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);
@ -246,10 +246,9 @@ 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);
@ -258,15 +257,19 @@ public class PoliceLeaveApprovalController extends BaseController {
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(policeLeaveApproval.getCreateTime());
gwglLog.setUserName(user.getNickName()); gwglLog.setReason(policeLeaveApproval.getReason());
gwglLog.setCheckState(0); gwglLog.setResult(state);
gwglLog.setCreateTime(new Date().getTime()); gwglLog.setType(policeLeaveApproval.getLeaveType());
gwglLogService.save(gwglLog); gwglLog.setReason(policeLeaveApproval.getReason());
gwglLog.setChecker("刘成志和陈列");
gwglLog.setCheckTime(System.currentTimeMillis()/1000L);
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);
@ -326,11 +329,10 @@ 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);