报告修改+实验结果

zss

2025-02-28 ede49ec7133b86d9db9dc1f0328418dcdaaef8aa

 inspect-server/src/main/resources/mapper/InsSampleMapper.xml

@@ -150,7 +150,7 @@
        </if>
        OR isu.user_id is NULL
        ) a
          ON ios.ins_order_id = a.id AND ios.laboratory = #{sonLaboratory} and a.sampleId=ios.ins_sample_id
        ON ios.ins_order_id = a.id AND ios.laboratory = #{sonLaboratory} and a.sampleId=ios.ins_sample_id
        left join
        (SELECT td.user_id order_user_id, td.ins_sample_id FROM ins_sample_user td,(SELECT max(id) id FROM
        ins_sample_user where son_laboratory=#{sonLaboratory} GROUP BY ins_sample_id) md where td.id = md.id
@@ -180,6 +180,7 @@
               inspection_item_class_en,
               inspection_item_subclass,
               inspection_item_subclass_en,

               ip.factory     ip_factory,
               ip.laboratory  ip_laboratory,
               ip.sample_type ip_sample_type,
@@ -269,6 +270,7 @@
               ipr.before_note,
               ipr.after_check,
               ipr.after_note,
               ipr.test_result,
               ipr2.frequency,
               ipr2.often,
               ipr2.port,
@@ -341,6 +343,7 @@
               ipr.before_note,
               ipr.after_check,
               ipr.after_note,
               ipr.test_result,
               ipr2.frequency,
               ipr2.often,
               ipr2.port,
@@ -373,21 +376,21 @@
    </select>
    <select id="selectSampleProductListByOrderId2" resultMap="sampleDto">
        select isa.*,
               ios.num          num1,
               ip.id            ip_id,
               ios.num        num1,
               ip.id          ip_id,
               inspection_item,
               inspection_item_en,
               inspection_item_subclass,
               inspection_item_subclass_en,
               inspection_item_class,
               inspection_item_class_en,
               ip.factory       ip_factory,
               ip.laboratory    ip_laboratory,
               ip.sample_type   ip_sample_type,
               ip.sample        ip_sample,
               ip.model         ip_model,
               ip.factory     ip_factory,
               ip.laboratory  ip_laboratory,
               ip.sample_type ip_sample_type,
               ip.sample      ip_sample,
               ip.model       ip_model,
               son_laboratory,
               ip.unit          ip_unit,
               ip.unit        ip_unit,
               price,
               man_hour,
               man_hour_group,
@@ -403,13 +406,13 @@
               ask,
               tell,
               `last_value`,
               ip.ins_result    ip_ins_result,
               ip.ins_result  ip_ins_result,
               state,
               ip.ins_sample_id,
               ip.create_user   ip_create_user,
               ip.update_user   ip_update_user,
               ip.create_time   ip_create_time,
               ip.update_time   ip_update_time,
               ip.create_user ip_create_user,
               ip.update_user ip_update_user,
               ip.create_time ip_create_time,
               ip.update_time ip_update_time,
               template_id,

               ip.method_s
@@ -422,21 +425,21 @@
    </select>
    <select id="selectSampleProductListByOrder2Id2" resultMap="sampleDto">
        select isa.*,
               ios.num          num1,
               ip.id            ip_id,
               ios.num        num1,
               ip.id          ip_id,
               inspection_item,
               inspection_item_en,
               inspection_item_subclass,
               inspection_item_subclass_en,
               inspection_item_class,
               inspection_item_class_en,
               ip.factory       ip_factory,
               ip.laboratory    ip_laboratory,
               ip.sample_type   ip_sample_type,
               ip.sample        ip_sample,
               ip.model         ip_model,
               ip.factory     ip_factory,
               ip.laboratory  ip_laboratory,
               ip.sample_type ip_sample_type,
               ip.sample      ip_sample,
               ip.model       ip_model,
               son_laboratory,
               ip.unit          ip_unit,
               ip.unit        ip_unit,
               price,
               man_hour,
               man_hour_group,
@@ -452,13 +455,13 @@
               ask,
               tell,
               `last_value`,
               ip.ins_result    ip_ins_result,
               ip.ins_result  ip_ins_result,
               state,
               ip.ins_sample_id,
               ip.create_user   ip_create_user,
               ip.update_user   ip_update_user,
               ip.create_time   ip_create_time,
               ip.update_time   ip_update_time,
               ip.create_user ip_create_user,
               ip.update_user ip_update_user,
               ip.create_time ip_create_time,
               ip.update_time ip_update_time,
               template_id,
               ip.method_s
        from ins_sample isa
@@ -543,6 +546,7 @@
               ipr.before_note,
               ipr.after_check,
               ipr.after_note,
               ipr.test_result,
               ipr2.frequency,
               ipr2.often,
               ipr2.port,
@@ -613,6 +617,7 @@
               ipr.before_note,
               ipr.after_check,
               ipr.after_note,
               ipr.test_result,
               ipr2.frequency,
               ipr2.often,
               ipr2.port,
@@ -681,6 +686,7 @@
               ipr.before_note,
               ipr.after_check,
               ipr.after_note,
               ipr.test_result,
               ipr2.frequency,
               ipr2.often,
               ipr2.port,
@@ -821,6 +827,7 @@
        <result property="beforeNote" column="before_note" jdbcType="VARCHAR"/>
        <result property="afterCheck" column="after_check" jdbcType="VARCHAR"/>
        <result property="afterNote" column="after_note" jdbcType="VARCHAR"/>
        <result property="testResult" column="test_result" jdbcType="VARCHAR"/>
        <result property="equipName" column="equip_name" jdbcType="VARBINARY"/>
    </resultMap>
    <resultMap id="insProductResult2" type="com.yuanchu.mom.pojo.InsProductResult2">