Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/StaffSuggestServiceImpl.java

@@ -1,16 +1,20 @@
package com.ruoyi.system.service.impl.config;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.system.api.domain.dto.StaffPageDto;
import com.ruoyi.system.api.domain.poji.config.SysTag;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.domain.dto.MgtReplayStaffSuggestDto;
import com.ruoyi.system.domain.dto.MgtStaffSuggestPageDto;
import com.ruoyi.system.domain.dto.MgtTagStaffSuggestDto;
import com.ruoyi.system.domain.dto.StaffUseSuggestDto;
import com.ruoyi.system.domain.pojo.config.StaffSuggest;
import com.ruoyi.system.domain.vo.MgtStaffSuggestPageVo;
import com.ruoyi.system.domain.vo.MgtStaffSuggestTagVo;
import com.ruoyi.system.domain.vo.StaffSuggestPageVo;
import com.ruoyi.system.mapper.config.StaffSuggestMapper;
import com.ruoyi.system.service.config.StaffSuggestService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -88,7 +92,7 @@
    @Override
    public void mgtReplayStaffSuggest(MgtReplayStaffSuggestDto mgtReplayStaffSuggestDto){
        Long userId = mgtReplayStaffSuggestDto.getUserId();
        SysUser sysUser = sysUserService.getById(userId);
        SysUser sysUser = sysUserService.selectUserById(userId);
        StaffSuggest staffSuggest = this.getById(mgtReplayStaffSuggestDto.getSuggestId());
        staffSuggest.setReplayContent(mgtReplayStaffSuggestDto.getReplayContent());
        staffSuggest.setReplayTime(new Date());
@@ -97,6 +101,8 @@
        staffSuggest.setReplayFlag(1);
        String responseTime = DateUtils.formatDuration(staffSuggest.getCreateTime(), staffSuggest.getReplayTime());
        staffSuggest.setResponseTime(responseTime);
        long responseTimestamp = DateUtils.diffTime(staffSuggest.getCreateTime(), staffSuggest.getReplayTime());
        staffSuggest.setResponseTimestamp(responseTimestamp);
        this.saveOrUpdate(staffSuggest);
    }

@@ -157,4 +163,48 @@
        staffSuggest.setSuggestTags(mgtTagStaffSuggestDto.getSuggestTags());
        this.saveOrUpdate(staffSuggest);
    }

    /**
     * @description  获取会员未回复建议数量
     * @author  jqs
     * @date    2023/7/5 12:46
     * @param
     * @return  Integer
     */
    @Override
    public Integer getUnReplaySuggestVo(){
        LambdaQueryWrapper<StaffSuggest> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(StaffSuggest::getDelFlag,0);
        queryWrapper.eq(StaffSuggest::getReplayFlag,0);
        return this.count(queryWrapper);
    }

    /**
     * @description 员工发起建议
     * @param staffUseSuggestDto
     * @return void
     * @author jqs34
     * @date 2023/7/16 12:18
     */
    @Override
    public void staffSuggest(StaffUseSuggestDto staffUseSuggestDto){
        StaffSuggest staffSuggest = new StaffSuggest();
        staffSuggest.setDelFlag(0);
        staffSuggest.setSuggestContent(staffUseSuggestDto.getSuggestContent());
        staffSuggest.setCreateTime(new Date());
        staffSuggest.setCreateUserId(staffUseSuggestDto.getUserId());
        this.saveOrUpdate(staffSuggest);
    }

    /**
     * @description 分页获取员工建议
     * @param page
     * @return List<StaffSuggestPageVo>
     * @author jqs34
     * @date 2023/7/16 12:26
     */
    @Override
    public List<StaffSuggestPageVo> pageStaffShopSuggest(Page page, StaffPageDto staffPageDto){
        return staffSuggestMapper.pageStaffShopSuggest(page, staffPageDto);
    }
}