From c542e5b9cf09e192d8a13cb955703857e9558ccc Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 11 十月 2025 08:43:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java
index 205c39f..af236a9 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java
@@ -41,9 +41,9 @@
}
@ApiOperation("鏌ヨ鎸囧畾娴佺▼鍗″強灞傛暟鐨勭己鐗囪鎯�")
- @PostMapping("/queryLackByFlowCard")
- public Result<List<LackDetailsDTO>> queryLackByFlowCard() {
- List<LackDetailsDTO> lackDetailsList = hollowGlassRelationInfoService.queryLackByFlowCard();
+ @PostMapping("/queryAllLackByFlowCard")
+ public Result<List<LackDetailsDTO>> queryAllLackByFlowCard() {
+ List<LackDetailsDTO> lackDetailsList = hollowGlassRelationInfoService.queryAllLackByFlowCard();
return Result.success(lackDetailsList);
}
@@ -60,6 +60,12 @@
// List<LackDetailsDTO> lackDetailsList = hollowGlassRelationInfoService.queryLackByFlowCard(flowCardId);
// return Result.success(lackDetailsList);
// }
+ @ApiOperation("鏌ヨ鎸囧畾娴佺▼鍗″強灞傛暟鐨勭己鐗囪鎯�")
+ @PostMapping("/queryLackByFlowCard")
+ public Result<Map<Integer,List<LackDetailsDTO>>> queryLackByFlowCard(String flowCardId) {
+ Map<Integer,List<LackDetailsDTO>> lackDetailsMap = hollowGlassRelationInfoService.queryLackByFlowCard(flowCardId);
+ return Result.success(lackDetailsMap);
+ }
@ApiOperation("涓┖缂虹墖鐖嗙牬绗兼姤鐮存崯")
@PostMapping("/hollowBigStorageGlassDamage")
--
Gitblit v1.8.0