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-09 23:53:04 +08:00
parent e60d556bbf aaaaf826fd
commit 673482afd3
2 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,9 +55,9 @@ public class ApprovalProcessController extends BaseController {
} }
} }
if (approvalProcess.getProcessTitle() != null) { if (approvalProcess.getProcessTitles() != null) {
queryWrapper.like("process_title", approvalProcess.getProcessTitle()) queryWrapper.like("process_title", approvalProcess.getProcessTitles())
.or().like("submitter_name", approvalProcess.getProcessTitle()); .or().like("submitter_name", approvalProcess.getProcessTitles());
} }
if (approvalProcess.getSubmitterId() != null) { if (approvalProcess.getSubmitterId() != null) {
@ -69,58 +69,61 @@ 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 { } 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 { } 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 { } else {
continue; continue;
} }
@ -214,9 +217,9 @@ public class ApprovalProcessController extends BaseController {
queryWrapper.ge("create_time", System.currentTimeMillis() - 30 * 24 * 60 * 60 * 1000L); queryWrapper.ge("create_time", System.currentTimeMillis() - 30 * 24 * 60 * 60 * 1000L);
} }
} }
if (approvalProcess.getProcessTitle() != null) { if (approvalProcess.getProcessTitles() != null) {
queryWrapper.like("process_title", approvalProcess.getProcessTitle()) queryWrapper.like("process_title", approvalProcess.getProcessTitles())
.or().like("submitter_name", approvalProcess.getProcessTitle()); .or().like("submitter_name", approvalProcess.getProcessTitles());
} }
queryWrapper.eq("submitter_id", getLoginUser().getUserId()); queryWrapper.eq("submitter_id", getLoginUser().getUserId());
List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper); List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper);

2
gather-app/src/main/java/com/ruoyi/business/controller/gwglLogController.java
View File

@ -31,7 +31,7 @@ public class gwglLogController extends BaseController {
public TableDataInfo query(@RequestBody gwglLog gwglLog){ public TableDataInfo query(@RequestBody gwglLog gwglLog){
startPage(); startPage();
QueryWrapper<gwglLog> queryWrapper = new QueryWrapper<>(gwglLog); QueryWrapper<gwglLog> queryWrapper = new QueryWrapper<>(gwglLog);
queryWrapper.orderByDesc("create_time"); // queryWrapper.orderByDesc("create_time");
return getDataTable(gwglLogService.list(queryWrapper)); return getDataTable(gwglLogService.list(queryWrapper));
} }