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:
李京通 2025-06-10 11:42:38 +08:00
parent bff5fa5b73 01494a09d3
commit 1a238fcf42
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java
View File

@ -534,12 +534,12 @@ public class BusinessTripApprovalController extends BaseController {
if (businessTripApproval.getHasOffcialCar() == 1) { if (businessTripApproval.getHasOffcialCar() == 1) {
approvalProcess.setApprovalStatusH(100); approvalProcess.setApprovalStatusH(100);
userIds.add(2165L); userIds.add(2165L);
addLog(approvalProcess, userIds);
} else { } else {
approvalProcess.setApprovalStatusH(400); approvalProcess.setApprovalStatusH(500);
userIds.add(1660L); // userIds.add(1660L);
userIds.add(1661L); // userIds.add(1661L);
} }
addLog(approvalProcess, userIds);
} }
if (approvalStatus == 100) { if (approvalStatus == 100) {
if (dto.getDriverName() == null) { if (dto.getDriverName() == null) {
@ -571,6 +571,15 @@ public class BusinessTripApprovalController extends BaseController {
} }
if (approvalStatus == 400) { if (approvalStatus == 400) {
approvalProcess.setApprovalStatusH(500); approvalProcess.setApprovalStatusH(500);
if (businessTripApproval.getHasOffcialCar() == 1) {
approvalProcess.setApprovalStatusH(450);
List<Long> userIds = new ArrayList<>();
userIds.add(approvalProcess.getSubmitterId());
addLog(approvalProcess, userIds);
}
}
if (approvalStatus == 450) {
approvalProcess.setApprovalStatusH(500);
} }
one.setCheckState(dto.getState()); one.setCheckState(dto.getState());
one.setCheckTime(System.currentTimeMillis() / 1000L); one.setCheckTime(System.currentTimeMillis() / 1000L);