fix(module/feed): 修复配料清单和饲喂量统计存在的逻辑错误

+ 修复了配料清单的分组逻辑错误:
    + 配料清单先将在原基础上再根据饲喂计划中的日期分组
    + 缓存与同步逻辑重写, 以适配新的分组逻辑
+ 修复了饲喂量统计的部分逻辑错误:
    + 解决了羊舍信息的SQL与Service层统计错误
    + 修改了缓存查询逻辑以适配新的清单缓存

zhyc-module/src/main/resources/mapper/feed/SgFeedListMapper.xml

@@ -24,6 +24,7 @@
             <if test="zookeeper != null  and zookeeper != ''"> and zookeeper = #{zookeeper}</if>
             <if test="deployDate != null "> and deploy_date = #{deployDate}</if>
         </where>
+        ORDER BY deploy_date ASC, formula_id ASC, formula_batch_id ASC
     </select>
 
     <select id="selectSgFeedListById" parameterType="Long" resultMap="SgFeedListResult">
@@ -68,4 +69,8 @@
             #{id}
         </foreach>
     </delete>
+
+    <delete id="deleteAll">
+        DELETE FROM sg_feed_list;
+    </delete>
 </mapper>

zhyc-module/src/main/resources/mapper/feed/SgFeedPlanMapper.xml

@@ -37,9 +37,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectSgFeedPlanVo"/>
         <where>  
             <if test="formulaId != null  and formulaId != ''"> and formula_id = #{formulaId}</if>
+            <if test="batchId != null  and batchId != ''"> and batch_id = #{batchId}</if>
             <if test="sheepHouseId != null "> and sheep_house_id = #{sheepHouseId}</if>
+            <if test="planDate != null "> and plan_date = #{planDate}</if>
         </where>
-        ORDER BY formula_id ASC, plan_date ASC
+        ORDER BY plan_date ASC, formula_id ASC , batch_id ASC
     </select>
     
     <select id="selectSgFeedPlanByCreateDate" parameterType="Date" resultMap="SgFeedPlanResult">