解决工时排序问题+考评bug调试

zss

2024-06-21 3547641f25634eec4b6dcf379080e92ed5025ee1

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

@@ -7,7 +7,6 @@
    <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.StandardProductList">
            <id property="id" column="id" jdbcType="INTEGER"/>
            <result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
            <result property="inspectionItemClassify" column="inspection_item_classify" jdbcType="VARCHAR"/>
            <result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
            <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
            <result property="unit" column="unit" jdbcType="VARCHAR"/>
@@ -30,18 +29,20 @@
    </resultMap>

    <select id="standardProductListIPage" resultType="com.yuanchu.mom.pojo.StandardProductList">
        select * from `center-lims`.standard_product_list
        select spl.* from `center-lims`.standard_product_list spl
        left join product p on spl.sample = p.name
        where standard_method_list_id = #{id}
        and tree like concat('%',#{tree},'%')
        <if test="laboratory != ''">
            and son_laboratory = #{laboratory}
        </if>
        <if test="item != ''">
            and inspection_item = #{item}
        <if test="insItem != ''">
            and inspection_item = #{insItem}
        </if>
        <if test="items != ''">
            and inspection_item_subclass = #{items}
        <if test="insItems != ''">
            and inspection_item_subclass = #{insItems}
        </if>
        order by p.id
    </select>
    <select id="getOne" resultType="com.yuanchu.mom.pojo.StandardProductList">
        select * from standard_product_list
@@ -53,8 +54,35 @@
        <if test="inspectionItemSubclass!=null">
            and inspection_item_subclass = #{inspectionItemSubclass}
        </if>
        <if test="inspectionItemSubclass == null">
            and (inspection_item_subclass is null or inspection_item_subclass = '')
        </if>
        <if test="model!=null">
            and model = #{model}
        </if>
    </select>
    <select id="selectDetail" resultType="com.yuanchu.mom.pojo.StandardProductList">
        select * from standard_product_list
        where standard_method_list_id = #{standardMethodListId}
        and state =#{state}
        and model=#{model}
        order by case when man_hour_group is NULL then 1
                      when man_hour_group ='' then 1  else 0 end,
                 CASE
                     WHEN man_hour_group REGEXP '^[0-9]' THEN CAST(man_hour_group AS UNSIGNED) -- 如果以数字开头，则按照数字大小排序
                     WHEN man_hour_group REGEXP '[0-9]+' THEN CAST(SUBSTRING(man_hour_group, 2)AS UNSIGNED) END -- 提取字母后面的数字部分
                ,id asc
    </select>
    <select id="selectDetail2" resultType="com.yuanchu.mom.pojo.StandardProductList">
        select * from standard_product_list
        where standard_method_list_id = #{standardMethodListId}
          and state =#{state}
          and tree=#{tree}
        order by case when man_hour_group is NULL then 1
                      when man_hour_group ='' then 1  else 0 end,
                 CASE
                     WHEN man_hour_group REGEXP '^[0-9]' THEN CAST(man_hour_group AS UNSIGNED) -- 如果以数字开头，则按照数字大小排序
                     WHEN man_hour_group REGEXP '[0-9]+' THEN CAST(SUBSTRING(man_hour_group, 2)AS UNSIGNED) END -- 提取字母后面的数字部分
                ,id asc
    </select>
</mapper>