From de39b8ac2b5e98441e60917e9502239d42dfada9 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 29 四月 2024 02:24:56 +0800
Subject: [PATCH] 标准库修复
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java | 3 ---
system-run/src/main/resources/application-dev.yml | 2 +-
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 29 +++++++++++++++++++++++++----
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 2 --
cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml | 3 ---
5 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
index 6062487..c8ee930 100644
--- a/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
+++ b/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
@@ -7,7 +7,6 @@
select id,
inspection_item,
inspection_item_en,
- inspection_item_classify,
inspection_item_subclass,
inspection_item_subclass_en,
laboratory,
@@ -16,10 +15,8 @@
man_hour,
man_hour_group,
inspection_item_type,
- device_group,
checkout_number,
section,
- value_type,
create_user,
update_user,
create_time,
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
index 6aeb5bb..0a6d4e0 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.mapper.StandardProductListMapper;
import com.yuanchu.mom.mapper.StandardTreeMapper;
import com.yuanchu.mom.pojo.InsSample;
@@ -10,7 +11,6 @@
import com.yuanchu.mom.service.StandardProductListService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.List;
@@ -32,7 +32,7 @@
private StandardTreeMapper standardTreeMapper;
- private StandardProductListService standardProductListService;
+ private GetLook getLook;
@Override
public int upStandardProductList(StandardProductList list) {
@@ -79,7 +79,6 @@
}
@Override
- @Transactional(rollbackFor = Exception.class)
public List<StandardProductList> selectStandardProductListByMethodId(Integer id, String tree) {
String[] trees = tree.split(" - ");
StringBuffer str = new StringBuffer();
@@ -101,13 +100,35 @@
pl.setSample(sp.getSample());
pl.setModel(sp.getModel());
pl.setMethodS(sp.getMethodS());
+ if(sp.getAsk()!=null&&!sp.getAsk().equals("")){
+ pl.setAsk(sp.getAsk());
+ }
+ if(sp.getTell()!=null&&!sp.getTell().equals("")){
+ pl.setTell(sp.getTell());
+ }
break;
}
}
}
+ Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
CompletableFuture.supplyAsync(() -> {
standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).eq(StandardProductList::getTree, tree));
- standardProductListService.saveBatch(list);
+ saveBatch(list.stream().map(a->{
+ a.setFactory(trees[0]);
+ a.setLaboratory(trees[1]);
+ a.setSampleType(trees[2]);
+ try {
+ a.setSample(trees[3]);
+ }catch (Exception e){}
+ try {
+ a.setModel(trees[4]);
+ }catch (Exception e){}
+ a.setTree(tree);
+ a.setCreateUser(userId);
+ a.setUpdateUser(userId);
+ a.setStandardMethodListId(id);
+ return a;
+ }).collect(Collectors.toList()));
return null;
}).thenAccept(res -> {
}).exceptionally(e -> {
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 e00359d..aa72274 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
@@ -5,7 +5,6 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.dto.FactoryDto;
import com.yuanchu.mom.dto.SampleTypeDto;
import com.yuanchu.mom.mapper.StandardMethodListMapper;
@@ -42,8 +41,6 @@
private StandardProductListMapper standardProductListMapper;
private StandardProductListService standardProductListService;
-
- private GetLook getLook;
@Override
public List<FactoryDto> selectStandardTreeList() {
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 6c4a405..26a04a3 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -116,8 +116,6 @@
<select id="selectSampleAndProductByOrderId" resultType="com.yuanchu.mom.dto.SampleProductDto2">
select *
from (
- select
- i.id,isa.sample_code,isa.sample,isa.model,ip.state,ip.unit,ip.inspection_item,ip.inspection_item_subclass,
select i.id,isa.sample_code,isa.sample,isa.model,isa.ins_state,ip.state,ip.unit,ip.inspection_item,ip.inspection_item_subclass,
ip.son_laboratory,ip.inspection_item_type,ip.inspection_value_type,ip.ask,ip.`last_value`,ip.ins_result,ipr.equip_value
from ins_sample isa
diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index c413ba4..b8bc183 100644
--- a/system-run/src/main/resources/application-dev.yml
+++ b/system-run/src/main/resources/application-dev.yml
@@ -29,7 +29,7 @@
type-aliases-package: com.yuanchu.mom.pojo
mapper-locations: classpath*:/mapper/*.xml
configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 寮�鍚痬ybatis-plus鏃ュ織
+ log-impl: #org.apache.ibatis.logging.stdout.StdOutImpl # 寮�鍚痬ybatis-plus鏃ュ織
# 鏁版嵁婧愰厤缃�
--
Gitblit v1.9.3