From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/StaffSuggestServiceImpl.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/StaffSuggestServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/StaffSuggestServiceImpl.java
index cda1230..b6fb547 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/StaffSuggestServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/StaffSuggestServiceImpl.java
@@ -4,14 +4,17 @@
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;
@@ -98,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);
}
@@ -173,4 +178,33 @@
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);
+ }
}
--
Gitblit v1.7.1