admin/zhyc-sheep
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/feeding-management-20250801'

Browse Source
This commit is contained in:
HashMap
2025-08-26 12:02:50 +08:00
parent 84bc894668 ec79fcd9b4
commit fba29a69a1
7 changed files with 109 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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>

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

@@ -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">