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-17 18:26:55 +08:00
parent f81cdcc18e 73468bf675
commit 98ae137a33
105 changed files with 139 additions and 2321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
zhyc-module/src/main/resources/mapper/feed/SgFeedDetailsMapper.xml
View File

@@ -1,66 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhyc.module.feed.mapper.SgFeedDetailsMapper">
<resultMap type="SgFeedDetails" id="SgFeedDetailsResult">
<result property="id" column="id" />
<result property="fodder" column="fodder" />
<result property="number" column="number" />
<result property="nuit" column="nuit" />
</resultMap>
<sql id="selectSgFeedDetailsVo">
select id, fodder, number, nuit from sg_feed_details
</sql>
<select id="selectSgFeedDetailsList" parameterType="SgFeedDetails" resultMap="SgFeedDetailsResult">
<include refid="selectSgFeedDetailsVo"/>
<where>
<if test="fodder != null and fodder != ''"> and fodder = #{fodder}</if>
<if test="number != null "> and number = #{number}</if>
<if test="nuit != null and nuit != ''"> and nuit = #{nuit}</if>
</where>
</select>
<select id="selectSgFeedDetailsById" parameterType="Long" resultMap="SgFeedDetailsResult">
<include refid="selectSgFeedDetailsVo"/>
where id = #{id}
</select>
<insert id="insertSgFeedDetails" parameterType="SgFeedDetails" useGeneratedKeys="true" keyProperty="id">
insert into sg_feed_details
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="fodder != null">fodder,</if>
<if test="number != null">number,</if>
<if test="nuit != null">nuit,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="fodder != null">#{fodder},</if>
<if test="number != null">#{number},</if>
<if test="nuit != null">#{nuit},</if>
</trim>
</insert>
<update id="updateSgFeedDetails" parameterType="SgFeedDetails">
update sg_feed_details
<trim prefix="SET" suffixOverrides=",">
<if test="fodder != null">fodder = #{fodder},</if>
<if test="number != null">number = #{number},</if>
<if test="nuit != null">nuit = #{nuit},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteSgFeedDetailsById" parameterType="Long">
delete from sg_feed_details where id = #{id}
</delete>
<delete id="deleteSgFeedDetailsByIds" parameterType="String">
delete from sg_feed_details where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

129
zhyc-module/src/main/resources/mapper/feed/SgFeedInfoMapper.xml
View File

@@ -1,129 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhyc.module.feed.mapper.SgFeedInfoMapper">
<resultMap type="SgFeedInfo" id="SgFeedInfoResult">
<result property="id" column="id" />
<result property="formulaId" column="formula_id" />
<result property="sheepfoldId" column="sheepfold_id" />
<result property="average" column="average" />
<result property="planMonring" column="plan_monring" />
<result property="actualMonring" column="actual_monring" />
<result property="planNoon" column="plan_noon" />
<result property="actualNoon" column="actual_noon" />
<result property="planEvenig" column="plan_evenig" />
<result property="actualEvening" column="actual_evening" />
<result property="particle" column="particle" />
<result property="other" column="other" />
<result property="replenish" column="replenish" />
<result property="planDate" column="plan_date" />
<result property="comment" column="comment" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
</resultMap>
<sql id="selectSgFeedInfoVo">
select id, formula_id, sheepfold_id, average, plan_monring, actual_monring, plan_noon, actual_noon, plan_evenig, actual_evening, particle, other, replenish, plan_date, comment, create_by, create_time from sg_feed_info
</sql>
<select id="selectSgFeedInfoList" parameterType="SgFeedInfo" resultMap="SgFeedInfoResult">
<include refid="selectSgFeedInfoVo"/>
<where>
<if test="formulaId != null "> and formula_id = #{formulaId}</if>
<if test="sheepfoldId != null and sheepfoldId != ''"> and sheepfold_id = #{sheepfoldId}</if>
<if test="average != null "> and average = #{average}</if>
<if test="planMonring != null "> and plan_monring = #{planMonring}</if>
<if test="actualMonring != null "> and actual_monring = #{actualMonring}</if>
<if test="planNoon != null "> and plan_noon = #{planNoon}</if>
<if test="actualNoon != null "> and actual_noon = #{actualNoon}</if>
<if test="planEvenig != null "> and plan_evenig = #{planEvenig}</if>
<if test="actualEvening != null "> and actual_evening = #{actualEvening}</if>
<if test="particle != null "> and particle = #{particle}</if>
<if test="other != null "> and other = #{other}</if>
<if test="replenish != null "> and replenish = #{replenish}</if>
<if test="planDate != null "> and plan_date = #{planDate}</if>
<if test="comment != null and comment != ''"> and comment = #{comment}</if>
</where>
</select>
<select id="selectSgFeedInfoById" parameterType="Long" resultMap="SgFeedInfoResult">
<include refid="selectSgFeedInfoVo"/>
where id = #{id}
</select>
<insert id="insertSgFeedInfo" parameterType="SgFeedInfo" useGeneratedKeys="true" keyProperty="id">
insert into sg_feed_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="formulaId != null">formula_id,</if>
<if test="sheepfoldId != null">sheepfold_id,</if>
<if test="average != null">average,</if>
<if test="planMonring != null">plan_monring,</if>
<if test="actualMonring != null">actual_monring,</if>
<if test="planNoon != null">plan_noon,</if>
<if test="actualNoon != null">actual_noon,</if>
<if test="planEvenig != null">plan_evenig,</if>
<if test="actualEvening != null">actual_evening,</if>
<if test="particle != null">particle,</if>
<if test="other != null">other,</if>
<if test="replenish != null">replenish,</if>
<if test="planDate != null">plan_date,</if>
<if test="comment != null">comment,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="formulaId != null">#{formulaId},</if>
<if test="sheepfoldId != null">#{sheepfoldId},</if>
<if test="average != null">#{average},</if>
<if test="planMonring != null">#{planMonring},</if>
<if test="actualMonring != null">#{actualMonring},</if>
<if test="planNoon != null">#{planNoon},</if>
<if test="actualNoon != null">#{actualNoon},</if>
<if test="planEvenig != null">#{planEvenig},</if>
<if test="actualEvening != null">#{actualEvening},</if>
<if test="particle != null">#{particle},</if>
<if test="other != null">#{other},</if>
<if test="replenish != null">#{replenish},</if>
<if test="planDate != null">#{planDate},</if>
<if test="comment != null">#{comment},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
</trim>
</insert>
<update id="updateSgFeedInfo" parameterType="SgFeedInfo">
update sg_feed_info
<trim prefix="SET" suffixOverrides=",">
<if test="formulaId != null">formula_id = #{formulaId},</if>
<if test="sheepfoldId != null">sheepfold_id = #{sheepfoldId},</if>
<if test="average != null">average = #{average},</if>
<if test="planMonring != null">plan_monring = #{planMonring},</if>
<if test="actualMonring != null">actual_monring = #{actualMonring},</if>
<if test="planNoon != null">plan_noon = #{planNoon},</if>
<if test="actualNoon != null">actual_noon = #{actualNoon},</if>
<if test="planEvenig != null">plan_evenig = #{planEvenig},</if>
<if test="actualEvening != null">actual_evening = #{actualEvening},</if>
<if test="particle != null">particle = #{particle},</if>
<if test="other != null">other = #{other},</if>
<if test="replenish != null">replenish = #{replenish},</if>
<if test="planDate != null">plan_date = #{planDate},</if>
<if test="comment != null">comment = #{comment},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteSgFeedInfoById" parameterType="Long">
delete from sg_feed_info where id = #{id}
</delete>
<delete id="deleteSgFeedInfoByIds" parameterType="String">
delete from sg_feed_info where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

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

@@ -7,21 +7,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="SgFeedPlan" id="SgFeedPlanResult">
<result property="createDate" column="create_date" />
<result property="formulaId" column="formula_id" />
<result property="batchId" column="batch_id" />
<result property="sheepHouseId" column="sheep_house_id" />
<result property="sheepCount" column="sheep_count" />
<result property="planDailySize" column="plan_daily_size" />
<result property="ratioMorning" column="ratio_morning" />
<result property="ratioNoon" column="ratio_noon" />
<result property="ratioAfternoon" column="ratio_afternoon" />
<result property="planMorningSize" column="plan_morning_size" />
<result property="planMorningTotal" column="plan_morning_total" />
<result property="ratioMorning" column="ratio_morning" />
<result property="actualMorningSize" column="actual_morning_size" />
<result property="planNoonSize" column="plan_noon_size" />
<result property="planNoonTotal" column="plan_noon_total" />
<result property="actualNoonSize" column="actual_noon_size" />
<result property="ratioNoon" column="ratio_noon" />
<result property="planAfternoonSize" column="plan_afternoon_size" />
<result property="planAfternoonTotal" column="plan_afternoon_total" />
<result property="actualAfternoonSize" column="actual_afternoon_size" />
<result property="ratioAfternoon" column="ratio_afternoon" />
<result property="planFeedTotal" column="plan_feed_total" />
<result property="zookeeper" column="zookeeper" />
<result property="planDate" column="plan_date" />
@@ -29,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectSgFeedPlanVo">
select create_date, formula_id, sheep_house_id, sheep_count, plan_daily_size, plan_morning_size, plan_morning_total, ratio_morning, actual_morning_size, plan_noon_size, plan_noon_total, actual_noon_size, ratio_noon, plan_afternoon_size, plan_afternoon_total, actual_afternoon_size, ratio_afternoon, plan_feed_total, zookeeper, plan_date, remark from sg_feed_plan
select create_date, formula_id, batch_id, sheep_house_id, sheep_count, plan_daily_size, ratio_morning, ratio_noon, ratio_afternoon, plan_morning_size, plan_morning_total, actual_morning_size, plan_noon_size, plan_noon_total, actual_noon_size, plan_afternoon_size, plan_afternoon_total, actual_afternoon_size, plan_feed_total, zookeeper, plan_date, remark from sg_feed_plan
</sql>
<select id="selectSgFeedPlanList" parameterType="SgFeedPlan" resultMap="SgFeedPlanResult">
@@ -37,9 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="formulaId != null and formulaId != ''"> and formula_id = #{formulaId}</if>
<if test="sheepHouseId != null "> and sheep_house_id = #{sheepHouseId}</if>
<if test="zookeeper != null and zookeeper != ''"> and zookeeper = #{zookeeper}</if>
<if test="planDate != null "> and plan_date = #{planDate}</if>
</where>
ORDER BY formula_id ASC, plan_date ASC
</select>
<select id="selectSgFeedPlanByCreateDate" parameterType="Date" resultMap="SgFeedPlanResult">
@@ -52,21 +52,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="createDate != null">create_date,</if>
<if test="formulaId != null and formulaId != ''">formula_id,</if>
<if test="batchId != null and batchId != ''">batch_id,</if>
<if test="sheepHouseId != null">sheep_house_id,</if>
<if test="sheepCount != null">sheep_count,</if>
<if test="planDailySize != null">plan_daily_size,</if>
<if test="ratioMorning != null">ratio_morning,</if>
<if test="ratioNoon != null">ratio_noon,</if>
<if test="ratioAfternoon != null">ratio_afternoon,</if>
<if test="planMorningSize != null">plan_morning_size,</if>
<if test="planMorningTotal != null">plan_morning_total,</if>
<if test="ratioMorning != null">ratio_morning,</if>
<if test="actualMorningSize != null">actual_morning_size,</if>
<if test="planNoonSize != null">plan_noon_size,</if>
<if test="planNoonTotal != null">plan_noon_total,</if>
<if test="actualNoonSize != null">actual_noon_size,</if>
<if test="ratioNoon != null">ratio_noon,</if>
<if test="planAfternoonSize != null">plan_afternoon_size,</if>
<if test="planAfternoonTotal != null">plan_afternoon_total,</if>
<if test="actualAfternoonSize != null">actual_afternoon_size,</if>
<if test="ratioAfternoon != null">ratio_afternoon,</if>
<if test="planFeedTotal != null">plan_feed_total,</if>
<if test="zookeeper != null">zookeeper,</if>
<if test="planDate != null">plan_date,</if>
@@ -75,21 +76,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="createDate != null">#{createDate},</if>
<if test="formulaId != null and formulaId != ''">#{formulaId},</if>
<if test="batchId != null and batchId != ''">#{batchId},</if>
<if test="sheepHouseId != null">#{sheepHouseId},</if>
<if test="sheepCount != null">#{sheepCount},</if>
<if test="planDailySize != null">#{planDailySize},</if>
<if test="ratioMorning != null">#{ratioMorning},</if>
<if test="ratioNoon != null">#{ratioNoon},</if>
<if test="ratioAfternoon != null">#{ratioAfternoon},</if>
<if test="planMorningSize != null">#{planMorningSize},</if>
<if test="planMorningTotal != null">#{planMorningTotal},</if>
<if test="ratioMorning != null">#{ratioMorning},</if>
<if test="actualMorningSize != null">#{actualMorningSize},</if>
<if test="planNoonSize != null">#{planNoonSize},</if>
<if test="planNoonTotal != null">#{planNoonTotal},</if>
<if test="actualNoonSize != null">#{actualNoonSize},</if>
<if test="ratioNoon != null">#{ratioNoon},</if>
<if test="planAfternoonSize != null">#{planAfternoonSize},</if>
<if test="planAfternoonTotal != null">#{planAfternoonTotal},</if>
<if test="actualAfternoonSize != null">#{actualAfternoonSize},</if>
<if test="ratioAfternoon != null">#{ratioAfternoon},</if>
<if test="planFeedTotal != null">#{planFeedTotal},</if>
<if test="zookeeper != null">#{zookeeper},</if>
<if test="planDate != null">#{planDate},</if>
@@ -101,21 +103,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update sg_feed_plan
<trim prefix="SET" suffixOverrides=",">
<if test="formulaId != null and formulaId != ''">formula_id = #{formulaId},</if>
<if test="batchId != null and batchId != ''">batch_id = #{batchId},</if>
<if test="sheepHouseId != null">sheep_house_id = #{sheepHouseId},</if>
<if test="sheepCount != null">sheep_count = #{sheepCount},</if>
<if test="planDailySize != null">plan_daily_size = #{planDailySize},</if>
<if test="ratioMorning != null">ratio_morning = #{ratioMorning},</if>
<if test="ratioNoon != null">ratio_noon = #{ratioNoon},</if>
<if test="ratioAfternoon != null">ratio_afternoon = #{ratioAfternoon},</if>
<if test="planMorningSize != null">plan_morning_size = #{planMorningSize},</if>
<if test="planMorningTotal != null">plan_morning_total = #{planMorningTotal},</if>
<if test="ratioMorning != null">ratio_morning = #{ratioMorning},</if>
<if test="actualMorningSize != null">actual_morning_size = #{actualMorningSize},</if>
<if test="planNoonSize != null">plan_noon_size = #{planNoonSize},</if>
<if test="planNoonTotal != null">plan_noon_total = #{planNoonTotal},</if>
<if test="actualNoonSize != null">actual_noon_size = #{actualNoonSize},</if>
<if test="ratioNoon != null">ratio_noon = #{ratioNoon},</if>
<if test="planAfternoonSize != null">plan_afternoon_size = #{planAfternoonSize},</if>
<if test="planAfternoonTotal != null">plan_afternoon_total = #{planAfternoonTotal},</if>
<if test="actualAfternoonSize != null">actual_afternoon_size = #{actualAfternoonSize},</if>
<if test="ratioAfternoon != null">ratio_afternoon = #{ratioAfternoon},</if>
<if test="planFeedTotal != null">plan_feed_total = #{planFeedTotal},</if>
<if test="zookeeper != null">zookeeper = #{zookeeper},</if>
<if test="planDate != null">plan_date = #{planDate},</if>
@@ -134,4 +137,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{createDate}
</foreach>
</delete>
<select id="selectSheepCountByFoldId" parameterType="Integer">
SELECT COUNT(*)
FROM bas_sheep
WHERE sheepfold_id = #{foldId}
</select>
</mapper>

66
zhyc-module/src/main/resources/mapper/feed/SgFeedRatioMapper.xml
View File

@@ -1,66 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhyc.module.feed.mapper.SgFeedRatioMapper">
<resultMap type="SgFeedRatio" id="SgFeedRatioResult">
<result property="id" column="id" />
<result property="morning" column="morning" />
<result property="noon" column="noon" />
<result property="evening" column="evening" />
</resultMap>
<sql id="selectSgFeedRatioVo">
select id, morning, noon, evening from sg_feed_ratio
</sql>
<select id="selectSgFeedRatioList" parameterType="SgFeedRatio" resultMap="SgFeedRatioResult">
<include refid="selectSgFeedRatioVo"/>
<where>
<if test="morning != null and morning != ''"> and morning = #{morning}</if>
<if test="noon != null and noon != ''"> and noon = #{noon}</if>
<if test="evening != null and evening != ''"> and evening = #{evening}</if>
</where>
</select>
<select id="selectSgFeedRatioById" parameterType="Long" resultMap="SgFeedRatioResult">
<include refid="selectSgFeedRatioVo"/>
where id = #{id}
</select>
<insert id="insertSgFeedRatio" parameterType="SgFeedRatio" useGeneratedKeys="true" keyProperty="id">
insert into sg_feed_ratio
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="morning != null">morning,</if>
<if test="noon != null">noon,</if>
<if test="evening != null">evening,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="morning != null">#{morning},</if>
<if test="noon != null">#{noon},</if>
<if test="evening != null">#{evening},</if>
</trim>
</insert>
<update id="updateSgFeedRatio" parameterType="SgFeedRatio">
update sg_feed_ratio
<trim prefix="SET" suffixOverrides=",">
<if test="morning != null">morning = #{morning},</if>
<if test="noon != null">noon = #{noon},</if>
<if test="evening != null">evening = #{evening},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteSgFeedRatioById" parameterType="Long">
delete from sg_feed_ratio where id = #{id}
</delete>
<delete id="deleteSgFeedRatioByIds" parameterType="String">
delete from sg_feed_ratio where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

61
zhyc-module/src/main/resources/mapper/feed/SgFodderMapper.xml
View File

@@ -1,61 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhyc.module.feed.mapper.SgFodderMapper">
<resultMap type="SgFodder" id="SgFodderResult">
<result property="id" column="id" />
<result property="name" column="name" />
<result property="fodderType" column="fodder_type" />
</resultMap>
<sql id="selectSgFodderVo">
select id, name, fodder_type from sg_fodder
</sql>
<select id="selectSgFodderList" parameterType="SgFodder" resultMap="SgFodderResult">
<include refid="selectSgFodderVo"/>
<where>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="fodderType != null "> and fodder_type = #{fodderType}</if>
</where>
</select>
<select id="selectSgFodderById" parameterType="Long" resultMap="SgFodderResult">
<include refid="selectSgFodderVo"/>
where id = #{id}
</select>
<insert id="insertSgFodder" parameterType="SgFodder" useGeneratedKeys="true" keyProperty="id">
insert into sg_fodder
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="name != null">name,</if>
<if test="fodderType != null">fodder_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="name != null">#{name},</if>
<if test="fodderType != null">#{fodderType},</if>
</trim>
</insert>
<update id="updateSgFodder" parameterType="SgFodder">
update sg_fodder
<trim prefix="SET" suffixOverrides=",">
<if test="name != null">name = #{name},</if>
<if test="fodderType != null">fodder_type = #{fodderType},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteSgFodderById" parameterType="Long">
delete from sg_fodder where id = #{id}
</delete>
<delete id="deleteSgFodderByIds" parameterType="String">
delete from sg_fodder where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>