feat: 抄送
This commit is contained in:
parent
96af4f42f5
commit
d6591c281b
|
@ -45,6 +45,7 @@ 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")
|
||||||
|
@ -116,6 +117,8 @@ 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());
|
||||||
|
@ -145,6 +148,7 @@ 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());
|
||||||
|
@ -152,6 +156,15 @@ 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("新增非工作日失败");
|
||||||
|
|
Loading…
Reference in New Issue