Merge remote-tracking branch 'origin/master'

value

2024-04-30 ce10da906c58596fce43bffa6a6d177268ca177b

 cnas-server/src/main/resources/mapper/StandardMethodMapper.xml

@@ -17,24 +17,50 @@

    <select id="selectStandardMethodList" resultType="com.yuanchu.mom.pojo.StandardMethod">
        select * from (
        select sm.id,
        sm.code,
        sm.name,
        sm.structure_test_object_id,
        sto.specimen_name sample_type,
        sm.remark,
        u1.name create_user_name,
        sm.create_time,
        u2.name update_user_name,
        sm.update_time,
        sm.is_product
        from standard_method sm
        left join user u1 on sm.create_user = u1.id
        left join user u2 on sm.update_user = u2.id
        left join structure_test_object sto on sm.structure_test_object_id = sto.id
        ) a
                select sm.id,
                sm.code,
                sm.name,
                sm.structure_test_object_id,
                sto.specimen_name sample_type,
                sm.remark,
                u1.name create_user_name,
                sm.create_time,
                u2.name update_user_name,
                sm.update_time,
                sm.is_product,
                sm.field,
                sm.name_en,
                sm.is_use,
                sm.qualification_id
                from standard_method sm
                left join user u1 on sm.create_user = u1.id
                left join user u2 on sm.update_user = u2.id
                left join structure_test_object sto on sm.structure_test_object_id = sto.id
                ) a
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
    </select>
    <select id="selectStandMethodById" resultType="com.yuanchu.mom.pojo.StandardMethod">
        select sm.id,
               sm.code,
               sm.name,
               sm.structure_test_object_id,
               sto.specimen_name sample_type,
               sm.remark,
               u1.name create_user_name,
               sm.create_time,
               u2.name update_user_name,
               sm.update_time,
               sm.is_product,
               sm.field,
               sm.name_en,
               sm.is_use,
               sm.qualification_id
        from standard_method sm
                 left join user u1 on sm.create_user = u1.id
                 left join user u2 on sm.update_user = u2.id
                 left join structure_test_object sto on sm.structure_test_object_id = sto.id
        where sm.id = #{id}
    </select>
</mapper>