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-10 00:29:30 +08:00
parent 5b7b821e8b 4e4aa7f95a
commit e5bc9c7dac
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,7 +82,7 @@ public class ApprovalProcessController extends BaseController {
}
}
}
}else {
} else {
continue;
}
}
@ -102,7 +102,7 @@ public class ApprovalProcessController extends BaseController {
}
}
}
}else {
} else {
continue;
}
}
@ -122,7 +122,7 @@ public class ApprovalProcessController extends BaseController {
}
}
}
}else {
} else {
continue;
}
}else {

3
gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java
View File

@ -228,8 +228,9 @@ public class NonWorkingDayDrinkingReportController extends BaseController {
boolean result1 = gwglLogService.lambdaUpdate()
.eq(gwglLog::getApplyNo, nonWorkingDayDrinkingReport.getApplyNo())
.set(gwglLog::getResult, 1)
.set(gwglLog::getReason, dto.getReason())
.set(gwglLog::getChecker, user.getNickName())
.set(gwglLog::getCheckTime, System.currentTimeMillis())
.set(gwglLog::getCheckTime, System.currentTimeMillis()/1000L)
.set(gwglLog::getCheckState, state)
.update();

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

@ -251,7 +251,7 @@ public class PoliceLeaveApprovalController extends BaseController {
one.setType(1);
one.setReason(policeLeaveApproval.getReason());
one.setChecker(user.getNickName());
one.setCheckTime(System.currentTimeMillis());
one.setCheckTime(System.currentTimeMillis()/1000L);
one.setCheckState(state);
boolean result = gwglLogService.updateById(one);
@ -285,7 +285,7 @@ public class PoliceLeaveApprovalController extends BaseController {
gwglLog.setType(policeLeaveApproval.getLeaveType());
gwglLog.setReason(policeLeaveApproval.getReason());
gwglLog.setChecker("刘成志和陈列");
gwglLog.setCheckTime(System.currentTimeMillis());
gwglLog.setCheckTime(System.currentTimeMillis()/1000L);
gwglLog.setCheckState(state);
boolean result1 = gwglLogService.save(gwglLog);
} else if ("admin".equals(user.getUserName())) {
@ -306,7 +306,7 @@ public class PoliceLeaveApprovalController extends BaseController {
gwglLog.setType(policeLeaveApproval.getLeaveType());
gwglLog.setReason(policeLeaveApproval.getReason());
gwglLog.setChecker(user.getNickName());
gwglLog.setCheckTime(System.currentTimeMillis());
gwglLog.setCheckTime(System.currentTimeMillis()/1000L);
gwglLog.setCheckState(state);
boolean result1 = gwglLogService.save(gwglLog);
@ -332,7 +332,7 @@ public class PoliceLeaveApprovalController extends BaseController {
one.setType(1);
one.setReason(policeLeaveApproval.getReason());
one.setChecker(user.getNickName());
one.setCheckTime(System.currentTimeMillis());
one.setCheckTime(System.currentTimeMillis()/1000L);
one.setCheckState(state);
boolean result1 = gwglLogService.updateById(one);
boolean result = approvalsProcessService.lambdaUpdate()