From 8aee63afe0cd9f2ea2535fa3b67daba254c0ee72 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 15 五月 2024 00:55:00 +0800
Subject: [PATCH] 部分调整
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 4b43987..d75719a 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
@@ -52,7 +52,7 @@
@Override
public List<StandardProductList> selectStandardProductList(InsSample insSample) {
- String[] models = insSample.getModel().split("-");
+ 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]));
list = list.stream().filter(a -> {
try {
@@ -130,7 +130,7 @@
&& Objects.equals(sp.getInspectionItemSubclass(), pl.getInspectionItemSubclass())
&& Objects.equals(sp.getModel(), pl.getModel())) {
pl.setId(sp.getId());
- pl.setState(sp.getState());
+ pl.setState(id==0?1:sp.getState());
pl.setMethodS(sp.getMethodS());
if(sp.getAsk()!=null&&!sp.getAsk().equals("")){
pl.setAsk(sp.getAsk());
--
Gitblit v1.9.3