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

修改

This commit is contained in:
hanrenchun 2025-06-09 23:51:30 +08:00
parent 77819056a5
commit aaaaf826fd
1 changed files with 36 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,64 +67,60 @@ public class ApprovalProcessController extends BaseController {
List<ApprovalProcess> newList = new ArrayList<>(); List<ApprovalProcess> newList = new ArrayList<>();
for (ApprovalProcess process : list) { for (ApprovalProcess process : list) {
if (process.getMatterType() == 2) { if (process.getMatterType() == 2) {
gwglLog one = gwglLogService.lambdaQuery() List<gwglLog> list1 = gwglLogService.lambdaQuery()
.eq(gwglLog::getUuid, process.getUuid()) .eq(gwglLog::getUuid, process.getUuid())
.orderByDesc(gwglLog::getCreateTime) .orderByAsc(gwglLog::getCreateTime).list();
.last("LIMIT 1") if (list1 != null && !list1.isEmpty()) {
.one(); for (gwglLog gwglLog : list1) {
if (one != null) { if ((gwglLog.getCheckUserId() != null && gwglLog.getCheckUserId().equals(getUserId().toString()))
if ((one.getCheckUserId() != null && one.getCheckUserId().equals(getUserId().toString())) || (gwglLog.getChecker() != null && gwglLog.getChecker().equals(getNickname()))) {
|| (one.getChecker() != null && one.getChecker().equals(getNickname()))) { if (gwglLog.getCheckState() == 0) {
if (one.getCheckState() == 0) {
process.setApprovalStatus(0); process.setApprovalStatus(0);
break;
} else { } else {
process.setApprovalStatus(1); process.setApprovalStatus(1);
} }
} }
else {
continue;
} }
}else { }else {
continue; continue;
} }
} }
if (process.getMatterType() == 3) { if (process.getMatterType() == 3) {
gwglLog one = gwglLogService.lambdaQuery() List<gwglLog> list1 = gwglLogService.lambdaQuery()
.eq(gwglLog::getApplyNo, process.getApprovalNo()) .eq(gwglLog::getApplyNo, process.getApprovalNo())
.orderByDesc(gwglLog::getCreateTime) .orderByAsc(gwglLog::getCreateTime).list();
.last("LIMIT 1") if (list1 != null && !list1.isEmpty()) {
.one(); for (gwglLog gwglLog : list1) {
if (one != null) { if ((gwglLog.getCheckUserId() != null && gwglLog.getCheckUserId().equals(getUserId().toString()))
if ((one.getCheckUserId() != null && one.getCheckUserId().equals(getUserId().toString())) || (gwglLog.getChecker() != null && gwglLog.getChecker().equals(getNickname()))) {
|| (one.getChecker() != null && one.getChecker().equals(getNickname()))) { if (gwglLog.getCheckState() == 0) {
if (one.getCheckState() == 0) {
process.setApprovalStatus(0); process.setApprovalStatus(0);
break;
} else { } else {
process.setApprovalStatus(1); process.setApprovalStatus(1);
} }
}else { }
continue;
} }
}else { }else {
continue; continue;
} }
} }
if (process.getMatterType() == 4) { if (process.getMatterType() == 4) {
gwglLog one = gwglLogService.lambdaQuery() List<gwglLog> list1 = gwglLogService.lambdaQuery()
.eq(gwglLog::getApplyNo, process.getApprovalNo()) .eq(gwglLog::getApplyNo, process.getApprovalNo())
.orderByDesc(gwglLog::getCreateTime) .orderByAsc(gwglLog::getCreateTime).list();
.last("LIMIT 1") if (list1 != null && !list1.isEmpty()) {
.one(); for (gwglLog gwglLog : list1) {
if (one != null) { if ((gwglLog.getCheckUserId() != null && gwglLog.getCheckUserId().equals(getUserId().toString()))
if ((one.getCheckUserId() != null && one.getCheckUserId().equals(getUserId().toString())) || (gwglLog.getChecker() != null && gwglLog.getChecker().equals(getNickname()))) {
|| (one.getChecker() != null && one.getChecker().equals(getNickname()))) { if (gwglLog.getCheckState() == 0) {
if (one.getCheckState() == 0) {
process.setApprovalStatus(0); process.setApprovalStatus(0);
break;
} else { } else {
process.setApprovalStatus(1); process.setApprovalStatus(1);
} }
}else { }
continue;
} }
}else { }else {
continue; continue;