From 68b2d4f7d3f122a7d6ab075c5455ac1d8ef6d932 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 25 六月 2024 17:58:55 +0800
Subject: [PATCH] 检验下单标签打印+标准库枚举筛选+报告生成修改+检验下单委托编号生成
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 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 c0339db..a531710 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,5 +1,6 @@
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;
@@ -134,7 +135,7 @@
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){
+ if (productList.getMethodS() != null) {
standardProductListMapper.update(productList, Wrappers.<StandardProductList>lambdaUpdate().in(StandardProductList::getId, ids).like(StandardProductList::getMethod, productList.getMethodS()));
return 1;
}
@@ -206,7 +207,7 @@
}
StandardProductList db_str;
try {
- db_str = standardProductListMapper.getOne(str.getStandardMethodListId(),str.getInspectionItem(),str.getSample(),str.getInspectionItemSubclass(),str.getModel());
+ db_str = standardProductListMapper.getOne(str.getStandardMethodListId(), str.getInspectionItem(), str.getSample(), str.getInspectionItemSubclass(), str.getModel());
} catch (Exception e) {
throw new ErrorException("閲嶅鏌ヨ锛�" + str.getInspectionItem() + " " + str.getInspectionItemSubclass());
}
@@ -215,7 +216,7 @@
str.setStructureItemParameterId(db_str.getStructureItemParameterId());
}
if (list.get(8) != null) {
- str.setMethodS(list.get(8)+"");
+ str.setMethodS(list.get(8) + "");
}
if (list.get(11) == null) {
@@ -251,18 +252,23 @@
str.setFactory("涓ぉ绉戞妧妫�娴嬩腑蹇�");
str.setLaboratory(laboratory.get());
str.setState(1);
- str.setTree(str.getFactory() + " - " + str.getLaboratory() + " - " + str.getSampleType() + " - " + str.getSample() + " - " + (str.getModel() == null?"":str.getModel()));
- str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\""+str.getSampleType()+"\"", str.getInspectionItem(), str.getInspectionItemSubclass()));
- if(str.getStructureItemParameterId() == null){
+ str.setTree(str.getFactory() + " - " + str.getLaboratory() + " - " + str.getSampleType() + " - " + str.getSample() + " - " + (str.getModel() == null ? "" : str.getModel()));
+ try {
+ str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\"" + str.getSampleType() + "\"", str.getInspectionItem(), str.getInspectionItemSubclass()));
+ } catch (Exception e) {
+ Console.log("\"" + str.getSampleType() + "\",\"" + str.getSample() + "\"");
+ str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\"" + str.getSampleType() + "\",\"" + str.getSample() + "\"", str.getInspectionItem(), str.getInspectionItemSubclass()));
+ }
+ if (str.getStructureItemParameterId() == null) {
throw new ErrorException("妫�楠岄」鐩笉瀛樺湪锛�" + str.getInspectionItem() + " " + str.getInspectionItemSubclass());
}
lists.add(str);
}
});
- lists.forEach(a->{
- if(a.getId() != null){
+ lists.forEach(a -> {
+ if (a.getId() != null) {
standardProductListMapper.updateById(a);
- }else{
+ } else {
standardProductListMapper.insert(a);
}
});
@@ -277,6 +283,16 @@
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));
}
+
+ @Override
+ public void resetTreeOfAsk(String tree, Integer standardId) {
+ standardProductListMapper.update(null, Wrappers.<StandardProductList>lambdaUpdate().like(StandardProductList::getTree, tree).eq(StandardProductList::getStandardMethodListId, standardId)
+ .set(StandardProductList::getAsk, null)
+ .set(StandardProductList::getTell, null)
+ .set(StandardProductList::getSection, null)
+ .set(StandardProductList::getPrice, null)
+ .set(StandardProductList::getManHour, null));
+ }
}
--
Gitblit v1.9.3