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 10:58:23 +08:00
parent c73423e5a4 870b22dd2e
commit 8639188e65
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@ package com.ruoyi.business.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.database.domain.*; import com.ruoyi.database.domain.*;
@ -70,7 +71,7 @@ public class ApprovalProcessController extends BaseController {
List<gwglLog> list1 = gwglLogService.lambdaQuery() List<gwglLog> list1 = gwglLogService.lambdaQuery()
.eq(gwglLog::getUuid, process.getUuid()) .eq(gwglLog::getUuid, process.getUuid())
.orderByAsc(gwglLog::getCreateTime).list(); .orderByAsc(gwglLog::getCreateTime).list();
if (list1 != null && !list1.isEmpty()) { if (list1 != null && !list1.isEmpty()) {
for (gwglLog gwglLog : list1) { for (gwglLog gwglLog : list1) {
if ((gwglLog.getCheckUserId() != null && gwglLog.getCheckUserId().equals(getUserId().toString())) if ((gwglLog.getCheckUserId() != null && gwglLog.getCheckUserId().equals(getUserId().toString()))
|| (gwglLog.getChecker() != null && gwglLog.getChecker().equals(getNickname()))) { || (gwglLog.getChecker() != null && gwglLog.getChecker().equals(getNickname()))) {
@ -85,12 +86,11 @@ public class ApprovalProcessController extends BaseController {
} else { } else {
continue; continue;
} }
} } else if (process.getMatterType() == 3) {
else if (process.getMatterType() == 3) {
List<gwglLog> list1 = gwglLogService.lambdaQuery() List<gwglLog> list1 = gwglLogService.lambdaQuery()
.eq(gwglLog::getApplyNo, process.getApprovalNo()) .eq(gwglLog::getApplyNo, process.getApprovalNo())
.orderByAsc(gwglLog::getCreateTime).list(); .orderByAsc(gwglLog::getCreateTime).list();
if (list1 != null && !list1.isEmpty()) { if (list1 != null && !list1.isEmpty()) {
for (gwglLog gwglLog : list1) { for (gwglLog gwglLog : list1) {
if ((gwglLog.getCheckUserId() != null && gwglLog.getCheckUserId().equals(getUserId().toString())) if ((gwglLog.getCheckUserId() != null && gwglLog.getCheckUserId().equals(getUserId().toString()))
|| (gwglLog.getChecker() != null && gwglLog.getChecker().equals(getNickname()))) { || (gwglLog.getChecker() != null && gwglLog.getChecker().equals(getNickname()))) {
@ -105,12 +105,11 @@ public class ApprovalProcessController extends BaseController {
} else { } else {
continue; continue;
} }
} } else if (process.getMatterType() == 4) {
else if (process.getMatterType() == 4) {
List<gwglLog> list1 = gwglLogService.lambdaQuery() List<gwglLog> list1 = gwglLogService.lambdaQuery()
.eq(gwglLog::getApplyNo, process.getApprovalNo()) .eq(gwglLog::getApplyNo, process.getApprovalNo())
.orderByAsc(gwglLog::getCreateTime).list(); .orderByAsc(gwglLog::getCreateTime).list();
if (list1 != null && !list1.isEmpty()) { if (list1 != null && !list1.isEmpty()) {
for (gwglLog gwglLog : list1) { for (gwglLog gwglLog : list1) {
if ((gwglLog.getCheckUserId() != null && gwglLog.getCheckUserId().equals(getUserId().toString())) if ((gwglLog.getCheckUserId() != null && gwglLog.getCheckUserId().equals(getUserId().toString()))
|| (gwglLog.getChecker() != null && gwglLog.getChecker().equals(getNickname()))) { || (gwglLog.getChecker() != null && gwglLog.getChecker().equals(getNickname()))) {
@ -125,7 +124,7 @@ public class ApprovalProcessController extends BaseController {
} else { } else {
continue; continue;
} }
}else { } else {
continue; continue;
} }
// 如果创建时间为当天的时间 // 如果创建时间为当天的时间
@ -324,4 +323,30 @@ public class ApprovalProcessController extends BaseController {
} }
@ApiOperation("分管局领导列表")
@GetMapping("/leaderList")
public AjaxResult leaderList() {
List<TreeSelect> list = new ArrayList<>();
SysUser user = new SysUser();
user.setDeptId(131000L);
List<SysUser> userList = sysUserService.selectUserList(user);
for (SysUser sysUser : userList) {
if (sysUser.getNickName().equals("刘敬平")
|| sysUser.getNickName().equals("周永生")
|| sysUser.getNickName().equals("贾副亮")
|| sysUser.getNickName().equals("周培基")) {
continue;
}
TreeSelect select = new TreeSelect();
select.setId(sysUser.getUserId());
select.setLabel(sysUser.getNickName());
select.setValue(sysUser.getUserId().toString());
select.setDictId(sysUser.getDeptId());
select.setDictName(sysUser.getDept().getDeptName());
list.add(select);
}
return AjaxResult.success(list);
}
} }