From e514d3b363475831841e6240b35795eafebf3ef7 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 18 六月 2024 03:03:23 +0800
Subject: [PATCH] bug修复
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
index f96abd5..d06dd7d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
@@ -1,10 +1,8 @@
package com.yuanchu.mom.service.impl;
-import cn.hutool.core.lang.Console;
import cn.hutool.poi.excel.ExcelUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.dto.FactoryDto;
@@ -136,6 +134,10 @@
public int upStandardProducts(Map<String, Object> product) {
List<Integer> ids = JSON.parseArray(product.get("ids") + "");
StandardProductList productList = JSON.parseObject(JSON.toJSONString(product.get("standardProductList")), StandardProductList.class);
+ if(productList.getMethodS() != null){
+ standardProductListMapper.update(productList, Wrappers.<StandardProductList>lambdaUpdate().in(StandardProductList::getId, ids).like(StandardProductList::getMethod, productList.getMethodS()));
+ return 1;
+ }
standardProductListMapper.update(productList, Wrappers.<StandardProductList>lambdaUpdate().in(StandardProductList::getId, ids));
return 1;
}
@@ -198,7 +200,7 @@
}
str.setInspectionItem(list.get(4) + "");
if (list.get(6) == null) {
- str.setInspectionItemSubclass(null);
+ str.setInspectionItemSubclass("");
} else {
str.setInspectionItemSubclass(list.get(6).toString());
}
@@ -213,16 +215,7 @@
str.setStructureItemParameterId(db_str.getStructureItemParameterId());
}
if (list.get(8) != null) {
- StringBuilder buffer = new StringBuilder();
- String input = list.get(8).toString();
- buffer.append("[");
- String[] values = input.split("銆�");
- for (String value : values) {
- buffer.append("\"").append(value.trim()).append("\",");
- }
- buffer.deleteCharAt(buffer.length() - 1);
- buffer.append("]");
- str.setMethod(buffer.toString());
+ str.setMethodS(list.get(8)+"");
}
if (list.get(11) == null) {
@@ -255,8 +248,14 @@
} else {
throw new ErrorException("妯℃澘涓嶅瓨鍦細" + list.get(21));
}
-
+ str.setFactory("涓ぉ绉戞妧妫�娴嬩腑蹇�");
+ str.setLaboratory(laboratory.get());
str.setState(1);
+ str.setTree(str.getFactory() + " - " + str.getLaboratory() + " - " + str.getSampleType() + " - " + (str.getSample() == null?"":str.getSample()) + " - " + (str.getModel() == null?"":str.getModel()));
+ str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\""+str.getSampleType()+"\"", str.getInspectionItem(), str.getInspectionItemSubclass()));
+ if(str.getStructureItemParameterId() == null){
+ throw new ErrorException("妫�楠岄」鐩笉瀛樺湪锛�" + str.getInspectionItem() + " " + str.getInspectionItemSubclass());
+ }
lists.add(str);
}
});
@@ -268,6 +267,16 @@
}
});
}
+
+ @Override
+ public void resetTreeOfPrice(String tree, Integer standardId) {
+ standardProductListMapper.update(null, Wrappers.<StandardProductList>lambdaUpdate().like(StandardProductList::getTree, tree).eq(StandardProductList::getStandardMethodListId, standardId).set(StandardProductList::getPrice, null));
+ }
+
+ @Override
+ public void resetTreeOfHour(String tree, Integer standardId) {
+ standardProductListMapper.update(null, Wrappers.<StandardProductList>lambdaUpdate().like(StandardProductList::getTree, tree).eq(StandardProductList::getStandardMethodListId, standardId).set(StandardProductList::getManHour, null));
+ }
}
--
Gitblit v1.9.3