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

Compare commits

base: lijingtong:870b22dd2e4a797f7342fdeb014494fc24e814c2
Branches Tags
lijingtong:master
..
compare: lijingtong:17632061bff12fa7c5838b591c8adca328906c35
Branches Tags
lijingtong:master

No commits in common. "870b22dd2e4a797f7342fdeb014494fc24e814c2" and "17632061bff12fa7c5838b591c8adca328906c35" have entirely different histories.
870b22dd2e ... 17632061bf

1 changed files with 8 additions and 33 deletions
Show Stats Expand all files Collapse all files

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

@ -3,7 +3,6 @@ package com.ruoyi.business.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.controller.BaseController;
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.page.TableDataInfo;
import com.ruoyi.database.domain.*;
@ -71,7 +70,7 @@ public class ApprovalProcessController extends BaseController {
List<gwglLog> list1 = gwglLogService.lambdaQuery()
.eq(gwglLog::getUuid, process.getUuid())
.orderByAsc(gwglLog::getCreateTime).list();
if (list1 != null && !list1.isEmpty()) {
if (list1 != null && !list1.isEmpty()) {
for (gwglLog gwglLog : list1) {
if ((gwglLog.getCheckUserId() != null && gwglLog.getCheckUserId().equals(getUserId().toString()))
|| (gwglLog.getChecker() != null && gwglLog.getChecker().equals(getNickname()))) {
@ -86,11 +85,12 @@ public class ApprovalProcessController extends BaseController {
} else {
continue;
}
} else if (process.getMatterType() == 3) {
}
else if (process.getMatterType() == 3) {
List<gwglLog> list1 = gwglLogService.lambdaQuery()
.eq(gwglLog::getApplyNo, process.getApprovalNo())
.orderByAsc(gwglLog::getCreateTime).list();
if (list1 != null && !list1.isEmpty()) {
if (list1 != null && !list1.isEmpty()) {
for (gwglLog gwglLog : list1) {
if ((gwglLog.getCheckUserId() != null && gwglLog.getCheckUserId().equals(getUserId().toString()))
|| (gwglLog.getChecker() != null && gwglLog.getChecker().equals(getNickname()))) {
@ -105,11 +105,12 @@ public class ApprovalProcessController extends BaseController {
} else {
continue;
}
} else if (process.getMatterType() == 4) {
}
else if (process.getMatterType() == 4) {
List<gwglLog> list1 = gwglLogService.lambdaQuery()
.eq(gwglLog::getApplyNo, process.getApprovalNo())
.orderByAsc(gwglLog::getCreateTime).list();
if (list1 != null && !list1.isEmpty()) {
if (list1 != null && !list1.isEmpty()) {
for (gwglLog gwglLog : list1) {
if ((gwglLog.getCheckUserId() != null && gwglLog.getCheckUserId().equals(getUserId().toString()))
|| (gwglLog.getChecker() != null && gwglLog.getChecker().equals(getNickname()))) {
@ -124,7 +125,7 @@ public class ApprovalProcessController extends BaseController {
} else {
continue;
}
} else {
}else {
continue;
}
// 如果创建时间为当天的时间
@ -323,30 +324,4 @@ 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);
}
}