数采bug调整

Crunchy

2024-07-24 21dedbb10f307260ac6fd77b826fc9158160c2bb

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

@@ -3,7 +3,6 @@
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.DeviceMapper">

    <select id="selectDeviceParameter" resultType="com.yuanchu.mom.pojo.Device">
        select * from(
        select id,
@@ -118,9 +117,10 @@
        </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
    <select id="getInspectionItemSubclass" resultType="map">
        SELECT ip.inspection_item, 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>