From df99fe98534cd9d8aa746124d5056753c72a8c20 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 17 六月 2024 09:15:17 +0800
Subject: [PATCH] 修复导入；增加重置
---
inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java | 5 +-
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java | 35 +++++++++++------
inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java | 4 ++
inspect-server/src/main/resources/mapper/StandardTreeMapper.xml | 8 ++++
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java | 16 ++++++++
5 files changed, 53 insertions(+), 15 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
index 50f5331..b1cf762 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
@@ -161,4 +161,20 @@
standardTreeService.inExcelOfTree(file);
return Result.success();
}
+
+ @ValueAuth
+ @ApiOperation("閲嶇疆鏍囧噯搴撳崟浠�")
+ @PostMapping("/resetTreeOfPrice")
+ public Result resetTreeOfPrice(String tree, Integer standardId){
+ standardTreeService.resetTreeOfPrice(tree, standardId);
+ return Result.success();
+ }
+
+ @ValueAuth
+ @ApiOperation("閲嶇疆鏍囧噯搴撳伐鏃剁郴鏁�")
+ @PostMapping("/resetTreeOfHour")
+ public Result resetTreeOfHour(String tree, Integer standardId){
+ standardTreeService.resetTreeOfHour(tree, standardId);
+ return Result.success();
+ }
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java
index 088b697..43cec1d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java
@@ -1,15 +1,14 @@
package com.yuanchu.mom.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.mom.dto.FactoryDto;
import com.yuanchu.mom.dto.SampleDto;
import com.yuanchu.mom.dto.SampleTypeDto;
import com.yuanchu.mom.pojo.StandardMethodList;
import com.yuanchu.mom.pojo.StandardProductList;
import com.yuanchu.mom.pojo.StandardTree;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
-import java.util.Map;
/**
* @author Administrator
@@ -40,6 +39,8 @@
List<SampleDto> getStandardTree3(String sampleType);
String getLaboratory(String str);
+
+ Integer getStructureItemParameterId(String sampleType, String item, String itemChild);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
index f38e4bc..26c770a 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
@@ -32,4 +32,8 @@
void inExcelOfTree(MultipartFile file);
+ void resetTreeOfPrice(String tree, Integer standardId);
+
+ void resetTreeOfHour(String tree, Integer standardId);
+
}
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..e08aba6 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;
}
@@ -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));
+ }
}
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index 9b04568..d7d8975 100644
--- a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -263,4 +263,12 @@
left join laboratory l on sto.laboratory_id = l.id
where sto.specimen_name = #{str}
</select>
+ <select id="getStructureItemParameterId" resultType="java.lang.Integer">
+ select id from structure_item_parameter
+ where sample like concat('%', #{sampleType}, '%')
+ and inspection_item = #{item}
+ <if test="itemChild != null">
+ and inspection_item_subclass = #{itemChild}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3