From 16d63c3d68d131ad0cc4a8bd9f22a0c0515aa6bf Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 17 七月 2024 18:23:57 +0800
Subject: [PATCH] 工时的各需求+检验任务修改

---
 inspect-server/src/main/resources/mapper/InsSampleMapper.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 5b22c2d..e822231 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -254,7 +254,7 @@
                method,
                man_day,
                bsm,
-               ask,
+               tell as ask,
                `last_value`,
                ip.ins_result  ip_ins_result,
                state,
@@ -272,6 +272,7 @@
                  left join ins_product ip on isa.id = ip.ins_sample_id
                  left join ins_product_result ipr on ip.id = ipr.ins_product_id
         where ins_order_id = #{id}
+            and template_id is not null
           and state = 1
     </select>
 
@@ -305,6 +306,8 @@
         select ip.id          ip_id,
                inspection_item,
                inspection_item_en,
+               inspection_item_class,
+               inspection_item_class_en,
                inspection_item_subclass,
                inspection_item_subclass_en,
                ip.factory     ip_factory,

--
Gitblit v1.9.3