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

Compare commits

base: lijingtong:8210cee797b626e74e06554b78e42848b20d60f1
Branches Tags
lijingtong:master
..
compare: lijingtong:6a5f68accf46398af1e136ac0f550be766a68549
Branches Tags
lijingtong:master

No commits in common. "8210cee797b626e74e06554b78e42848b20d60f1" and "6a5f68accf46398af1e136ac0f550be766a68549" have entirely different histories.
8210cee797 ... 6a5f68accf

2 changed files with 7 additions and 25 deletions
Show Stats Expand all files Collapse all files

10
gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java
View File

@ -38,10 +38,7 @@ public class NonWorkingDayDrinkingReportController extends BaseController {
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo query(NonWorkingDayDrinkingReport nonWorkingDayDrinkingReport) { public TableDataInfo query(NonWorkingDayDrinkingReport nonWorkingDayDrinkingReport) {
List<SysDept> sysDepts = deptService.selectAllDeptList(); List<SysDept> sysDepts = deptService.selectAllDeptList();
// 部门领导
List<String> leader = sysDepts.stream().map(SysDept::getLeader).collect(Collectors.toList()); List<String> leader = sysDepts.stream().map(SysDept::getLeader).collect(Collectors.toList());
// 局党委和分管局成员
List<String> leaderLeader = sysDepts.stream().map(SysDept::getLeaderLeader).distinct().collect(Collectors.toList());
startPage(); startPage();
SysUser user = getLoginUser().getUser(); SysUser user = getLoginUser().getUser();
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@ -72,7 +69,7 @@ public class NonWorkingDayDrinkingReportController extends BaseController {
List<NonWorkingDayDrinkingReport> list = nonWorkingDayDrinkingReportService.list(queryWrapper); List<NonWorkingDayDrinkingReport> list = nonWorkingDayDrinkingReportService.list(queryWrapper);
long count = nonWorkingDayDrinkingReportService.count(queryWrapper); long count = nonWorkingDayDrinkingReportService.count(queryWrapper);
return getDataTableEnhance(list, count); return getDataTableEnhance(list, count);
}else if (leaderLeader.contains(user.getNickName())){ }else if ("分管局领导".equals(user.getNickName())){
// 分管局领导 // 分管局领导
queryWrapper.eq("user_type",1); queryWrapper.eq("user_type",1);
List<NonWorkingDayDrinkingReport> list = nonWorkingDayDrinkingReportService.list(queryWrapper); List<NonWorkingDayDrinkingReport> list = nonWorkingDayDrinkingReportService.list(queryWrapper);
@ -99,10 +96,7 @@ public class NonWorkingDayDrinkingReportController extends BaseController {
@PostMapping("/add") @PostMapping("/add")
public AjaxResult add(@RequestBody NonWorkingDayDrinkingReport nonWorkingDayDrinkingReport) { public AjaxResult add(@RequestBody NonWorkingDayDrinkingReport nonWorkingDayDrinkingReport) {
List<SysDept> sysDepts = deptService.selectAllDeptList(); List<SysDept> sysDepts = deptService.selectAllDeptList();
// 部门领导
List<String> leader = sysDepts.stream().map(SysDept::getLeader).collect(Collectors.toList()); List<String> leader = sysDepts.stream().map(SysDept::getLeader).collect(Collectors.toList());
// 局党委和分管局成员
List<String> leaderLeader = sysDepts.stream().map(SysDept::getLeaderLeader).distinct().collect(Collectors.toList());
SysUser user = getLoginUser().getUser(); SysUser user = getLoginUser().getUser();
if (nonWorkingDayDrinkingReport.getId() == null) { if (nonWorkingDayDrinkingReport.getId() == null) {
nonWorkingDayDrinkingReport.setCreateBy(user.getNickName()); nonWorkingDayDrinkingReport.setCreateBy(user.getNickName());
@ -114,7 +108,7 @@ public class NonWorkingDayDrinkingReportController extends BaseController {
if (leader.contains(user.getNickName())) { if (leader.contains(user.getNickName())) {
// 单位领导 // 单位领导
nonWorkingDayDrinkingReport.setUserType(1); nonWorkingDayDrinkingReport.setUserType(1);
} else if (leaderLeader.contains(user.getNickName())) { } else if ("前、现局党委成员".equals(user.getNickName())) {
nonWorkingDayDrinkingReport.setUserType(2); nonWorkingDayDrinkingReport.setUserType(2);
} else { } else {
// 普通民警 // 普通民警

22
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
View File

@ -1,15 +1,14 @@
package com.ruoyi.common.core.domain.entity; package com.ruoyi.common.core.domain.entity;
import com.ruoyi.common.core.domain.BaseEntity; import java.util.ArrayList;
import org.apache.commons.lang3.builder.ToStringBuilder; import java.util.List;
import org.apache.commons.lang3.builder.ToStringStyle;
import javax.validation.constraints.Email; import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import java.util.ArrayList; import org.apache.commons.lang3.builder.ToStringBuilder;
import java.util.List; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 部门表 sys_dept * 部门表 sys_dept
@ -38,9 +37,6 @@ public class SysDept extends BaseEntity
/** 负责人 */ /** 负责人 */
private String leader; private String leader;
/** 负责人 */
private String leaderLeader;
/** 联系电话 */ /** 联系电话 */
private String phone; private String phone;
@ -59,14 +55,6 @@ public class SysDept extends BaseEntity
/** 子部门 */ /** 子部门 */
private List<SysDept> children = new ArrayList<SysDept>(); private List<SysDept> children = new ArrayList<SysDept>();
public String getLeaderLeader() {
return leaderLeader;
}
public void setLeaderLeader(String leaderLeader) {
this.leaderLeader = leaderLeader;
}
public Long getDeptId() public Long getDeptId()
{ {
return deptId; return deptId;