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

Compare commits

base: lijingtong:ee741be56ef475e2dc355f2c04c10082bedc6123
Branches Tags
lijingtong:master
..
compare: lijingtong:51a5d0bc6b57501b5ebad7ecdecb4e3f2f90d13b
Branches Tags
lijingtong:master

No commits in common. "ee741be56ef475e2dc355f2c04c10082bedc6123" and "51a5d0bc6b57501b5ebad7ecdecb4e3f2f90d13b" have entirely different histories.
ee741be56e ... 51a5d0bc6b

1 changed files with 0 additions and 13 deletions
Show Stats Expand all files Collapse all files

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

@ -45,7 +45,6 @@ public class NonWorkingDayDrinkingReportController extends BaseController {
private final ISysDeptService deptService; private final ISysDeptService deptService;
private final gwglLogService gwglLogService; private final gwglLogService gwglLogService;
private final ApprovalProcessService approvalsProcessService; private final ApprovalProcessService approvalsProcessService;
private final ISysDeptService sysDeptService;
@ApiOperation("查询非工作日饮酒报备单") @ApiOperation("查询非工作日饮酒报备单")
@PostMapping("/list") @PostMapping("/list")
@ -117,8 +116,6 @@ public class NonWorkingDayDrinkingReportController extends BaseController {
// 局党委和分管局成员 // 局党委和分管局成员
List<String> leaderLeader = sysDepts.stream().map(SysDept::getLeaderLeader).distinct().collect(Collectors.toList()); List<String> leaderLeader = sysDepts.stream().map(SysDept::getLeaderLeader).distinct().collect(Collectors.toList());
SysUser user = getLoginUser().getUser(); SysUser user = getLoginUser().getUser();
Long deptId = user.getDeptId();
SysDept sysDept = sysDeptService.selectDeptById(deptId);
if (nonWorkingDayDrinkingReport.getId() == null) { if (nonWorkingDayDrinkingReport.getId() == null) {
String s = OrderNumberGenerator(); String s = OrderNumberGenerator();
nonWorkingDayDrinkingReport.setCreateBy(user.getNickName()); nonWorkingDayDrinkingReport.setCreateBy(user.getNickName());
@ -148,7 +145,6 @@ public class NonWorkingDayDrinkingReportController extends BaseController {
approvalProcess.setSubmitterId(user.getUserId()); approvalProcess.setSubmitterId(user.getUserId());
approvalProcess.setSubmitTime(new Date().getTime()); approvalProcess.setSubmitTime(new Date().getTime());
approvalProcess.setMatterType(4); approvalProcess.setMatterType(4);
approvalProcess.setCcName(sysDept.getLeader());
approvalProcess.setApprovalStatus(0); approvalProcess.setApprovalStatus(0);
approvalProcess.setReadStatus(0); approvalProcess.setReadStatus(0);
approvalProcess.setDrinkingPlace(nonWorkingDayDrinkingReport.getDrinkPlace()); approvalProcess.setDrinkingPlace(nonWorkingDayDrinkingReport.getDrinkPlace());
@ -156,15 +152,6 @@ public class NonWorkingDayDrinkingReportController extends BaseController {
approvalProcess.setCreateTime(new Date().getTime()); approvalProcess.setCreateTime(new Date().getTime());
approvalProcess.setUuid(uuids); approvalProcess.setUuid(uuids);
approvalsProcessService.save(approvalProcess); approvalsProcessService.save(approvalProcess);
gwglLog gwglLog = new gwglLog();
gwglLog.setApplyNo(s);
gwglLog.setResult(1);
gwglLog.setDeptId(user.getDeptId());
gwglLog.setDeptName(user.getDept().getDeptName());
gwglLog.setUserId(user.getUserId());
gwglLog.setUserName(user.getNickName());
gwglLog.setCreateTime(new Date().getTime());
gwglLogService.save(gwglLog);
boolean result = nonWorkingDayDrinkingReportService.save(nonWorkingDayDrinkingReport); boolean result = nonWorkingDayDrinkingReportService.save(nonWorkingDayDrinkingReport);
if (!result) { if (!result) {
return AjaxResult.error("新增非工作日失败"); return AjaxResult.error("新增非工作日失败");