From d9a3f29203bf2cefeedb23766b79906d2b37abdc Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 26 三月 2025 08:28:38 +0800
Subject: [PATCH] 工时查询修改
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
index 1d58571..0074e0c 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
@@ -14,6 +14,7 @@
import com.deepoove.poi.config.ConfigureBuilder;
import com.deepoove.poi.data.PictureRenderData;
import com.deepoove.poi.data.Pictures;
+import com.ruoyi.common.constant.MenuJumpPathConstants;
import com.ruoyi.common.core.domain.entity.InformationNotification;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.DateImageUtil;
@@ -128,7 +129,7 @@
info.setSenderId(userId);
// 鎺ユ敹浜�
info.setConsigneeId(supervise.getRatifyUserId());
- info.setJumpPath("a7-quality-control-plan");
+ info.setJumpPath(MenuJumpPathConstants.QUALITY_SUPERVISE);
informationNotificationService.addInformationNotification(info);
// 鍙戦�佷紒涓氬井淇￠�氱煡
@@ -238,6 +239,7 @@
*/
@Override
public List<Map<String, String>> getRecordUser(Integer superviseDetailsId) {
+ List<Map<String, String>> recordUser = baseMapper.getRecordUser(superviseDetailsId);
return baseMapper.getRecordUser(superviseDetailsId);
}
@@ -352,7 +354,7 @@
}
// 娣诲姞鎵瑰噯浜哄悕绉�
if (detailsRecord.getRatifyUserId() != null) {
- User user = userMapper.selectById(SecurityUtils.getUserId().intValue());
+ User user = userMapper.selectById(detailsRecord.getRatifyUserId());
detailsRecord.setRatifyUserName(user.getName());
}
return detailsRecord;
@@ -387,7 +389,7 @@
info.setSenderId(userId);
// 鎺ユ敹浜�
info.setConsigneeId(qualitySuperviseDetailsRecord.getRatifyUserId());
- info.setJumpPath("a7-quality-control-plan");
+ info.setJumpPath(MenuJumpPathConstants.QUALITY_SUPERVISE);
informationNotificationService.addInformationNotification(info);
// 鍙戦�佷紒涓氬井淇￠�氱煡
@@ -606,7 +608,7 @@
info.setSenderId(userId);
// 鎺ユ敹浜�
info.setConsigneeId(detailsAccording.getApproverUserId());
- info.setJumpPath("a7-quality-control-plan");
+ info.setJumpPath(MenuJumpPathConstants.QUALITY_SUPERVISE);
informationNotificationService.addInformationNotification(info);
// 鍙戦�佷紒涓氬井淇￠�氱煡
@@ -880,7 +882,7 @@
info.setSenderId(userId);
// 鎺ユ敹浜�
info.setConsigneeId(detailsCorrect.getApproverUserId());
- info.setJumpPath("a7-quality-control-plan");
+ info.setJumpPath(MenuJumpPathConstants.QUALITY_SUPERVISE);
informationNotificationService.addInformationNotification(info);
// 鍙戦�佷紒涓氬井淇￠�氱煡
--
Gitblit v1.9.3