添加返回inReport

src/main/resources/mapper/hmhj/EntrustSampleItemMapper.xml

@@ -51,7 +51,8 @@
             group_id,
             tester,
             tester_id,
-            test_time
+            test_time,
+            in_report
         FROM
         entrust_sample_item
         WHERE
@@ -92,7 +93,7 @@
         )
 
         SELECT i.*,s.name AS "sampleName",e.test_side "testSide",COALESCE(s.third_code,s.code) AS "sampleCode",l.record_id,r.object_key AS "recordObjectKey",
-        s.compliance_test,s.sample_from,sample_shape,s.second_code,s.third_code
+        s.compliance_test,s.sample_from,sample_shape,s.second_code,s.third_code,i.in_report
         FROM i
         JOIN entrust_sample s ON i.entrust_sample_id = s.id
         LEFT JOIN ( SELECT id,item_id,record_id FROM item_rel_original_record WHERE deleted = 0 ) l ON i.id = l.item_id
@@ -118,7 +119,8 @@
         standard,
         test_value,
         group_name,
-        group_id
+        group_id,
+        in_report
         FROM
         entrust_sample_item
         WHERE
@@ -159,7 +161,7 @@
         )
 
         SELECT i.*,s.name AS "sampleName",s.code AS "sampleCode",e.test_side "testSide",l.record_id,r.object_key AS "recordObjectKey",
-               s.compliance_test,s.second_code,s.third_code
+               s.compliance_test,s.second_code,s.third_code,i.in_report
         FROM i
         JOIN entrust_sample s ON i.entrust_sample_id = s.id
         JOIN (select t.id,t.code,t.test_side from entrust t where t.deleted = 0 ) e on s.entrust_id = e.id