From 7abc95a191d2c1a9bb9ff8fd7fb05470a0d4e86b Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 10:04:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java | 106 +++++++++++++++++++++++++++++++---------------------
1 files changed, 63 insertions(+), 43 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 fb30953..590b0c6 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
@@ -61,23 +61,43 @@
super.deleteLogic(ids);
}
- public List<XhProductModel> getAllTree(Boolean showXdy, Integer ztShow) {
+ public List<XhProductModel> getAllTree(Boolean showXdy, Integer ztShow, Long productId) {
List<XhProductModel> productList = null;
if (showXdy) {
- productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
- Constant.Bool.NO).ne("product_type", 5).orderByAsc(Constant.TableColumn.SORT));
- } else {
- if (ztShow == 1) {
+ if (productId != null) {
productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
- Constant.Bool.NO).lt("product_type", 5).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
- } else if (ztShow == 2) {
+ Constant.Bool.NO).ne("product_type", 5).and(wrapper -> wrapper.eq("ship_id", productId).or().eq("id", productId)).orderByAsc(Constant.TableColumn.SORT));
+ } else {
productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
- Constant.Bool.NO).lt("product_type", 4).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
- } else if (ztShow == 3) {
- productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
- Constant.Bool.NO).lt("product_type", 3).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
+ Constant.Bool.NO).ne("product_type", 5).orderByAsc(Constant.TableColumn.SORT));
}
-
+ } else {
+ if (productId == null) {
+ if (ztShow == 1) {
+ productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+ Constant.Bool.NO).lt("product_type", 5).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
+ } else if (ztShow == 2) {
+ productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+ Constant.Bool.NO).lt("product_type", 4).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
+ } else if (ztShow == 3) {
+ productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+ Constant.Bool.NO).lt("product_type", 3).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
+ } else if (ztShow == 4) {
+ productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+ Constant.Bool.NO).lt("product_type", 5).ne("product_type", 1).orderByAsc(Constant.TableColumn.SORT));
+ } else if (ztShow == 5) {
+ productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+ Constant.Bool.NO).gt("product_type", 1).orderByAsc(Constant.TableColumn.SORT));
+ }
+ } else {
+ if (ztShow == 4) {
+ productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+ Constant.Bool.NO).lt("product_type", 5).ne("product_type", 1).and(wrapper -> wrapper.eq("ship_id", productId).or().eq("id", productId)).orderByAsc(Constant.TableColumn.SORT));
+ } else if (ztShow == 5) {
+ productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+ Constant.Bool.NO).gt("product_type", 1).and(wrapper -> wrapper.eq("ship_id", productId).or().eq("id", productId)).orderByAsc(Constant.TableColumn.SORT));
+ }
+ }
}
return TreeUtils.build(productList);
}
@@ -131,7 +151,7 @@
if (productList.size() > 0) {
this.deleteByShipId(shipId);
}
- if (dataList.size()>0){
+ if (dataList.size() > 0) {
paramDataService.deleteByShipId(shipId);
}
@@ -169,7 +189,6 @@
for (int j = 1; j <= num; j++) {
CacheUtils.put(progressId, "speed", CommonUtils.getPercent(j, num));
CacheUtils.put(progressId, "msg", "鍏�" + num + "琛岋紝宸插畬鎴愮" + j + "琛�");
- DictTypeDto lifeManagement = new DictTypeDto();
boolean isToggleXt = false;
boolean isToggleFxt = false;
row1 = j + 1;
@@ -200,21 +219,22 @@
}
String sb = com.zt.core.shiro.ImportUtil.getCellValue(row, 3, pattern); //璁惧
- String reliabDistribType = com.zt.core.shiro.ImportUtil.getCellValue(row, 4, pattern); //鍙潬鎬у垎甯冪被鍨�
- String basicJoinCompute = com.zt.core.shiro.ImportUtil.getCellValue(row, 5, pattern); //鍙傚姞璁＄畻
- String basicMtbfRegulate = com.zt.core.shiro.ImportUtil.getCellValue(row, 6, pattern); //mtbf
- String basicMtbfRegulSuccRate = com.zt.core.shiro.ImportUtil.getCellValue(row, 7, pattern); //鎴愬姛鐜�
- String basicMtbfOperatingRatio = com.zt.core.shiro.ImportUtil.getCellValue(row, 8, pattern); //杩愯姣�
- String taskMtbcfRegulate = com.zt.core.shiro.ImportUtil.getCellValue(row, 9, pattern); //mtbcf
- String taskMtbcfOtherParams2 = com.zt.core.shiro.ImportUtil.getCellValue(row, 10, pattern); //mtbcf鍏朵粬鍙傛暟2
- String taskMtbcfOtherParams3 = com.zt.core.shiro.ImportUtil.getCellValue(row, 11, pattern); //mtbcf鍏朵粬鍙傛暟3
- String taskMtbcfRegulSuccRate = com.zt.core.shiro.ImportUtil.getCellValue(row, 12, pattern); //mtbcf鎴愬姛鐜�
- String taskMtbcfOperatingRatio = com.zt.core.shiro.ImportUtil.getCellValue(row, 13, pattern); //mtbcf杩愯姣�
- String repairable = com.zt.core.shiro.ImportUtil.getCellValue(row, 14, pattern); //鏄惁鍙淮淇�
- String repairDistribType = com.zt.core.shiro.ImportUtil.getCellValue(row, 15, pattern); //缁翠慨鍙戝竷绫诲瀷
- String repairMttcr = com.zt.core.shiro.ImportUtil.getCellValue(row, 16, pattern); //mttcr
- String repairMttcrOtherParams2 = com.zt.core.shiro.ImportUtil.getCellValue(row, 17, pattern); //mttcr鍏朵粬鍙傛暟2
- String repairMttcrOtherParams3 = com.zt.core.shiro.ImportUtil.getCellValue(row, 18, pattern); //mttcr鍏朵粬鍙傛暟3
+ String equipType = com.zt.core.shiro.ImportUtil.getCellValue(row, 4, pattern); //璁惧绫诲瀷
+ String reliabDistribType = com.zt.core.shiro.ImportUtil.getCellValue(row, 5, pattern); //鍙潬鎬у垎甯冪被鍨�
+ String basicJoinCompute = com.zt.core.shiro.ImportUtil.getCellValue(row, 6, pattern); //鍙傚姞璁＄畻
+ String basicMtbfRegulate = com.zt.core.shiro.ImportUtil.getCellValue(row, 7, pattern); //mtbf
+ String basicMtbfRegulSuccRate = com.zt.core.shiro.ImportUtil.getCellValue(row, 8, pattern); //鎴愬姛鐜�
+ String basicMtbfOperatingRatio = com.zt.core.shiro.ImportUtil.getCellValue(row, 9, pattern); //杩愯姣�
+ String taskMtbcfRegulate = com.zt.core.shiro.ImportUtil.getCellValue(row, 10, pattern); //mtbcf
+ String taskMtbcfOtherParams2 = com.zt.core.shiro.ImportUtil.getCellValue(row, 11, pattern); //mtbcf鍏朵粬鍙傛暟2
+ String taskMtbcfOtherParams3 = com.zt.core.shiro.ImportUtil.getCellValue(row, 12, pattern); //mtbcf鍏朵粬鍙傛暟3
+ String taskMtbcfRegulSuccRate = com.zt.core.shiro.ImportUtil.getCellValue(row, 13, pattern); //mtbcf鎴愬姛鐜�
+ String taskMtbcfOperatingRatio = com.zt.core.shiro.ImportUtil.getCellValue(row, 14, pattern); //mtbcf杩愯姣�
+ String repairable = com.zt.core.shiro.ImportUtil.getCellValue(row, 15, pattern); //鏄惁鍙淮淇�
+ String repairDistribType = com.zt.core.shiro.ImportUtil.getCellValue(row, 16, pattern); //缁翠慨鍙戝竷绫诲瀷
+ String repairMttcr = com.zt.core.shiro.ImportUtil.getCellValue(row, 17, pattern); //mttcr
+ String repairMttcrOtherParams2 = com.zt.core.shiro.ImportUtil.getCellValue(row, 18, pattern); //mttcr鍏朵粬鍙傛暟2
+ String repairMttcrOtherParams3 = com.zt.core.shiro.ImportUtil.getCellValue(row, 19, pattern); //mttcr鍏朵粬鍙傛暟3
if (StringUtils.isEmpty(sb)) {
com.zt.life.util.ImportUtil.updateErrMap(errMap, "娌℃湁濉啓璁惧鍚嶇О", sheetName, row1);
@@ -222,7 +242,6 @@
}
//瀵煎叆鍨嬪彿浜у搧缁撴灉搴�
XhProductModel xhProductModel = new XhProductModel();
-
Long defultImg = null;
xhProductModel.setShipId(shipId);
@@ -273,6 +292,7 @@
}
xhProductModel.setId(sbId);
xhProductModel.setName(sb);
+ xhProductModel.setEquipType(equipType);
xhProductModel.setProductType("5");
xhProductModel.setSort(Integer.valueOf(sort));
defultImg = sysPictureBaseService.getDefaultImg(5).getId();
@@ -287,43 +307,43 @@
itemEntity.setPageCode("expect");
itemEntity.setReliabDistribType(reliabType.get(reliabDistribType));
itemEntity.setBasicJoinCompute(isOrNot.get(basicJoinCompute));
- if (StringUtils.isNotBlank(basicMtbfRegulate)){
+ if (StringUtils.isNotBlank(basicMtbfRegulate)) {
itemEntity.setBasicMtbfRegulate(Double.valueOf(basicMtbfRegulate));
}
- if (StringUtils.isNotBlank(basicMtbfRegulSuccRate)){
+ if (StringUtils.isNotBlank(basicMtbfRegulSuccRate)) {
itemEntity.setBasicMtbfRegulSuccRate(Double.valueOf(basicMtbfRegulSuccRate));
}
- if (StringUtils.isNotBlank(basicMtbfOperatingRatio)){
+ if (StringUtils.isNotBlank(basicMtbfOperatingRatio)) {
itemEntity.setBasicMtbfOperatingRatio(Double.valueOf(basicMtbfOperatingRatio));
- }else{
+ } else {
itemEntity.setBasicMtbfOperatingRatio(1.0);
}
- if (StringUtils.isNotBlank(taskMtbcfRegulate)){
+ if (StringUtils.isNotBlank(taskMtbcfRegulate)) {
itemEntity.setTaskMtbcfRegulate(Double.valueOf(taskMtbcfRegulate));
}
- if (StringUtils.isNotBlank(taskMtbcfOtherParams2)){
+ if (StringUtils.isNotBlank(taskMtbcfOtherParams2)) {
itemEntity.setTaskMtbcfOtherParams2(Double.valueOf(taskMtbcfOtherParams2));
}
- if (StringUtils.isNotBlank(taskMtbcfOtherParams3)){
+ if (StringUtils.isNotBlank(taskMtbcfOtherParams3)) {
itemEntity.setTaskMtbcfOtherParams3(Double.valueOf(taskMtbcfOtherParams3));
}
- if (StringUtils.isNotBlank(taskMtbcfRegulSuccRate)){
+ if (StringUtils.isNotBlank(taskMtbcfRegulSuccRate)) {
itemEntity.setTaskMtbcfRegulSuccRate(Double.valueOf(taskMtbcfRegulSuccRate));
}
- if (StringUtils.isNotBlank(taskMtbcfOperatingRatio)){
+ if (StringUtils.isNotBlank(taskMtbcfOperatingRatio)) {
itemEntity.setTaskMtbcfOperatingRatio(Double.valueOf(taskMtbcfOperatingRatio));
- }else{
+ } else {
itemEntity.setTaskMtbcfOperatingRatio(1.0);
}
itemEntity.setRepairable(isOrNot.get(repairable));
itemEntity.setRepairDistribType(repairType.get(repairDistribType));
- if (StringUtils.isNotBlank(repairMttcr)){
+ if (StringUtils.isNotBlank(repairMttcr)) {
itemEntity.setRepairMttcr(Double.valueOf(repairMttcr));
}
- if (StringUtils.isNotBlank(repairMttcrOtherParams2)){
+ if (StringUtils.isNotBlank(repairMttcrOtherParams2)) {
itemEntity.setRepairMttcrOtherParams2(Double.valueOf(repairMttcrOtherParams2));
}
- if (StringUtils.isNotBlank(repairMttcrOtherParams3)){
+ if (StringUtils.isNotBlank(repairMttcrOtherParams3)) {
itemEntity.setRepairMttcrOtherParams3(Double.valueOf(repairMttcrOtherParams3));
}
paramDataService.insert(itemEntity);
--
Gitblit v1.9.1