From 43a85ad899a3b0b27b50967ff7e11f25d93edd4b Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 24 七月 2024 10:41:17 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
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 b942504..fb30953 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
@@ -65,7 +65,7 @@
List<XhProductModel> productList = null;
if (showXdy) {
productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
- Constant.Bool.NO).lt("product_type", 5).orderByAsc(Constant.TableColumn.SORT));
+ Constant.Bool.NO).ne("product_type", 5).orderByAsc(Constant.TableColumn.SORT));
} else {
if (ztShow == 1) {
productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
@@ -295,6 +295,8 @@
}
if (StringUtils.isNotBlank(basicMtbfOperatingRatio)){
itemEntity.setBasicMtbfOperatingRatio(Double.valueOf(basicMtbfOperatingRatio));
+ }else{
+ itemEntity.setBasicMtbfOperatingRatio(1.0);
}
if (StringUtils.isNotBlank(taskMtbcfRegulate)){
itemEntity.setTaskMtbcfRegulate(Double.valueOf(taskMtbcfRegulate));
@@ -310,6 +312,8 @@
}
if (StringUtils.isNotBlank(taskMtbcfOperatingRatio)){
itemEntity.setTaskMtbcfOperatingRatio(Double.valueOf(taskMtbcfOperatingRatio));
+ }else{
+ itemEntity.setTaskMtbcfOperatingRatio(1.0);
}
itemEntity.setRepairable(isOrNot.get(repairable));
itemEntity.setRepairDistribType(repairType.get(repairDistribType));
--
Gitblit v1.9.1