From 91c26508f76c35d9cc889958426fbe48cc205ed9 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 02 八月 2024 14:52:31 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java | 20 +++++++++++---------
modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml | 11 +++++++----
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java | 3 +++
3 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java
index 0f744ae..a5093ce 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java
@@ -57,4 +57,7 @@
@ApiModelProperty(value = "瀛愯妭鐐�")
@TableField(exist = false)
private List<XhProductModel> children = new ArrayList<>();
+
+ @TableField(exist = false)
+ private Long paramId;
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
index 2154a48..b764725 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
@@ -175,13 +175,12 @@
String curXtName = "";
String curFxtName = "";
-
Map<String, XhProductModel> modelMap = new HashMap<>();
- List<XhProductModel> prductList =baseDao.getProductPath(shipId);
+ List<XhProductModel> prductList = baseDao.getProductPath(shipId);
- for (XhProductModel product :prductList){
- if(StringUtils.isNotBlank(product.getNamePath())){
- modelMap.put(product.getNamePath(),product);
+ for (XhProductModel product : prductList) {
+ if (StringUtils.isNotBlank(product.getNamePath())) {
+ modelMap.put(product.getNamePath(), product);
}
}
@@ -280,19 +279,21 @@
}
}
+ Long paramId = null;
String sbPath = curXtName + "," + (StringUtils.isBlank(curFxtName) ? "" : curFxtName + ",") + sb;
if (modelMap.get(sbPath) == null) {
curSbId = UUIDUtil.generateId();
insertSb = true;
} else {
curSbId = modelMap.get(sbPath).getId();
+ paramId = modelMap.get(sbPath).getParamId();
}
-
if (StringUtils.isEmpty(sb)) {
com.zt.life.util.ImportUtil.updateErrMap(errMap, "娌℃湁濉啓璁惧鍚嶇О", sheetName, row1);
continue;
}
+
//瀵煎叆鍨嬪彿浜у搧缁撴灉搴�
XhProductModel xhProductModel = new XhProductModel();
@@ -352,7 +353,6 @@
this.insert(xhProductModel);
}
-
//瀵煎叆棰勮鍙傛暟
ParamData itemEntity = new ParamData();
//缁戝畾璁惧ID
@@ -400,10 +400,12 @@
if (StringUtils.isNotBlank(repairMttcrOtherParams3)) {
itemEntity.setRepairMttcrOtherParams3(Double.valueOf(repairMttcrOtherParams3));
}
- if (modelMap.get(sbPath) == null)
+ if (modelMap.get(sbPath) == null) {
paramDataService.insert(itemEntity);
- else
+ } else {
+ itemEntity.setId(paramId);
paramDataService.update(itemEntity);
+ }
}
}
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index b85f6bd..1d33f52 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -133,9 +133,12 @@
</if>
</select>
<select id="getProductPath" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
- select *
- from product_model
- where IS_DELETE = 0
- and ship_id =${shipId}
+ select a.*, b.id as paramId
+ from product_model a,
+ param_data b
+ where a.IS_DELETE = 0
+ and b.IS_DELETE = 0
+ and a.ship_id = ${shipId}
+ and a.id = b.product_id
</select>
</mapper>
--
Gitblit v1.9.1