From eb1a57285bb3468a4efe051781b8cc7a13ec23c6 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 14 五月 2024 14:15:06 +0800
Subject: [PATCH] 部分调整

---
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

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 4c450a9..0a1fc95 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
@@ -77,7 +77,7 @@
         insOrderMapper.updateById(insOrder);
         List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
         List<Integer> ids = insSamples.stream().map(a-> a.getId()).collect(Collectors.toList());
-        List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).select(InsProduct::getSonLaboratory).groupBy(InsProduct::getSonLaboratory));
+        List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getState, 1).select(InsProduct::getSonLaboratory).groupBy(InsProduct::getSonLaboratory));
         for (InsProduct insProduct : insProducts) {
             InsOrderState insOrderState = new InsOrderState();
             insOrderState.setInsOrderId(orderId);
@@ -117,6 +117,9 @@
                     product.setUpdateTime(null);
                     product.setUpdateUser(null);
                     product.setInsSampleId(a.getId());
+                    if(product.getInspectionItemSubclass() == null){
+                        product.setInspectionItemSubclass("");
+                    }
                     insProductMapper.insert(product);
                 }
             }
@@ -136,6 +139,7 @@
 
     @Override
     public int upInsOrderOfState(InsOrder insOrder) {
+        insOrder.setExamineTime(LocalDateTime.now());
         return insOrderMapper.updateById(insOrder);
     }
 

--
Gitblit v1.9.3