Merge remote-tracking branch 'origin/master'

wangfei

2024-11-20 0aacd330fca570ab3350aef5bda901f23aee23b3

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml

@@ -15,6 +15,7 @@
                        SUM(case task_state when 2 then 1 else 0 end) as real_count
                 from big_storage_cage_feed_task
                 where task_state in (1, 2)
                   and deleted = 0
                   and (target_slot = 0 or target_slot is null)
                 group by line
             ) t
@@ -33,8 +34,10 @@
                            ELSE HEIGHT
                            END MAX_LENGTH
                 FROM BIG_STORAGE_CAGE_FEED_TASK
                 WHERE LINE = 2002
                 WHERE LINE = #{line}
                   AND (target_slot = 0 or target_slot is null)
                   AND TASK_STATE IN (1, 2)
                   and deleted = 0
             ) T
    </select>