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

Compare commits

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

No commits in common. "51112f346e155dc693516315a2561a2d9e9a495f" and "e5bc9c7dac117f7fdb60a3d6e48dc93d3eaf705f" have entirely different histories.
51112f346e ... e5bc9c7dac

1 changed files with 16 additions and 18 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())) {
// 主要刘成志和陈列
queryWrapper.eq("zzc_state", 1).or().eq("user_type", 2)
.or().eq("dept_state", 1);
queryWrapper.eq("zzc_state", 1);
queryWrapper.eq("user_type", 2);
} else if (leaderLeader.contains(user.getNickName())) {
// 分管局
queryWrapper.eq("user_type", 1);
@ -246,9 +246,10 @@ public class PoliceLeaveApprovalController extends BaseController {
one.setUserId(policeLeaveApproval.getUserId());
one.setUserName(policeLeaveApproval.getName());
one.setCreateTime(policeLeaveApproval.getCreateTime());
one.setReason(dto.getReason());
one.setReason(policeLeaveApproval.getReason());
one.setResult(state);
one.setType(1);
one.setReason(policeLeaveApproval.getReason());
one.setChecker(user.getNickName());
one.setCheckTime(System.currentTimeMillis()/1000L);
one.setCheckState(state);
@ -257,19 +258,15 @@ public class PoliceLeaveApprovalController extends BaseController {
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(policeLeaveApproval.getLeaveType());
gwglLog.setReason(policeLeaveApproval.getReason());
gwglLog.setChecker("刘成志和陈列");
gwglLog.setCheckTime(System.currentTimeMillis()/1000L);
gwglLog.setCheckState(state);
boolean result1 = gwglLogService.save(gwglLog);
gwglLog.setResult(1);
gwglLog.setDeptId(user.getDeptId());
gwglLog.setDeptName(user.getDept().getDeptName());
gwglLog.setUserId(user.getUserId());
gwglLog.setChecker(user.getDept().getLeader());
gwglLog.setUserName(user.getNickName());
gwglLog.setCheckState(0);
gwglLog.setCreateTime(new Date().getTime());
gwglLogService.save(gwglLog);
} else if ("096484".equals(user.getUserName())) {
//政治处侍昌鑫
policeLeaveApproval.setZzcState(state);
@ -329,10 +326,11 @@ public class PoliceLeaveApprovalController extends BaseController {
one.setDeptName(policeLeaveApproval.getDeptName());
one.setUserId(policeLeaveApproval.getUserId());
one.setUserName(policeLeaveApproval.getName());
one.setCreateTime(System.currentTimeMillis()/1000L);
one.setCreateTime(policeLeaveApproval.getCreateTime());
one.setReason(policeLeaveApproval.getReason());
one.setResult(state);
one.setType(1);
one.setReason(dto.getReason());
one.setReason(policeLeaveApproval.getReason());
one.setChecker(user.getNickName());
one.setCheckTime(System.currentTimeMillis()/1000L);
one.setCheckState(state);