Merge branch 'dev'

zhaoxiaohao

2020-11-04 8ea75b6f027f18f6daf229e43928f78b49740f79

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ConsumptionRecordMapper.xml

@@ -60,4 +60,17 @@
        <include refid="where"/>
        order by id desc
    </select>
    <!--定义根据-ConsumptionRecord当作查询条件返回对象集合-->
    <select id="findDetailList" resultType="com.kidgrow.oprationcenter.model.ConsumptionRecord">
        SELECT * FROM `consumption_record`
        where record_type=1
        and update_time is null
            <if test="DetailList!=null and DetailList.size()>0">
                and pro_order_detail_id in
                <foreach item="item" index="index" collection="DetailList" open="(" close=")" separator=",">
                    #{item}
                </foreach>
            </if>
        order by id desc
    </select>
</mapper>