From 00310b8b5bf002f0135ba0b60715b17e5a3da31f Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 13 六月 2024 18:02:39 +0800
Subject: [PATCH] 小功能调整
---
inspect-server/src/main/java/com/yuanchu/mom/dto/InsulatingDto.java | 17 +++++
inspect-server/src/main/java/com/yuanchu/mom/dto/SheathDto.java | 15 +++++
cnas-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java | 2
cnas-server/src/main/java/com/yuanchu/mom/service/impl/StructureItemParameterServiceImpl.java | 2
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 23 ++++++-
cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java | 59 +++++++++++--------
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java | 2
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto.java | 4 +
8 files changed, 93 insertions(+), 31 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
index fe1dd1b..0bcb4ac 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
@@ -8,6 +8,7 @@
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.PageTestObjectDto;
+import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.service.*;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -172,8 +173,8 @@
List<StructureItemParameter> lists = new ArrayList<>();
AtomicReference<String> sample = new AtomicReference<>();
ExcelUtil.readBySax(inputStream, 0, (i, l, list1) -> {
- if(i == 0 && l == 1){
- sample.set(list1.get(1)+"");
+ if (i == 0 && l == 1) {
+ sample.set(list1.get(1) + "");
}
if (i == 0 && l >= 1) {
StructureItemParameter str = new StructureItemParameter();
@@ -183,26 +184,28 @@
String brand = (String) list1.get(1);
StringBuilder builder = new StringBuilder();
builder.append("[");
- if (ObjectUtil.isNotEmpty(list1.get(2))){
+ if (ObjectUtil.isNotEmpty(list1.get(2))) {
String production = (String) list1.get(2);
- if (!production.contains("銆�")){
- builder.append(String.format("[\"%s\",\"%s\"]",brand,production));
- }else{
- Arrays.stream(production.split("銆�")).forEach(item->{
- builder.append(String.format("[\"%s\",\"%s\"],",brand,item));
+ if (!production.contains("銆�")) {
+ builder.append(String.format("[\"%s\",\"%s\"]", brand, production));
+ } else {
+ Arrays.stream(production.split("銆�")).forEach(item -> {
+ builder.append(String.format("[\"%s\",\"%s\"],", brand, item));
});
builder.deleteCharAt(builder.length() - 1);
}
- }else{
+ } else {
builder.append("[");
- builder.append(String.format("\"%s\"",brand));
+ builder.append(String.format("\"%s\"", brand));
builder.append("]");
}
builder.append("]");
str.setSample(builder.toString());
}
str.setInspectionItem(list1.get(4).toString());
- str.setInspectionItemEn(list1.get(5).toString());
+ if (list1.get(5) != null) {
+ str.setInspectionItemEn(list1.get(5).toString());
+ }
if (list1.get(6) == null) {
str.setInspectionItemSubclass(null);
} else {
@@ -214,20 +217,28 @@
str.setInspectionItemSubclassEn(String.valueOf(list1.get(7).toString()));
}
StructureItemParameter db_str;
- if (StringUtils.isEmpty(str.getInspectionItemSubclass())){
+ if (StringUtils.isEmpty(str.getInspectionItemSubclass())) {
// 姣旇緝涓や釜鏉′欢
- db_str = structureItemParameterService.getOne(Wrappers.lambdaQuery(StructureItemParameter.class)
- .eq(StructureItemParameter::getInspectionItem, str.getInspectionItem())
- .eq(StructureItemParameter::getSample, str.getSample())
- );
- }else{
- db_str = structureItemParameterService.getOne(Wrappers.lambdaQuery(StructureItemParameter.class)
- .eq(StructureItemParameter::getInspectionItem, str.getInspectionItem())
- .eq(StructureItemParameter::getSample, str.getSample())
- .eq(StructureItemParameter::getInspectionItemSubclass,str.getInspectionItemSubclass())
- );
+ try {
+ db_str = structureItemParameterService.getOne(Wrappers.lambdaQuery(StructureItemParameter.class)
+ .eq(StructureItemParameter::getInspectionItem, str.getInspectionItem())
+ .eq(StructureItemParameter::getSample, str.getSample())
+ );
+ } catch (Exception e) {
+ throw new ErrorException("閲嶅鏌ヨ锛�" + str.getInspectionItem());
+ }
+ } else {
+ try {
+ db_str = structureItemParameterService.getOne(Wrappers.lambdaQuery(StructureItemParameter.class)
+ .eq(StructureItemParameter::getInspectionItem, str.getInspectionItem())
+ .eq(StructureItemParameter::getSample, str.getSample())
+ .eq(StructureItemParameter::getInspectionItemSubclass, str.getInspectionItemSubclass())
+ );
+ } catch (Exception e) {
+ throw new ErrorException("閲嶅鏌ヨ锛�" + str.getInspectionItem() + " " + str.getInspectionItemSubclass());
+ }
}
- if (ObjectUtils.isNotEmpty(db_str)){
+ if (ObjectUtils.isNotEmpty(db_str)) {
str.setId(db_str.getId());
}
if (list1.get(8) == null) {
@@ -299,7 +310,7 @@
}
str.setInspectionItemType(jy);
String validateValueType = list1.get(18).toString();
- if (StringUtils.isNotBlank(validateValueType)){
+ if (StringUtils.isNotBlank(validateValueType)) {
Enums enums = enumService.getOne(Wrappers.lambdaQuery(Enums.class)
.eq(Enums::getCategory, "妫�楠屽�肩被鍨�")
.eq(Enums::getLabel, validateValueType));
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
index 07fa0b5..6949320 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
@@ -34,7 +34,7 @@
map.put("head", PrintChina.printChina(Product.class));
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectProductListByObjectId");
if(map1.get("look")==1) product.setCreateUser(map1.get("userId"));
- map.put("body", productMapper.selectPage(page, QueryWrappers.queryWrappers(product)));
+ map.put("body", productMapper.selectPage(page, QueryWrappers.queryWrappers(product).eq("object_id", product.getObjectId())));
return map;
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/StructureItemParameterServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/StructureItemParameterServiceImpl.java
index e10c22d..1fea7a1 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/StructureItemParameterServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/StructureItemParameterServiceImpl.java
@@ -19,6 +19,6 @@
@Override
public void removeNoSample(String sample) {
- structureItemParameterMapper.removeNoSample(sample);
+ structureItemParameterMapper.removeNoSample("\""+sample+"\"");
}
}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/InsulatingDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/InsulatingDto.java
new file mode 100644
index 0000000..44716f0
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/InsulatingDto.java
@@ -0,0 +1,17 @@
+package com.yuanchu.mom.dto;
+
+import com.yuanchu.mom.pojo.InsProduct;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class InsulatingDto {
+
+ private Integer standardMethodListId;
+
+ private Integer num;
+
+ private List<InsProduct> insProduct;
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto.java
index 7dea47f..e07cf1b 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto.java
@@ -15,4 +15,8 @@
private List<SampleProductDto> childSampleList;
+ private InsulatingDto insulating;
+
+ private SheathDto sheath;
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SheathDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SheathDto.java
new file mode 100644
index 0000000..b01f823
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SheathDto.java
@@ -0,0 +1,15 @@
+package com.yuanchu.mom.dto;
+
+import com.yuanchu.mom.pojo.InsProduct;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SheathDto {
+
+ private Integer standardMethodListId;
+
+ private List<InsProduct> insProduct;
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
index 4b628b7..12d10fe 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
@@ -212,4 +212,6 @@
private Integer insFiberId;
private Integer insFibersId;
+
+ private Integer standardMethodListId;
}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
index 757e268..f2bb260 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -24,10 +24,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
@@ -147,6 +144,22 @@
if (ObjectUtil.isNotEmpty(a.getInsProduct())) {
addInsProductMethod(a.getId(), a.getInsProduct(), null, 0);
}
+ if(ObjectUtil.isNotEmpty(a.getInsulating())){
+ List<InsProduct> ip2 = new ArrayList<>();
+ for (Integer i = 0; i < a.getInsulating().getNum(); i++) {
+ ip2.addAll(a.getInsulating().getInsProduct());
+ }
+ for (InsProduct product : ip2) {
+ product.setStandardMethodListId(a.getInsulating().getStandardMethodListId());
+ }
+ addInsProductMethod(a.getId(), ip2, null, 0);
+ }
+ if(ObjectUtil.isNotEmpty(a.getSheath())){
+ for (InsProduct product : a.getSheath().getInsProduct()) {
+ product.setStandardMethodListId(a.getSheath().getStandardMethodListId());
+ }
+ addInsProductMethod(a.getId(), a.getSheath().getInsProduct(), null, 0);
+ }
if(ObjectUtil.isNotEmpty(a.getChildSampleList())){
for (SampleProductDto b : a.getChildSampleList()) {
for (int i = 0; i < b.getNum(); i++) {
@@ -188,7 +201,7 @@
}
}
}
- });
+ }) ;
for (List<Integer> i : pairing) {
SampleProductDto sample = JSON.parseObject(JSON.toJSONString(list.get(i.get(0) - 1)), SampleProductDto.class);
sample.setSampleCode(list.get(i.get(0)-1).getSampleCode() + "/" +list.get(i.get(1)-1).getSampleCode());
--
Gitblit v1.9.3