1.花材：下架状态分为OFF，FORCE-OFF

陶杰

2024-12-25 871ab4152005b728f614b8df34c4f9e11e861782

1.花材：下架状态分为OFF，FORCE-OFF

 src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml

@@ -125,9 +125,15 @@
            ))

        </if>
        <if test="dto.flowerStatus !=null and dto.flowerStatus !=''">
            AND  f.status = #{dto.flowerStatus}
        <if test="dto.flowerStatus != null and dto.flowerStatus != ''">
            <if test="dto.flowerStatus == 'OFF'">
                AND f.status IN ('OFF', 'FORCE_OFF')
            </if>
            <if test="dto.flowerStatus != 'OFF'">
                AND f.status = #{dto.flowerStatus}
            </if>
        </if>

        <if test="dto.flowerLevel !=null and dto.flowerLevel !=''">
            AND  f.`level` = #{dto.flowerLevel}
        </if>