Commit 35b60965 authored by yf's avatar yf
Browse files

创建请假时新增消息、创建巡检任务时新增代办

parent e0f56c03

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/CurrentRiskTask.java

+39 −33
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ public class CurrentRiskTask { 


    /**

     * 每天零点发送任务

     * @param isDailypOther 除每月 1 号外，是否新增日查之外的巡查 默认不新增

     *

     */

    public void senTask() {

        boolean isDailypOther = false;
@@ -114,12 +114,18 @@ public class CurrentRiskTask { 
            currentRiskUserPatrolDetailService.saveBatch(list);



            SysUser user = userService.selectUserById(patrolType.getUserId());

            //创建代办

            commonMessageInfoService.insertBacklogInfo(String.valueOf(currentRiskUserPatrol.getId()), "risk_confirm_sub", String.valueOf(currentRiskUserPatrol.getId()),

                    "巡查任务", "巡查",

                    "您有一条新的巡查任务待确认", "0", user.getUserName(),

                    "巡查任务", "" , "patrolExecute", user.getNickName());



        }

    }



    /**

     * 开始时间，结束时间计算

     *

     * @param currentRiskUserPatrol 对象

     * @param patrolType            巡检类型 0 日查 1 周查 2 月查 3 季查 4 年查

     */

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/CurrentRiskUserHolidayController.java

+10 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ package com.censoft.censoftrongtong.controller; 


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

import com.censoft.censoftrongtong.domain.CurrentRiskUserHoliday;

import com.censoft.censoftrongtong.service.ICommonMessageInfoService;

import com.censoft.censoftrongtong.service.ICurrentRiskUserHolidayService;

import com.ruoyi.common.annotation.Log;

import com.ruoyi.common.core.controller.BaseController;
@@ -11,6 +12,7 @@ import com.ruoyi.common.core.page.TableDataInfo; 
import com.ruoyi.common.enums.BusinessType;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.common.utils.poi.ExcelUtil;

import com.ruoyi.framework.web.domain.server.Sys;

import com.ruoyi.system.service.ISysUserService;

import lombok.AllArgsConstructor;

import org.springframework.security.access.prepost.PreAuthorize;
@@ -33,6 +35,7 @@ import java.util.List; 
public class CurrentRiskUserHolidayController extends BaseController {

    private ICurrentRiskUserHolidayService currentRiskUserHolidayService;

    private ISysUserService sysUserService;

    private ICommonMessageInfoService commonMessageInfoService;



    /**

     * 查询现状风险巡查用户请假列表
@@ -116,6 +119,11 @@ public class CurrentRiskUserHolidayController extends BaseController { 
            currentRiskUserHoliday.setApproveUserId(getUserId());

            currentRiskUserHolidayService.updateCurrentRiskUserHoliday(currentRiskUserHoliday);

        }

        SysUser user = sysUserService.selectUserById(getUserId());

        //给上报人发消息

        commonMessageInfoService.insertMessageInfo(currentRiskUserHoliday.getId() + "", "finish", "请假提醒"

                , "今日用户'" + user.getNickName() + "'已请假，望知晓！"

                , "0", getUsername(), "请假提醒", "", "/patrolCancle/detail?id=" + currentRiskUserHoliday.getId(), user.getUserName());

        return AjaxResult.success();

    }