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

feat: 非工作日饮酒报备单

This commit is contained in:
李京通 2025-06-06 10:16:34 +08:00
parent 1410d0cf69
commit 16fd044098
3 changed files with 75 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java
View File

@ -13,7 +13,6 @@ import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
@ -34,13 +33,13 @@ public class BusinessTripApprovalController extends BaseController {
@ApiOperation("查询出差审批单")
public TableDataInfo list(BusinessTripApproval businessTripApproval) {
startPage();
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
QueryWrapper<BusinessTripApproval> qw = new QueryWrapper<>(businessTripApproval);
qw.orderByDesc("create_time");
String fTime = businessTripApproval.getFTime();
String eTime = businessTripApproval.getETime();
// String 的字符串转成LoaclDateTime格式
LocalDateTime.parse(fTime);
List<BusinessTripApproval> list = businessTripApprovalService.list(qw);
long size = list.size();
return getDataTableEnhance(list,size);

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

@ -3,11 +3,13 @@ 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.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.database.domain.NonWorkingDayDrinkingReport;
import com.ruoyi.database.domain.dto.ApprovaltDto;
import com.ruoyi.database.service.NonWorkingDayDrinkingReportService;
import com.ruoyi.system.service.ISysDeptService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.stream.Collectors;
/**
* @Description NonWorkingDayDrinkingReportController
@ -29,10 +32,15 @@ import java.util.List;
@RequiredArgsConstructor
public class NonWorkingDayDrinkingReportController extends BaseController {
private final NonWorkingDayDrinkingReportService nonWorkingDayDrinkingReportService;
private final ISysDeptService deptService;
@ApiOperation("查询非工作日饮酒报备单")
@GetMapping("/list")
public TableDataInfo query(NonWorkingDayDrinkingReport nonWorkingDayDrinkingReport) {
List<SysDept> sysDepts = deptService.selectAllDeptList();
List<String> leader = sysDepts.stream().map(SysDept::getLeader).collect(Collectors.toList());
startPage();
SysUser user = getLoginUser().getUser();
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
QueryWrapper<NonWorkingDayDrinkingReport> queryWrapper = new QueryWrapper<>(nonWorkingDayDrinkingReport);
queryWrapper.orderByDesc("create_time");
@ -40,12 +48,41 @@ public class NonWorkingDayDrinkingReportController extends BaseController {
String eTime = nonWorkingDayDrinkingReport.getETime();
LocalDateTime time = LocalDateTime.parse(fTime);
LocalDateTime time1 = LocalDateTime.parse(eTime);
if (fTime != null && fTime != null) {
if (fTime != null && fTime != null) {
queryWrapper.between("create_time", time, time1);
}
List<NonWorkingDayDrinkingReport> list = nonWorkingDayDrinkingReportService.list(queryWrapper);
long count = nonWorkingDayDrinkingReportService.count(queryWrapper);
return getDataTableEnhance(list, count);
// 管理员
if (user.getUserName().equals("admin")) {
List<NonWorkingDayDrinkingReport> list = nonWorkingDayDrinkingReportService.list(queryWrapper);
long count = nonWorkingDayDrinkingReportService.count(queryWrapper);
return getDataTableEnhance(list, count);
} else if (leader.contains(user.getNickName())) {
// 单位领导
queryWrapper.eq("dept_id", user.getDeptId());
queryWrapper.eq("user_type",0);
List<NonWorkingDayDrinkingReport> list = nonWorkingDayDrinkingReportService.list(queryWrapper);
long count = nonWorkingDayDrinkingReportService.count(queryWrapper);
return getDataTableEnhance(list, count);
} else if ("刘成志".equals(user.getNickName())) {
// 前、现局党委成员
queryWrapper.eq("user_type",2);
List<NonWorkingDayDrinkingReport> list = nonWorkingDayDrinkingReportService.list(queryWrapper);
long count = nonWorkingDayDrinkingReportService.count(queryWrapper);
return getDataTableEnhance(list, count);
}else if ("分管局领导".equals(user.getNickName())){
// 分管局领导
queryWrapper.eq("user_type",1);
List<NonWorkingDayDrinkingReport> list = nonWorkingDayDrinkingReportService.list(queryWrapper);
long count = nonWorkingDayDrinkingReportService.count(queryWrapper);
return getDataTableEnhance(list, count);
}else {
// 自己
queryWrapper.eq("user_id", user.getUserId());
queryWrapper.eq("user_type",1);
List<NonWorkingDayDrinkingReport> list = nonWorkingDayDrinkingReportService.list(queryWrapper);
long count = nonWorkingDayDrinkingReportService.count(queryWrapper);
return getDataTableEnhance(list, count);
}
}
@ApiOperation("查询非工作日饮酒报备单详情")
@ -58,19 +95,35 @@ public class NonWorkingDayDrinkingReportController extends BaseController {
@ApiOperation("新增或修改非工作日饮酒报备单 传id为修改 不传id为新增")
@PostMapping("/add")
public AjaxResult add(@RequestBody NonWorkingDayDrinkingReport nonWorkingDayDrinkingReport) {
List<SysDept> sysDepts = deptService.selectAllDeptList();
List<String> leader = sysDepts.stream().map(SysDept::getLeader).collect(Collectors.toList());
SysUser user = getLoginUser().getUser();
if (nonWorkingDayDrinkingReport.getId() == null) {
nonWorkingDayDrinkingReport.setCreateBy(user.getNickName());
nonWorkingDayDrinkingReport.setState(0);
nonWorkingDayDrinkingReport.setName(user.getNickName());
nonWorkingDayDrinkingReport.setUserId(user.getUserId());
nonWorkingDayDrinkingReport.setDeptName(user.getDept().getDeptName());
nonWorkingDayDrinkingReport.setDeptId(user.getDeptId());
if (leader.contains(user.getNickName())) {
// 单位领导
nonWorkingDayDrinkingReport.setUserType(1);
} else if ("前、现局党委成员".equals(user.getNickName())) {
nonWorkingDayDrinkingReport.setUserType(2);
} else {
// 普通民警
nonWorkingDayDrinkingReport.setUserType(0);
}
boolean result = nonWorkingDayDrinkingReportService.save(nonWorkingDayDrinkingReport);
if (!result) {
return AjaxResult.error("新增非工作日inksReport失败");
return AjaxResult.error("新增非工作日失败");
}
return AjaxResult.success(result);
}else {
} else {
nonWorkingDayDrinkingReport.setUpdateBy(user.getNickName());
boolean result = nonWorkingDayDrinkingReportService.updateById(nonWorkingDayDrinkingReport);
if (!result) {
return AjaxResult.error("修改非工作日inksReport失败");
return AjaxResult.error("修改非工作日失败");
}
return AjaxResult.success(result);
}
@ -93,7 +146,7 @@ public class NonWorkingDayDrinkingReportController extends BaseController {
public AjaxResult approval(@RequestBody ApprovaltDto dto) {
Long id = dto.getId();
Integer state = dto.getState();
NonWorkingDayDrinkingReport nonWorkingDayDrinkingReport = nonWorkingDayDrinkingReportService.getById(id);
NonWorkingDayDrinkingReport nonWorkingDayDrinkingReport = nonWorkingDayDrinkingReportService.getById(id);
nonWorkingDayDrinkingReport.setState(state);
boolean result = nonWorkingDayDrinkingReportService.updateById(nonWorkingDayDrinkingReport);
if (!result) {

12
gather-app/src/main/java/com/ruoyi/database/domain/NonWorkingDayDrinkingReport.java
View File

@ -21,9 +21,21 @@ public class NonWorkingDayDrinkingReport {
@ApiModelProperty("姓名")
private String name;
@ApiModelProperty("userId")
private Long userId;
@ApiModelProperty("用户类型")
private Integer userType;
@ApiModelProperty("单位职务")
private String position;
@ApiModelProperty("单位名称")
private String deptName;
@ApiModelProperty("单位id")
private Long deptId;
@ApiModelProperty("饮酒时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")