功能调整

罗媛媛

2024-04-01 e691b3282287a247f92e7301d778cdbb1fe4eaab

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

@@ -107,6 +107,47 @@
        where ins_order_id = #{id}
        and state = 1
    </select>
    <select id="getInsOrderAndSample" resultMap="sampleDto">
        select isa.*,
               ip.id ip_id,
               inspection_item,
               inspection_item_classify,
               inspection_item_subclass,
               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,
               price,
               man_hour,
               man_hour_group,
               inspection_item_type,
               inspection_value_type,
               device_group,
               checkout_number,
               section,
               value_type,
               method,
               man_day,
               bsm,
               ask,
               `last_value`,
               ip.ins_result ip_ins_result,
               state,
               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,
               template_id
        from ins_sample isa
        left join ins_product ip on isa.id = ip.ins_sample_id
        where ins_order_id = #{id}
        and state = 1
        and ip.son_laboratory = #{laboratory}
    </select>

    <resultMap id="sampleDto" type="com.yuanchu.mom.dto.SampleProductDto">
        <id property="id" column="id" jdbcType="INTEGER"/>