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

Merge remote-tracking branch 'zhyc/main'

Browse Source
This commit is contained in:
HashMap
2025-08-24 23:40:41 +08:00
parent 02d95fc51f 80d5e7b248
commit c0fe74aca3
50 changed files with 1669 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml
View File

@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="params.beginDatetime != null and params.beginDatetime != '' and params.endDatetime != null and params.endDatetime != ''"> and datetime between #{params.beginDatetime} and #{params.endDatetime}</if>
<if test="technical != null and technical != ''"> and technical = #{technical}</if>
</where>
ORDER BY datetime DESC
</select>
<select id="selectDewormById" parameterType="Long" resultMap="DewormResult">

1
zhyc-module/src/main/resources/mapper/biosafety/DiagnosisMapper.xml
View File

@@ -52,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="treatDay != null "> and treat_day = #{treatDay}</if>
<if test="sheepfoldId != null "> and sd.sheepfold_id = #{sheepfoldId}</if>
</where>
ORDER BY datetime DESC
</select>
<select id="selectDiagnosisById" parameterType="Long" resultMap="DiagnosisResult">

2
zhyc-module/src/main/resources/mapper/biosafety/DisinfectMapper.xml
View File

@@ -61,6 +61,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND sm.name like concat('%',#{mediName},'%')
)
</if>
ORDER BY datetime DESC
</select>
<select id="selectDisinfectById" parameterType="Long" resultMap="DisinfectResult">

1
zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml
View File

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="datetime != null "> and datetime = #{datetime}</if>
<if test="technical != null and technical != ''"> and technical = #{technical}</if>
</where>
ORDER BY datetime DESC
</select>
<select id="selectHealthById" parameterType="Long" resultMap="HealthResult">

1
zhyc-module/src/main/resources/mapper/biosafety/ImmunityMapper.xml
View File

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="params.beginDatetime != null and params.beginDatetime != '' and params.endDatetime != null and params.endDatetime != ''"> and datetime between #{params.beginDatetime} and #{params.endDatetime}</if>
<if test="technical != null and technical != ''"> and technical = #{technical}</if>
</where>
ORDER BY datetime DESC
</select>
<select id="selectImmunityById" parameterType="Long" resultMap="ImmunityResult">

1
zhyc-module/src/main/resources/mapper/biosafety/QuarantineReportMapper.xml
View File

@@ -68,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sw_quarantine_sample sqs on sqr.sample_type = sqs.id
left join sheep_file sf on sqr.sheep_id = sf.id
where sqr.id = #{id}
ORDER BY datetime DESC
</select>
<insert id="insertQuarantineReport" parameterType="java.util.List">

31
zhyc-module/src/main/resources/mapper/biosafety/SwMedicineUsageMapper.xml
View File

@@ -7,6 +7,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="SwMedicineUsage" id="SwMedicineUsageResult">
<result property="id" column="id" />
<result property="name" column="name" />
<result property="sheepfoldId" column="sheepfold_id"/>
<result property="sheepfoldName" column="sheepfold_name"/>
<result property="sheepId" column="sheep_id"/>
<result property="sheepNo" column="sheep_no"/>
<result property="datetime" column="datetime"/>
<result property="useType" column="use_type" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
@@ -26,12 +31,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="dosage" column="dosage" />
<result property="unit" column="unit" />
<result property="usageId" column="usageId" />
<result property="usetime" column="usetime" />
<result property="manufacturer" column="manufacturer" />
<result property="batchNumber" column="batch_number" />
</resultMap>
<sql id="selectSwMedicineUsageVo">
select id, name, use_type, update_by, update_time, create_by, create_time from sw_medicine_usage
select smu.id, sheepfold as sheepfold_id,sheep sheep_id,name, datetime,use_type, smu.update_by, smu.update_time, smu.create_by, smu.create_time,
ds.sheepfold_name,
bs.manage_tags sheep_no
from sw_medicine_usage smu
left join da_sheepfold ds on ds.id = smu.sheepfold
left join bas_sheep bs on bs.id = smu.sheep
</sql>
<select id="selectSwMedicineUsageList" parameterType="SwMedicineUsage" resultMap="SwMedicineUsageResult">
@@ -39,8 +50,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="useType != null and useType != ''"> and use_type = #{useType}</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
<if test="sheepNo != null and sheepNo != ''"> and bs.manage_tags like concat('%', #{sheepNo}, '%')</if>
<if test="params.beginUseTime != null and params.beginUseTime != '' and params.endUseTime != null and params.endUseTime != ''"> and smu.datetime between #{params.beginUseTime} and #{params.endUseTime}</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and smu.create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if> <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and smu.create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
</where>
ORDER BY datetime DESC
</select>
<select id="selectSwMedicineUsageById" parameterType="Integer" resultMap="SwMedicineUsageSwMedicineUsageDetailsResult">
@@ -50,11 +64,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectSwMedicineUsageDetailsList" resultMap="SwMedicineUsageDetailsResult">
select smud.id, medi_usage, medi_id, dosage, unit, usageId, manufacturer, batch_number,
select smud.id, medi_usage, medi_id, dosage, unit, usageId,usetime, manufacturer, batch_number,
sm.name
from sw_medicine_usage_details smud
join sw_medicine sm on smud.medi_id = sm.id
where medi_usage = #{medi_usage}
</select>
<insert id="insertSwMedicineUsage" parameterType="SwMedicineUsage" useGeneratedKeys="true" keyProperty="id">
@@ -62,6 +77,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="name != null">name,</if>
<if test="useType != null">use_type,</if>
<if test="sheepfoldId != null">sheepfold,</if>
<if test="sheepId != null">sheep,</if>
<if test="datetime != null">datetime,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="createBy != null">create_by,</if>
@@ -70,6 +88,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="name != null">#{name},</if>
<if test="useType != null">#{useType},</if>
<if test="sheepfoldId != null">#{sheepfoldId},</if>
<if test="sheepId != null">#{sheepId},</if>
<if test="datetime != null">#{datetime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="createBy != null">#{createBy},</if>
@@ -113,9 +134,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<insert id="batchSwMedicineUsageDetails">
insert into sw_medicine_usage_details( id, medi_usage, medi_id, dosage, unit, usageId, manufacturer, batch_number) values
insert into sw_medicine_usage_details( id, medi_usage, medi_id, dosage, unit, usageId,usetime, manufacturer, batch_number) values
<foreach item="item" index="index" collection="list" separator=",">
( #{item.id}, #{item.mediUsage}, #{item.mediId}, #{item.dosage}, #{item.unit}, #{item.usageId}, #{item.manufacturer}, #{item.batchNumber})
( #{item.id}, #{item.mediUsage}, #{item.mediId}, #{item.dosage}, #{item.unit}, #{item.usageId}, #{item.usetime},#{item.manufacturer}, #{item.batchNumber})
</foreach>
</insert>
</mapper>

15
zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml
View File

@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="diseasePName" column="disease_pname"/>
<result property="veterinary" column="veterinary" />
<result property="usageId" column="usage_id" />
<result property="status" column="status"/>
<result property="comment" column="comment" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
@@ -32,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTreatmentVo">
select t.id, diag_id, sheep_id, variety, sheep_type, month_age, t.gender, t.parity, breed, lact_day, gest_day, datetime, disease_id, disease_pid, veterinary, usage_id, t.comment, t.update_by, t.update_time, t.create_by, t.create_time,
select t.id, diag_id, sheep_id, variety, sheep_type, month_age, t.gender, t.parity, breed, lact_day, gest_day, datetime, disease_id, disease_pid, veterinary, usage_id,status, t.comment, t.update_by, t.update_time, t.create_by, t.create_time,
bs.manage_tags,
sd.name disease_name,
sd2.name disease_pname
@@ -48,14 +49,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sheepId != null "> and sheep_id = #{sheepId}</if>
<if test="params.beginDatetime != null and params.beginDatetime != '' and params.endDatetime != null and params.endDatetime != ''"> and datetime between #{params.beginDatetime} and #{params.endDatetime}</if>
<if test="diseaseId != null "> and disease_id = #{diseaseId}</if>
<if test="status != null and status !=''"> and status = #{status}</if>
<if test="veterinary != null and veterinary != ''"> and veterinary = #{veterinary}</if>
</where>
ORDER BY datetime DESC
</select>
<select id="selectTreatmentById" parameterType="Long" resultMap="TreatmentResult">
<include refid="selectTreatmentVo"/>
where t.id = #{id}
</select>
<select id="selectTreatmentStatus" resultMap="TreatmentResult">
select * from sw_treatment where sheep_id = #{sheepId} and status in (0, 1)
</select>
<insert id="insertTreatment" parameterType="Treatment" useGeneratedKeys="true" keyProperty="id">
insert into sw_treatment
@@ -75,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="diseasePid != null">disease_pid,</if>
<if test="veterinary != null">veterinary,</if>
<if test="usageId != null">usage_id,</if>
<if test="status != null">status,</if>
<if test="comment != null">comment,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
@@ -97,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="diseasePid != null">#{diseasePid},</if>
<if test="veterinary != null">#{veterinary},</if>
<if test="usageId != null">#{usageId},</if>
<if test="status != null">#{status},</if>
<if test="comment != null">#{comment},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
@@ -109,14 +117,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into sw_treatment
(diag_id, sheep_id, variety, sheep_type, month_age, gender,
parity, breed, lact_day, gest_day, datetime,
disease_id, disease_pid, veterinary, usage_id,
disease_id, disease_pid, veterinary, usage_id,status ,
comment, update_by, update_time, create_by, create_time)
values
<foreach collection="list" item="t" separator=",">
(#{t.diagId}, #{t.sheepId}, #{t.variety}, #{t.sheepType},
#{t.monthAge}, #{t.gender}, #{t.parity}, #{t.breed},
#{t.lactDay}, #{t.gestDay}, #{t.datetime}, #{t.diseaseId},
#{t.diseasePid}, #{t.veterinary},#{t.usageId}, #{t.comment},
#{t.diseasePid}, #{t.veterinary},#{t.usageId}, #{t.status}, #{t.comment},
#{t.updateBy}, #{t.updateTime},#{t.createBy}, #{t.createTime})
</foreach>
</insert>
@@ -139,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="diseasePid != null">disease_pid = #{diseasePid},</if>
<if test="veterinary != null">veterinary = #{veterinary},</if>
<if test="usageId != null">usage_id = #{usageId},</if>
<if test="status != null">status = #{status},</if>
<if test="comment != null">comment = #{comment},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>

155
zhyc-module/src/main/resources/mapper/miscarriage/ScMiscarriageRecordMapper.xml Normal file
View File

@@ -0,0 +1,155 @@
<?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.produce.breed.mapper.ScMiscarriageRecordMapper">
<resultMap type="ScMiscarriageRecord" id="ScMiscarriageRecordResult">
<result property="id" column="id" />
<result property="sheepId" column="sheep_id" />
<result property="datetime" column="datetime" />
<result property="comment" column="comment" />
<result property="technician" column="technician" />
<result property="reason" column="reason" />
<result property="exposeType" column="expose_type" />
<result property="status" column="status" />
<result property="miscaLamb" column="misca_lamb" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<!-- 关联查询字段 -->
<result property="bsManageTags" column="bs_manage_tags" />
<result property="variety" column="variety" />
<result property="matingTypeId" column="mating_type_id" />
<result property="matingTypeName" column="mating_type_name" />
<result property="matingDate" column="mating_date" />
<result property="parity" column="parity" />
<result property="ramVariety" column="ram_variety" />
<result property="monthAge" column="month_age" />
<result property="pregnantDays" column="pregnant_days" />
<result property="sheepfoldName" column="sheepfold_name" />
<result property="drRanch" column="dr_ranch" />
</resultMap>
<sql id="selectScMiscarriageRecordVo">
select
smr.id,
smr.sheep_id,
smr.datetime,
smr.comment,
smr.technician,
smr.reason,
smr.expose_type,
smr.status,
smr.misca_lamb,
smr.create_by,
smr.create_time,
sf.bs_manage_tags,
sf.variety,
sf.mating_type_id,
CASE sf.mating_type_id
WHEN 1 THEN '人工授精'
WHEN 2 THEN '自然配种'
WHEN 3 THEN '胚胎移植'
ELSE '未知'
END as mating_type_name,
sf.mating_date,
sf.parity,
sf.variety as ram_variety, -- 这里需要根据实际配种公羊信息调整
sf.month_age,
CASE
WHEN sf.mating_date IS NOT NULL AND smr.datetime IS NOT NULL
THEN DATEDIFF(smr.datetime, sf.mating_date)
ELSE NULL
END as pregnant_days,
sf.sheepfold_name,
sf.dr_ranch
from sc_miscarriage_record smr
left join sheep_file sf on smr.sheep_id = sf.bs_manage_tags
</sql>
<select id="selectScMiscarriageRecordList" parameterType="ScMiscarriageRecord" resultMap="ScMiscarriageRecordResult">
<include refid="selectScMiscarriageRecordVo"/>
<where>
<if test="sheepId != null and sheepId != ''"> and smr.sheep_id = #{sheepId}</if>
<if test="bsManageTags != null and bsManageTags != ''"> and sf.bs_manage_tags like concat('%', #{bsManageTags}, '%')</if>
<if test="datetime != null"> and smr.datetime = #{datetime}</if>
<if test="comment != null and comment != ''"> and smr.comment like concat('%', #{comment}, '%')</if>
<if test="technician != null and technician != ''"> and smr.technician like concat('%', #{technician}, '%')</if>
<if test="reason != null and reason != ''"> and smr.reason = #{reason}</if>
<if test="exposeType != null"> and smr.expose_type = #{exposeType}</if>
<if test="status != null"> and smr.status = #{status}</if>
<if test="miscaLamb != null"> and smr.misca_lamb = #{miscaLamb}</if>
<if test="variety != null and variety != ''"> and sf.variety like concat('%', #{variety}, '%')</if>
</where>
order by smr.create_time desc
</select>
<select id="selectScMiscarriageRecordById" parameterType="Long" resultMap="ScMiscarriageRecordResult">
<include refid="selectScMiscarriageRecordVo"/>
where smr.id = #{id}
</select>
<insert id="insertScMiscarriageRecord" parameterType="ScMiscarriageRecord" useGeneratedKeys="true" keyProperty="id">
insert into sc_miscarriage_record
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="sheepId != null">sheep_id,</if>
<if test="datetime != null">datetime,</if>
<if test="comment != null">comment,</if>
<if test="technician != null">technician,</if>
<if test="reason != null">reason,</if>
<if test="exposeType != null">expose_type,</if>
<if test="status != null">status,</if>
<if test="miscaLamb != null">misca_lamb,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sheepId != null">#{sheepId},</if>
<if test="datetime != null">#{datetime},</if>
<if test="comment != null">#{comment},</if>
<if test="technician != null">#{technician},</if>
<if test="reason != null">#{reason},</if>
<if test="exposeType != null">#{exposeType},</if>
<if test="status != null">#{status},</if>
<if test="miscaLamb != null">#{miscaLamb},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
</trim>
</insert>
<update id="updateScMiscarriageRecord" parameterType="ScMiscarriageRecord">
update sc_miscarriage_record
<trim prefix="SET" suffixOverrides=",">
<if test="sheepId != null">sheep_id = #{sheepId},</if>
<if test="datetime != null">datetime = #{datetime},</if>
<if test="comment != null">comment = #{comment},</if>
<if test="technician != null">technician = #{technician},</if>
<if test="reason != null">reason = #{reason},</if>
<if test="exposeType != null">expose_type = #{exposeType},</if>
<if test="status != null">status = #{status},</if>
<if test="miscaLamb != null">misca_lamb = #{miscaLamb},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteScMiscarriageRecordById" parameterType="Long">
delete from sc_miscarriage_record where id = #{id}
</delete>
<delete id="deleteScMiscarriageRecordByIds" parameterType="String">
delete from sc_miscarriage_record where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<!-- 根据耳号查询羊只信息 -->
<select id="selectSheepByManageTags" parameterType="String" resultType="map">
select bs_manage_tags, variety, parity, month_age, sheepfold_name, dr_ranch
from sheep_file
where bs_manage_tags = #{manageTags}
</select>
</mapper>

1
zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBodyMeasureMapper.xml
View File

@@ -102,6 +102,7 @@
and sm.create_time between #{params.beginCreateTime} and #{params.endCreateTime}
</if>
</where>
ORDER BY sm.create_time DESC
</select>
<select id="selectScBodyMeasureById" parameterType="Long" resultMap="ScBodyMeasureResult">

1
zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBodyScoreMapper.xml
View File

@@ -58,6 +58,7 @@
and bs.manage_tags like concat('%', #{manageTags}, '%')
</if>
</where>
ORDER BY sbs.create_time DESC
</select>
<select id="selectScBodyScoreById" parameterType="Long" resultMap="ScBodyScoreResult">

1
zhyc-module/src/main/resources/mapper/produce/bodyManage/ScBreastRatingMapper.xml
View File

@@ -56,6 +56,7 @@
and sbr.create_time between #{params.beginCreateTime} and #{params.endCreateTime}
</if>
</where>
ORDER BY sbr.create_time DESC
</select>
<select id="selectScBreastRatingById" parameterType="Long" resultMap="ScBreastRatingResult">

67
zhyc-module/src/main/resources/mapper/produce/breed/ScPregnancyRecordMapper.xml
View File

@@ -16,8 +16,6 @@
<result property="remark" column="remark" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="create_by" />
<result property="updateTime" column="create_time" />
<!-- 关联羊只信息字段 -->
<result property="variety" column="variety" />
<result property="monthAge" column="month_age" />
@@ -32,6 +30,7 @@
<result property="expectedDate" column="expected_date" />
<result property="lastEventDate" column="last_event_date" />
<result property="ranchName" column="ranch" />
<result property="daysAfterMating" column="days_after_mating" />
</resultMap>
<sql id="selectScPregnancyRecordVo">
@@ -46,8 +45,6 @@
pr.remark,
pr.create_by,
pr.create_time,
pr.create_by,
pr.create_time,
sf.bs_manage_tags as manage_tags,
sf.variety,
sf.month_age,
@@ -55,18 +52,37 @@
sf.mating_counts,
sf.sheepfold_name,
sf.breed,
sf.father_manage_tags,
father_sf.variety as father_variety,
mating_type.dict_label as mating_type_name,
sf.mating_date,
sf.expected_date,
sf.lambing_date as last_event_date,
r.ranch as ranch
sf.dr_ranch as ranch,
-- 关联配种信息
ram_sf.bs_manage_tags as father_manage_tags,
ram_sf.variety as father_variety,
mating_type.dict_label as mating_type_name,
COALESCE(br.create_time, sf.mating_date) as mating_date,
-- 计算配后天数：孕检日期 - 配种日期
CASE
WHEN COALESCE(br.create_time, sf.mating_date) IS NOT NULL
THEN DATEDIFF(pr.datetime, COALESCE(br.create_time, sf.mating_date))
ELSE NULL
END as days_after_mating
from sc_pregnancy_record pr
left join sheep_file sf on pr.sheep_id = sf.id
left join sys_dict_data mating_type on sf.mating_type_id = mating_type.dict_value and mating_type.dict_type = 'breed_type' and mating_type.status = '0'
left join da_ranch r on sf.ranch_id = r.id
left join sheep_file father_sf on sf.bs_father_id = father_sf.id
-- 关联配种记录表，获取最新的配种记录
left join (
select br1.*
from sc_breed_record br1
inner join (
select ewe_id, max(create_time) as max_time
from sc_breed_record
group by ewe_id
) br2 on br1.ewe_id = br2.ewe_id and br1.create_time = br2.max_time
) br on sf.id = br.ewe_id
-- 关联公羊信息
left join sheep_file ram_sf on br.ram_id = ram_sf.id
-- 关联配种类型字典
left join sys_dict_data mating_type on sf.mating_type_id = mating_type.dict_value
and mating_type.dict_type = 'breed_type' and mating_type.status = '0'
</sql>
<select id="selectScPregnancyRecordList" parameterType="ScPregnancyRecord" resultMap="ScPregnancyRecordResult">
@@ -86,7 +102,7 @@
</otherwise>
</choose>
</if>
<if test="datetime != null "> and pr.datetime = #{datetime}</if>
<if test="datetime != null "> and DATE(pr.datetime) = DATE(#{datetime})</if>
<if test="result != null and result != ''"> and pr.result = #{result}</if>
<if test="technician != null and technician != ''"> and pr.technician like concat('%', #{technician}, '%')</if>
<if test="way != null and way != ''"> and pr.way = #{way}</if>
@@ -116,6 +132,28 @@
limit 1
</select>
<!-- 根据耳号获取配种信息 -->
<select id="selectBreedInfoByManageTags" parameterType="String" resultType="map">
SELECT
sf.bs_manage_tags as manageTags,
-- 从配种记录表获取公羊耳号
ram_sf.bs_manage_tags as fatherManageTags,
ram_sf.variety as fatherVariety,
br.create_time as matingDate,
mating_type.dict_label as matingTypeName,
br.technician as breedTechnician,
br.create_time as breedCreateTime
FROM sheep_file sf
LEFT JOIN sc_breed_record br ON sf.id = br.ewe_id
LEFT JOIN sheep_file ram_sf ON br.ram_id = ram_sf.id
LEFT JOIN sys_dict_data mating_type ON sf.mating_type_id = mating_type.dict_value
AND mating_type.dict_type = 'breed_type' AND mating_type.status = '0'
WHERE sf.bs_manage_tags = #{manageTags}
AND sf.is_delete = 0
ORDER BY br.create_time DESC
LIMIT 1
</select>
<insert id="insertScPregnancyRecord" parameterType="ScPregnancyRecord" useGeneratedKeys="true" keyProperty="id">
insert into sc_pregnancy_record
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -153,8 +191,6 @@
<if test="technician != null">technician = #{technician},</if>
<if test="way != null">way = #{way},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="updateBy != null">create_by = #{updateBy},</if>
<if test="updateTime != null">create_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
@@ -178,7 +214,6 @@
<if test="breedStatusId != null">breed_status_id = #{breedStatusId},</if>
<if test="expectedDate != null">expected_date = #{expectedDate},</if>
<if test="gestationDay != null">gestation_day = #{gestationDay},</if>
create_time = now()
</set>
where id = #{sheepId}
</update>

34
zhyc-module/src/main/resources/mapper/produce/breed/ScSheepDeathMapper.xml
View File

@@ -44,6 +44,7 @@
<if test="comment != null and comment != ''"> and comment = #{comment}</if>
<if test="isDelete != null "> and is_delete = #{isDelete}</if>
</where>
order by create_time desc
</select>
<select id="selectScSheepDeathById" parameterType="Long" resultMap="ScSheepDeathResult">
@@ -53,9 +54,21 @@
<!-- 根据管理耳号查询sheep_file视图信息 -->
<select id="selectSheepFileByManageTags" parameterType="String" resultType="java.util.Map">
select id as sheepId, variety, name as sheepType, gender, day_age as dayAge, parity, sheepfold_name as sheepfoldName, breed as breedStatus, post_lambing_day as postLambingDay, lactation_day as lactationDay, gestation_day as gestationDay
select
id as sheepId,
variety,
name as sheepType,
gender,
day_age as dayAge,
parity,
sheepfold_name as sheepfoldName,
breed as breedStatus,
post_lambing_day as postLambingDay,
lactation_day as lactationDay,
gestation_day as gestationDay
from sheep_file
where bs_manage_tags = #{manageTags} and is_delete = 0
limit 1
</select>
<insert id="insertScSheepDeath" parameterType="ScSheepDeath" useGeneratedKeys="true" keyProperty="id">
@@ -131,4 +144,23 @@
#{id}
</foreach>
</delete>
<!-- 更新羊只繁育状态 - 保留原有功能 -->
<update id="updateSheepFileStatus">
UPDATE sheep_file
SET breed = #{status},
update_time = NOW()
WHERE id = #{sheepId}
AND is_delete = 0
</update>
<!-- 新增：更新羊只在群状态 -->
<update id="updateSheepStatus">
UPDATE sheep_file
SET status = #{status},
update_time = NOW()
WHERE id = #{sheepId}
AND is_delete = 0
</update>
</mapper>

1
zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeCommentMapper.xml
View File

@@ -49,6 +49,7 @@
and scc.create_time between #{params.beginCreateTime} and #{params.endCreateTime}
</if>
</where>
ORDER BY scc.create_time DESC
</select>
<select id="selectScChangeCommentById" parameterType="Long" resultMap="ScChangeCommentResult">

1
zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeEarMapper.xml
View File

@@ -61,6 +61,7 @@
and sce.create_time between #{params.beginCreateTime} and #{params.endCreateTime}
</if>
</where>
ORDER BY sce.create_time DESC
</select>
<select id="selectScChangeEarById" parameterType="Integer" resultMap="ScChangeEarResult">

1
zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScChangeVarietyMapper.xml
View File

@@ -52,6 +52,7 @@
and scv.create_time between #{params.beginCreateTime} and #{params.endCreateTime}
</if>
</where>
ORDER BY scv.create_time DESC
</select>
<select id="selectScChangeVarietyById" parameterType="Integer" resultMap="ScChangeVarietyResult">

1
zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransGroupMapper.xml
View File

@@ -71,6 +71,7 @@
and tg.create_time between #{params.beginCreateTime} and #{params.endCreateTime}
</if>
</where>
ORDER BY tg.create_time DESC
</select>

1
zhyc-module/src/main/resources/mapper/produce/manage_sheep/ScTransitionInfoMapper.xml
View File

@@ -67,6 +67,7 @@
and t.create_time between #{params.beginCreateTime} and #{params.endCreateTime}
</if>
</where>
ORDER BY t.create_time DESC
</select>
<select id="selectScTransitionInfoById" parameterType="Integer" resultMap="ScTransitionInfoResult">

1
zhyc-module/src/main/resources/mapper/produce/other/ScCastrateMapper.xml
View File

@@ -52,6 +52,7 @@
and sc.create_time between #{params.beginCreateTime} and #{params.endCreateTime}
</if>
</where>
ORDER BY sc.create_time DESC
</select>
<select id="selectScCastrateById" parameterType="Long" resultMap="ScCastrateResult">

1
zhyc-module/src/main/resources/mapper/produce/other/ScFixHoofMapper.xml
View File

@@ -48,6 +48,7 @@
and bs.manage_tags like concat('%', #{manageTags}, '%')
</if>
</where>
ORDER BY fh.create_time DESC
</select>
<select id="selectScFixHoofById" parameterType="java.lang.Integer" resultMap="ScFixHoofResult">