From ee2a27313fbf5e7741644f9f3701d243487dbaa4 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 16 七月 2024 16:04:42 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java | 31 +++++--------------------------
1 files changed, 5 insertions(+), 26 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 61a0a01..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,
@@ -220,31 +220,6 @@
com.zt.life.util.ImportUtil.updateErrMap(errMap, "娌℃湁濉啓璁惧鍚嶇О", sheetName, row1);
continue;
}
- if (StringUtils.isEmpty(reliabDistribType)) {
- com.zt.life.util.ImportUtil.updateErrMap(errMap, "娌℃湁濉啓鍙潬鎬у垎甯冪被鍨�", sheetName, row1);
- continue;
- }
- if (StringUtils.isEmpty(basicJoinCompute)) {
- com.zt.life.util.ImportUtil.updateErrMap(errMap, "娌℃湁濉啓鏄惁鍙傚姞璁＄畻", sheetName, row1);
- continue;
- }
- if (StringUtils.isEmpty(basicMtbfRegulate)) {
- com.zt.life.util.ImportUtil.updateErrMap(errMap, "娌℃湁濉啓mtbf", sheetName, row1);
- continue;
- }
- if (StringUtils.isEmpty(taskMtbcfRegulate)) {
- com.zt.life.util.ImportUtil.updateErrMap(errMap, "娌℃湁濉啓mtbcf", sheetName, row1);
- continue;
- }
- if (StringUtils.isEmpty(repairable)) {
- com.zt.life.util.ImportUtil.updateErrMap(errMap, "娌℃湁濉啓鏄惁鍙淮淇�", sheetName, row1);
- continue;
- }
- if (StringUtils.isNotBlank(repairable) && StringUtils.isEmpty(repairDistribType)) {
- com.zt.life.util.ImportUtil.updateErrMap(errMap, "鏈夋湭濉啓鐨勭淮淇垎甯冪被鍨�", sheetName, row1);
- continue;
- }
-
//瀵煎叆鍨嬪彿浜у搧缁撴灉搴�
XhProductModel xhProductModel = new XhProductModel();
@@ -320,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));
@@ -335,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