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

Compare commits

base: lijingtong:7a3f1498c21b58e4d97770ce41bd26f83f564c3a
Branches Tags
lijingtong:master
...
compare: lijingtong:01494a09d3640dca212e859a2c3e386beb7392d1
Branches Tags
lijingtong:master

2 Commits
7a3f1498c2 ... 01494a09d3

Author SHA1 Message Date
hanrenchun 01494a09d3 Merge remote-tracking branch 'origin/master' 2025-06-10 11:26:10 +08:00
hanrenchun a75fab9697 修改 2025-06-10 11:26:00 +08:00
1 changed files with 13 additions and 4 deletions
Show Stats 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) {
approvalProcess.setApprovalStatusH(100);
userIds.add(2165L);
addLog(approvalProcess, userIds);
} else {
approvalProcess.setApprovalStatusH(400);
userIds.add(1660L);
userIds.add(1661L);
approvalProcess.setApprovalStatusH(500);
// userIds.add(1660L);
// userIds.add(1661L);
}
addLog(approvalProcess, userIds);
}
if (approvalStatus == 100) {
if (dto.getDriverName() == null) {
@ -571,6 +571,15 @@ public class BusinessTripApprovalController extends BaseController {
}
if (approvalStatus == 400) {
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.setCheckTime(System.currentTimeMillis() / 1000L);