Merge remote-tracking branch 'origin/master'

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

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