From 5bbbefadb317d2d9c0c66d86c7ee7f8c3dcb19a3 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 16 五月 2024 16:37:46 +0800
Subject: [PATCH] 问题反馈
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java | 8 ++++++--
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcHomeController.java | 12 ++++++++++--
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcHomeController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcHomeController.java
index 51baf9f..29867c9 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcHomeController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcHomeController.java
@@ -257,6 +257,7 @@
@GetMapping("/feedbackList")
public Result<?> feedbackList(String productionCode) {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Integer userType = user.getUserType();
String userId = user.getId();
String key = "";
if (StringUtils.isNotBlank(productionCode)) {
@@ -264,8 +265,15 @@
MdcProduction mdcProduction = mdcProductionService.getOne(new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getProductionCode, productionCode).eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString()));
key = mdcProduction.getId();
} else {
- //宸ユ 鏌ヨ鐢ㄦ埛鎷ユ湁鐨勫伐娈垫潈闄�
- key = mdcProductionService.findThreeProductionId(userId);
+ //鍒ゆ柇鏄叕鍙哥骇杩樻槸鍘傚尯
+ MdcProduction mdcProduction = mdcProductionService.getOne(new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getParentId, ""));
+ if (userType.equals(MdcConstant.USER_TYPE_4)) {
+ //鍏徃
+ key = mdcProduction.getId();
+ } else if (userType.equals(MdcConstant.USER_TYPE_3)) {
+ //鍘傚尯
+ key = mdcProductionService.findFirstProduction(userId, mdcProduction.getId());
+ }
}
List<MdcFeedback> result = mdcHomeService.getFeedbackList(key);
return Result.OK(result);
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java
index 09ecb8d..5d910c2 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java
@@ -35,8 +35,12 @@
@Override
@Transactional(readOnly = true)
public List<EquipmentMachingDto> getEquipmentSequencenumber(String tableName, Date startTime, Date endTime) {
- List<Map<String, Object>> list = equipmentWorkLineMapper.getEquipmentSequenceNumber(tableName, startTime, endTime);
- return convertData(list);
+ try {
+ List<Map<String, Object>> list = equipmentWorkLineMapper.getEquipmentSequenceNumber(tableName, startTime, endTime);
+ return convertData(list);
+ } catch (Exception e) {
+ return null;
+ }
}
@Override
--
Gitblit v1.9.3