From 3b6b3e356583e7ae3d264b4c59178c8b4087e5c4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 06 六月 2024 10:57:34 +0800
Subject: [PATCH] 检验任务的附件+提交前校验+复核确认新增不合格项目
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
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 f368487..d363088 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
@@ -56,6 +56,9 @@
String[] models = insSample.getModel().split("-(?=[^-]*$)");//鎷嗗垎鏈�鍚庝竴涓��-銆�
List<StandardProductList> list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()).eq(StandardProductList::getState, 1).eq(StandardProductList::getModel, models[0]));
if (list.size() == 0) {
+ if(Objects.equals(insSample.getFactory(), "") || insSample.getFactory() == null){
+ return null;
+ }
String[] split = insSample.getFactory().split(" - ");
list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
.eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId())
@@ -72,19 +75,23 @@
List<String> prices = JSON.parseArray(a.getPrice(), String.class);
boolean isIf;
for (int i = 0; i < sections.size(); i++) {
- if (sections.get(i).contains("&")) {
- String[] split = sections.get(i).split("&");
- isIf = getIsIf(split[0], models[1]) && getIsIf(split[1], models[1]);
- } else {
- isIf = getIsIf(sections.get(i), models[1]);
- }
- if (isIf) {
- a.setSection(sections.get(i));
- a.setAsk(asks.get(i));
- a.setTell(tells.get(i));
- a.setPrice(prices.get(i));
- a.setManHour(manHours.get(i));
+ if(Objects.equals(a.getBsm(), "1")){
return true;
+ }else{
+ if (sections.get(i).contains("&")) {
+ String[] split = sections.get(i).split("&");
+ isIf = getIsIf(split[0], models[1]) && getIsIf(split[1], models[1]);
+ } else {
+ isIf = getIsIf(sections.get(i), models[1]);
+ }
+ if (isIf) {
+ a.setSection(sections.get(i));
+ a.setAsk(asks.get(i));
+ a.setTell(tells.get(i));
+ a.setPrice(prices.get(i));
+ a.setManHour(manHours.get(i));
+ return true;
+ }
}
}
return false;
--
Gitblit v1.9.3