From e48a56c2171f023f1978b0b6aec9befd43e7a9dc Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期一, 04 十一月 2024 08:45:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/ParamDataService.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/ParamDataService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/ParamDataService.java
index 577221b..ca9119a 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/ParamDataService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/ParamDataService.java
@@ -10,9 +10,9 @@
/**
- * param_data_expect
+ * param_data
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2024-03-04
*/
@Service
@@ -26,8 +26,8 @@
*/
public List<ParamData> page(QueryFilter queryFilter) {
List<ParamData> list = baseDao.getList(queryFilter.getQueryParams());
- for (ParamData expect :list){
- expect.setProductId(expect.getProductIdInit());
+ for (ParamData data : list) {
+ data.setProductId(data.getProductIdInit());
}
return list;
}
@@ -41,4 +41,11 @@
super.deleteLogic(ids);
}
+ public List<ParamData> getByShipId(Long shipId) {
+ return baseDao.getByShipId(shipId);
+ }
+
+ public void deleteByShipId(Long shipId) {
+ baseDao.deleteByShipId(shipId);
+ }
}
--
Gitblit v1.9.1