From c978d8b1de46a5a12f9d76b061815614fc4ac6ef Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 03 三月 2025 17:02:46 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java | 2 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java | 6 +++---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java | 4 ++--
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java | 18 ++++++++++++++++--
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml | 2 +-
5 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java
index 3697b01..71cc007 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java
@@ -146,6 +146,20 @@
}
/**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param productionId
+ * @return
+ */
+ @AutoLog(value = "澶у睆杞﹂棿淇℃伅-閫氳繃ProductionId鏌ヨ")
+ @ApiOperation(value = "澶у睆杞﹂棿淇℃伅-閫氳繃ProductionId鏌ヨ", notes = "澶у睆杞﹂棿淇℃伅-閫氳繃ProductionId鏌ヨ")
+ @GetMapping(value = "/queryByProductionId")
+ public Result<?> queryByProductionId(@RequestParam(name = "productionId", required = true) String productionId) {
+ MdcWorkshopInfo mdcWorkshopInfo = mdcWorkshopInfoService.getOne(new LambdaQueryWrapper<MdcWorkshopInfo>().eq(MdcWorkshopInfo::getProductionId, productionId));
+ return Result.OK(mdcWorkshopInfo);
+ }
+
+ /**
* 瀵煎嚭excel
*
* @param request
@@ -273,8 +287,8 @@
@AutoLog(value = "澶у睆杞﹂棿淇℃伅-澶у睆淇℃伅")
@ApiOperation(value = "澶у睆杞﹂棿淇℃伅-澶у睆淇℃伅", notes = "澶у睆杞﹂棿淇℃伅-澶у睆淇℃伅")
@GetMapping(value = "/getBigScreenInfo")
- public Result getBigScreenInfo(@RequestParam(name = "workshopId", required = true) String workshopId) {
- List<MdcBigScreenEquipmentDto> result = mdcWorkshopInfoService.getBigScreenInfo(workshopId);
+ public Result getBigScreenInfo(@RequestParam(name = "productionId", required = true) String productionId) {
+ List<MdcBigScreenEquipmentDto> result = mdcWorkshopInfoService.getBigScreenInfo(productionId);
return Result.OK(result);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java
index 80aeb93..088d2fa 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java
@@ -20,10 +20,10 @@
/**
* 澶у睆淇℃伅
*
- * @param workshopId
+ * @param productionId
* @return
*/
- List<MdcBigScreenEquipmentDto> getBigScreenInfo(@Param("workshopId") String workshopId);
+ List<MdcBigScreenEquipmentDto> getBigScreenInfo(@Param("productionId") String productionId);
/**
* 澶у睆杞﹂棿鍒楄〃
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
index a553cd3..61a43c1 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
@@ -23,7 +23,7 @@
INNER JOIN mdc_equipment me ON me.equipment_id = a.EquipmentID
INNER JOIN mdc_equipment_type met ON me.equipment_type = met.equipment_type_name
AND a.CollectTime= b.maxgdtime
- AND mew.workshop_id = #{ workshopId }
+ AND mew.production_id = #{ productionId }
</select>
<select id="listByUser" resultType="org.jeecg.modules.mdc.entity.MdcWorkshopInfo">
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java
index 9b501e0..02127a4 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java
@@ -19,7 +19,7 @@
/**
* 澶у睆淇℃伅
*/
- List<MdcBigScreenEquipmentDto> getBigScreenInfo(String workshopId);
+ List<MdcBigScreenEquipmentDto> getBigScreenInfo(String productionId);
/**
* 杞﹂棿澶у睆鍒楄〃
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 2231207..ae2a3a7 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
@@ -22,12 +22,12 @@
/**
* 澶у睆淇℃伅
- * @param workshopId
+ * @param productionId
* @return
*/
@Override
- public List<MdcBigScreenEquipmentDto> getBigScreenInfo(String workshopId) {
- return this.baseMapper.getBigScreenInfo(workshopId);
+ public List<MdcBigScreenEquipmentDto> getBigScreenInfo(String productionId) {
+ return this.baseMapper.getBigScreenInfo(productionId);
}
/**
--
Gitblit v1.9.3