From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java
index 23cb816..6e7b036 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java
@@ -2,15 +2,12 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.commons.lang3.StringUtils;
import org.jeecg.modules.mdc.dto.MdcBigScreenEquipmentDto;
import org.jeecg.modules.mdc.entity.MdcWorkshopInfo;
import org.jeecg.modules.mdc.mapper.MdcWorkshopInfoMapper;
-import org.jeecg.modules.mdc.service.IMdcEquipmentTypeService;
import org.jeecg.modules.mdc.service.IMdcWorkshopInfoService;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
import java.util.List;
/**
@@ -22,9 +19,6 @@
@Service
public class MdcWorkshopInfoServiceImpl extends ServiceImpl<MdcWorkshopInfoMapper, MdcWorkshopInfo> implements IMdcWorkshopInfoService {
- @Resource
- private IMdcEquipmentTypeService mdcEquipmentTypeService;
-
/**
* 澶у睆淇℃伅
* @param workshopId
@@ -32,12 +26,16 @@
*/
@Override
public List<MdcBigScreenEquipmentDto> getBigScreenInfo(String workshopId) {
- List<MdcBigScreenEquipmentDto> list = this.baseMapper.getBigScreenInfo(workshopId);
- for (MdcBigScreenEquipmentDto mdcBigScreenEquipmentDto : list) {
- if (StringUtils.isEmpty(mdcBigScreenEquipmentDto.getEquipmentImage())) {
- mdcBigScreenEquipmentDto.setEquipmentImage(mdcEquipmentTypeService.findEquipmentTypeImage(mdcBigScreenEquipmentDto.getEquipmentType()));
- }
- }
- return list;
+ return this.baseMapper.getBigScreenInfo(workshopId);
+ }
+
+ /**
+ * 澶у睆杞﹂棿鍒楄〃
+ * @param userId
+ * @return
+ */
+ @Override
+ public List<MdcWorkshopInfo> listByUser(String userId) {
+ return this.baseMapper.listByUser(userId);
}
}
--
Gitblit v1.9.3