Merge remote-tracking branch 'origin/master'

zhuo

2024-07-23 5ed5f51d479989d5b2149b09c82b6b3ea495b589

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

@@ -93,14 +93,34 @@
    <select id="selectDeviceParameterPage" resultType="com.yuanchu.mom.dto.DeviceDto">
        select * from(
        SELECT
        d.*, u.name equipmentManagerUser, l.laboratory_name laboratoryName
        d.*,
        GROUP_CONCAT(
        CONCAT_WS(', ',
        TRIM(BOTH '["]' FROM SUBSTRING_INDEX(REPLACE(sample, '[["', ''), '"]]', 1)),
        inspection_item,
        inspection_item_subclass
        )
        SEPARATOR ';'
        ) AS insProductItem,
        u.name ,
        l.laboratory_name
        FROM
        device d
        left join `user` u on u.id = d.equipment_manager
        left join laboratory l on l.id = d.subordinate_departments_id
        LEFT JOIN `user` u ON u.id = d.equipment_manager
        LEFT JOIN laboratory l ON l.id = d.subordinate_departments_id
        LEFT JOIN structure_item_parameter sip ON FIND_IN_SET(sip.id, d.ins_product_ids)
        GROUP BY
        d.id,
        u.name, l.laboratory_name
        ) a
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
    </select>

    <select id="getInspectionItemSubclass" resultType="java.lang.String">
        SELECT if(ip.inspection_item_subclass is not null and ip.inspection_item_subclass != '',
                  ip.inspection_item_subclass, ip.inspection_item) inspection_item_subclass FROM ins_product ip
        where ip.ins_sample_id = #{id}
    </select>
</mapper>