Merge remote-tracking branch 'origin/master'

Crunchy

2024-04-23 4f986140a10e71c07c7001ccbcda6e93e17736b1

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

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


    <select id="selectItemParameterList" resultType="com.yuanchu.mom.pojo.StructureItemParameter">
        select id,
        inspection_item,
        inspection_item_en,
        inspection_item_classify,
        inspection_item_subclass,
        inspection_item_subclass_en,
        laboratory,
        unit,
        price,
@@ -29,11 +29,29 @@
        bsm,
        sample,
        inspection_value_type,
        dic,
        template_id,
        son_laboratory
        son_laboratory,
        ask,
        ask_tell
        from structure_item_parameter
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
    </select>

    <resultMap id="getInsProductions" type="map">
        <result property="name" column="inspection_item"/>
        <collection property="children" resultMap="seProInsListByIdmaps" javaType="List"/>
    </resultMap>
    <resultMap id="seProInsListByIdmaps" type="map">
        <id property="id" column="id"/>
        <result property="name" column="subclass"/>
    </resultMap>
    <select id="getInsProduction" resultMap="getInsProductions">
        select id, inspection_item,
               case when inspection_item_subclass='' then inspection_item
            else inspection_item_subclass end  as subclass
        from structure_item_parameter
    </select>
</mapper>