From d86a37f36ec375f8aa3d3eaee18ea1ad323eba0b Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 26 四月 2024 09:13:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java
index 280c08b..f98ca4b 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java
@@ -1,16 +1,20 @@
package com.yuanchu.mom.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.PageTestObjectDto;
+import com.yuanchu.mom.dto.TestItemDto;
+import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.StructureItemParameterMapper;
import com.yuanchu.mom.mapper.StructureTestObjectMapper;
import com.yuanchu.mom.pojo.StructureItemParameter;
import com.yuanchu.mom.pojo.StructureTestObject;
import com.yuanchu.mom.service.CapacityScopeService;
+import com.yuanchu.mom.service.StandardTreeService;
import com.yuanchu.mom.utils.QueryWrappers;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -35,6 +39,8 @@
private StructureTestObjectMapper structureTestObjectMapper;
+ private StandardTreeService standardTreeService;
+
@Override
public Map<String, Object> selectItemParameterList(Page page, StructureItemParameter itemParameter) {
Map<String, Object> map = new HashMap<>();
@@ -47,17 +53,29 @@
@Override
public int addItemParameter(StructureItemParameter itemParameter) {
- return structureItemParameterMapper.insert(itemParameter);
+ if (itemParameter.getBsm().equals("")||itemParameter.getBsm()==null){
+ itemParameter.setBsm("0");
+ }
+ int insert = structureItemParameterMapper.insert(itemParameter);
+ standardTreeService.reTreeBySampleType(structureTestObjectMapper.selectById(itemParameter.getSample()).getSpecimenName());
+ return insert;
}
@Override
public int delItemParameter(Integer id) {
- return structureItemParameterMapper.deleteById(id);
+ standardTreeService.reTreeBySampleType(structureTestObjectMapper.selectById(structureItemParameterMapper.selectById(id).getSample()).getSpecimenName());
+ int i = structureItemParameterMapper.deleteById(id);
+ return i;
}
@Override
public int upItemParameter(StructureItemParameter itemParameter) {
- return structureItemParameterMapper.updateById(itemParameter);
+ int i = structureItemParameterMapper.updateById(itemParameter);
+ if(itemParameter.getSample() != null){
+ List<String> list = JSON.parseArray(itemParameter.getSample(), String.class);
+ standardTreeService.reTreeBySampleType(list.get(0));
+ }
+ return i;
}
@Override
@@ -72,7 +90,10 @@
@Override
public int addTestObject(StructureTestObject testObject) {
- System.out.println(testObject);
+ Long count = structureTestObjectMapper.selectCount(Wrappers.<StructureTestObject>lambdaQuery().eq(StructureTestObject::getSpecimenName, testObject.getSpecimenName()));
+ if(count.compareTo(0L) > 0){
+ throw new ErrorException("妫�楠屽璞′笉鑳介噸澶�");
+ }
return structureTestObjectMapper.insert(testObject);
}
@@ -88,7 +109,18 @@
@Override
public List<StructureTestObject> selectTestObjectByName() {
- return structureTestObjectMapper.selectList(Wrappers.<StructureTestObject>lambdaQuery().select(StructureTestObject::getSpecimenName));
+ return structureTestObjectMapper.selectList(Wrappers.<StructureTestObject>lambdaQuery().select(StructureTestObject::getSpecimenName,StructureTestObject::getId));
+ }
+
+ //璁惧閲岄潰閫夋嫨妫�楠岄」鐩�(鏍戝舰缁撴瀯)
+ @Override
+ public List<Map<String, Object>> getInsProduction() {
+ return structureItemParameterMapper.getInsProduction();
+ }
+
+ @Override
+ public List<TestItemDto> getItemTree() {
+ return structureItemParameterMapper.getItemTree();
}
}
--
Gitblit v1.9.3