Merge remote-tracking branch 'origin/main'

This commit is contained in:
wyt
2025-12-11 10:53:34 +08:00
19 changed files with 1280 additions and 39 deletions

View File

@@ -0,0 +1,125 @@
<?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.app.mapper.AppVersionMapper">
<resultMap type="AppVersion" id="AppVersionResult">
<result property="id" column="id" />
<result property="platform" column="platform" />
<result property="versionCode" column="version_code" />
<result property="versionName" column="version_name" />
<result property="isForceUpdate" column="is_force_update" />
<result property="isLatest" column="is_latest" />
<result property="minVersionCode" column="min_version_code" />
<result property="downloadUrl" column="download_url" />
<result property="updateTitle" column="update_title" />
<result property="updateContent" column="update_content" />
<result property="fileSize" column="file_size" />
<result property="md5Hash" column="md5_hash" />
<result property="publishTime" column="publish_time" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
<result property="isDeleted" column="is_deleted" />
</resultMap>
<sql id="selectAppVersionVo">
select id, platform, version_code, version_name, is_force_update, is_latest, min_version_code, download_url, update_title, update_content, file_size, md5_hash, publish_time, create_time, update_time, is_deleted from app_version
</sql>
<select id="selectAppVersionList" parameterType="AppVersion" resultMap="AppVersionResult">
<include refid="selectAppVersionVo"/>
<where>
<if test="id != null "> and id = #{id}</if>
<if test="platform != null and platform != ''"> and platform = #{platform}</if>
<if test="versionCode != null "> and version_code = #{versionCode}</if>
<if test="versionName != null and versionName != ''"> and version_name like concat('%', #{versionName}, '%')</if>
<if test="isForceUpdate != null "> and is_force_update = #{isForceUpdate}</if>
<if test="isLatest != null "> and is_latest = #{isLatest}</if>
<if test="minVersionCode != null "> and min_version_code = #{minVersionCode}</if>
<if test="downloadUrl != null and downloadUrl != ''"> and download_url = #{downloadUrl}</if>
<if test="updateTitle != null and updateTitle != ''"> and update_title = #{updateTitle}</if>
<if test="updateContent != null and updateContent != ''"> and update_content = #{updateContent}</if>
<if test="fileSize != null "> and file_size = #{fileSize}</if>
<if test="params.beginMd5Hash != null and params.beginMd5Hash != '' and params.endMd5Hash != null and params.endMd5Hash != ''"> and md5_hash between #{params.beginMd5Hash} and #{params.endMd5Hash}</if>
<if test="params.beginPublishTime != null and params.beginPublishTime != '' and params.endPublishTime != null and params.endPublishTime != ''"> and publish_time between #{params.beginPublishTime} and #{params.endPublishTime}</if>
<if test="isDeleted != null "> and is_deleted = #{isDeleted}</if>
</where>
</select>
<select id="selectAppVersionById" parameterType="Long" resultMap="AppVersionResult">
<include refid="selectAppVersionVo"/>
where id = #{id}
</select>
<insert id="insertAppVersion" parameterType="AppVersion" useGeneratedKeys="true" keyProperty="id">
insert into app_version
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="platform != null">platform,</if>
<if test="versionCode != null">version_code,</if>
<if test="versionName != null">version_name,</if>
<if test="isForceUpdate != null">is_force_update,</if>
<if test="isLatest != null">is_latest,</if>
<if test="minVersionCode != null">min_version_code,</if>
<if test="downloadUrl != null">download_url,</if>
<if test="updateTitle != null">update_title,</if>
<if test="updateContent != null">update_content,</if>
<if test="fileSize != null">file_size,</if>
<if test="md5Hash != null">md5_hash,</if>
<if test="publishTime != null">publish_time,</if>
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
<if test="isDeleted != null">is_deleted,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="platform != null">#{platform},</if>
<if test="versionCode != null">#{versionCode},</if>
<if test="versionName != null">#{versionName},</if>
<if test="isForceUpdate != null">#{isForceUpdate},</if>
<if test="isLatest != null">#{isLatest},</if>
<if test="minVersionCode != null">#{minVersionCode},</if>
<if test="downloadUrl != null">#{downloadUrl},</if>
<if test="updateTitle != null">#{updateTitle},</if>
<if test="updateContent != null">#{updateContent},</if>
<if test="fileSize != null">#{fileSize},</if>
<if test="md5Hash != null">#{md5Hash},</if>
<if test="publishTime != null">#{publishTime},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="isDeleted != null">#{isDeleted},</if>
</trim>
</insert>
<update id="updateAppVersion" parameterType="AppVersion">
update app_version
<trim prefix="SET" suffixOverrides=",">
<if test="platform != null">platform = #{platform},</if>
<if test="versionCode != null">version_code = #{versionCode},</if>
<if test="versionName != null">version_name = #{versionName},</if>
<if test="isForceUpdate != null">is_force_update = #{isForceUpdate},</if>
<if test="isLatest != null">is_latest = #{isLatest},</if>
<if test="minVersionCode != null">min_version_code = #{minVersionCode},</if>
<if test="downloadUrl != null">download_url = #{downloadUrl},</if>
<if test="updateTitle != null">update_title = #{updateTitle},</if>
<if test="updateContent != null">update_content = #{updateContent},</if>
<if test="fileSize != null">file_size = #{fileSize},</if>
<if test="md5Hash != null">md5_hash = #{md5Hash},</if>
<if test="publishTime != null">publish_time = #{publishTime},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="isDeleted != null">is_deleted = #{isDeleted},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteAppVersionById" parameterType="Long">
delete from app_version where id = #{id}
</delete>
<delete id="deleteAppVersionByIds" parameterType="String">
delete from app_version where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

View File

@@ -59,8 +59,10 @@
<if test="code != null and code != ''">and code like concat('%', #{code}, '%')</if>
<if test="grade != null and grade != ''">and grade = #{grade}</if>
<if test="status != null and status != ''">and status = #{status}</if>
<if test="tech != null and tech != ''">and tech = #{tech}</if>
<if test="outDate != null "> and out_date = #{outDate}</if>
<if test="tech != null and tech != ''">
AND tech LIKE CONCAT('%', #{tech}, '%')
</if>
<if test="outDate != null ">and out_date = #{outDate}</if>
<if test="params.beginFreezeDate != null and params.endFreezeDate != null">
and freeze_date between #{params.beginFreezeDate} and #{params.endFreezeDate}
</if>
@@ -164,23 +166,26 @@
</delete>
<select id="selectFlushByEwe" resultType="map">
SELECT grade_a gradeA,
grade_b gradeB,
grade_c gradeC,
grade_d gradeD,
cell_2_4 cell24,
cell_8 cell8,
donor_male_no ramId
SELECT grade_a gradeA,
grade_b gradeB,
grade_c gradeC,
grade_d gradeD,
cell_2_4 cell24,
cell_8 cell8,
donor_male_no ramId
FROM sc_embryo_flush
WHERE donor_female_no = #{eweNo}
ORDER BY flush_time DESC
LIMIT 1
ORDER BY flush_time DESC LIMIT 1
</select>
<update id="updateDiscard" parameterType="DdFe">
UPDATE dd_fe
SET status = #{status},
SET status = #{status},
discard_txt = #{discardTxt}
WHERE id = #{id}
</update>
<select id="existsByCode" resultType="int">
SELECT COUNT(*) FROM dd_fe WHERE code = #{code}
</select>
</mapper>

View File

@@ -0,0 +1,184 @@
<?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.work.mapper.WorkOrderMapper">
<resultMap type="WorkOrder" id="WorkOrderResult">
<result property="id" column="id" />
<result property="orderNo" column="order_no" />
<result property="planId" column="plan_id" />
<result property="bizType" column="biz_type" />
<result property="title" column="title" />
<result property="content" column="content" />
<result property="department" column="department" />
<result property="executorIds" column="executor_ids" />
<result property="executor" column="executor" />
<result property="executeDate" column="execute_date" />
<result property="executeTime" column="execute_time" />
<result property="sheepScope" column="sheep_scope" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" />
<result property="location" column="location" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" />
<result property="materialList" column="material_list" />
<result property="toolList" column="tool_list" />
<result property="status" column="status" />
<result property="priority" column="priority" />
<result property="issuerId" column="issuer_id" />
<result property="issuer" column="issuer" />
<result property="issueTime" column="issue_time" />
<result property="receiverId" column="receiver_id" />
<result property="receiver" column="receiver" />
<result property="receiveTime" column="receive_time" />
<result property="finishTime" column="finish_time" />
<result property="result" column="result" />
<result property="remark" column="remark" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
<result property="deleted" column="deleted" />
</resultMap>
<sql id="selectWorkOrderVo">
select id, order_no, plan_id, biz_type, title, content, department, executor_ids,executor, execute_date, execute_time, sheep_scope, location, material_list, tool_list, status, priority, issuer_id, issuer,issue_time, receiver_id, receiver,receive_time, finish_time, result, remark, create_time, update_time, deleted from work_order
</sql>
<select id="selectWorkOrderList" parameterType="WorkOrder" resultMap="WorkOrderResult">
<include refid="selectWorkOrderVo"/>
<where>
<if test="orderNo != null and orderNo != ''"> and order_no like concat('%', #{orderNo}, '%')</if>
<if test="planId != null "> and plan_id = #{planId}</if>
<if test="bizType != null "> and biz_type = #{bizType}</if>
<if test="title != null and title != ''"> and title like coucat('%', #{title},'%')</if>
<if test="content != null and content != ''"> and content = #{content}</if>
<if test="department != null and department != ''"> and department = #{department}</if>
<if test="executor != null and executor != ''"> and executor like coucat('%',#{executor},'%') </if>
<if test="params.beginPlanDate != null and params.beginPlanDate != '' and params.endPlanDat != null and params.endPlanDate != ''"> and execute_date between #{params.beginPlanDate} and #{params.endPlanDate}</if>
<if test="executeTime != null and executeTime != ''"> and execute_time = #{executeTime}</if>
<if test="sheepScope != null and sheepScope != ''"> and sheep_scope = #{sheepScope}</if>
<if test="location != null and location != ''"> and location = #{location}</if>
<if test="materialList != null and materialList != ''"> and material_list = #{materialList}</if>
<if test="toolList != null and toolList != ''"> and tool_list = #{toolList}</if>
<if test="status != null "> and status = #{status}</if>
<if test="priority != null "> and priority = #{priority}</if>
<if test="issuer != null "> and issuer like concat('%',#{issuer},'%') </if>
<if test="issueTime != null "> and issue_time = #{issueTime}</if>
<if test="receiverId != null "> and receiver_id = #{receiverId}</if>
<if test="receiveTime != null "> and receive_time = #{receiveTime}</if>
<if test="params.beginDatetime != null and params.beginDatetime != '' and params.endFinishDate != null and params.endFinishDate != ''"> and finish_time between #{params.beginFinishDate} and #{params.endFinishDate}</if>
<if test="result != null and result != ''"> and result = #{result}</if>
</where>
</select>
<select id="selectWorkOrderById" parameterType="Long" resultMap="WorkOrderResult">
<include refid="selectWorkOrderVo"/>
where id = #{id}
</select>
<insert id="insertWorkOrder" parameterType="WorkOrder" useGeneratedKeys="true" keyProperty="id">
insert into work_order
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="orderNo != null and orderNo != ''">order_no,</if>
<if test="planId != null">plan_id,</if>
<if test="bizType != null">biz_type,</if>
<if test="title != null and title != ''">title,</if>
<if test="content != null">content,</if>
<if test="department != null and department != ''">department,</if>
<if test="executorIds != null and executorIds != ''">executor_ids,</if>
<if test="executor != null and executor != ''">executor,</if>
<if test="executeDate != null">execute_date,</if>
<if test="executeTime != null">execute_time,</if>
<if test="sheepScope != null and sheepScope != ''">sheep_scope,</if>
<if test="location != null">location,</if>
<if test="materialList != null">material_list,</if>
<if test="toolList != null">tool_list,</if>
<if test="status != null">status,</if>
<if test="priority != null">priority,</if>
<if test="issuerId != null">issuer_id,</if>
<if test="issuer != null">issuer,</if>
<if test="issueTime != null">issue_time,</if>
<if test="receiverId != null">receiver_id,</if>
<if test="receiver != null">receiver,</if>
<if test="receiveTime != null">receive_time,</if>
<if test="finishTime != null">finish_time,</if>
<if test="result != null">`result`,</if>
<if test="remark != null">remark,</if>
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
<if test="deleted != null">deleted,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderNo != null and orderNo != ''">#{orderNo},</if>
<if test="planId != null">#{planId},</if>
<if test="bizType != null">#{bizType},</if>
<if test="title != null and title != ''">#{title},</if>
<if test="content != null">#{content},</if>
<if test="department != null and department != ''">#{department},</if>
<if test="executorIds != null and executorIds != ''">#{executorIds},</if>
<if test="executor != null and executor != ''">#{executor},</if>
<if test="executeDate != null">#{executeDate},</if>
<if test="executeTime != null">#{executeTime},</if>
<if test="sheepScope != null and sheepScope != ''">#{sheepScope,typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},</if>
<if test="location != null">#{location,typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},</if>
<if test="materialList != null">#{materialList},</if>
<if test="toolList != null">#{toolList},</if>
<if test="status != null">#{status},</if>
<if test="priority != null">#{priority},</if>
<if test="issuerId != null">#{issuerId},</if>
<if test="issuer != null">#{issuer},</if>
<if test="issueTime != null">#{issueTime},</if>
<if test="receiverId != null">#{receiverId},</if>
<if test="receiver != null">#{receiver},</if>
<if test="receiveTime != null">#{receiveTime},</if>
<if test="finishTime != null">#{finishTime},</if>
<if test="result != null">#{result},</if>
<if test="remark != null">#{remark},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="deleted != null">#{deleted},</if>
</trim>
</insert>
<update id="updateWorkOrder" parameterType="WorkOrder">
update work_order
<trim prefix="SET" suffixOverrides=",">
<if test="orderNo != null and orderNo != ''">order_no = #{orderNo},</if>
<if test="planId != null">plan_id = #{planId},</if>
<if test="bizType != null">biz_type = #{bizType},</if>
<if test="title != null and title != ''">title = #{title},</if>
<if test="content != null">content = #{content},</if>
<if test="department != null and department != ''">department = #{department},</if>
<if test="executorIds != null and executorIds != ''">executor_ids = #{executorIds},</if>
<if test="executor != null and executor != ''">executor = #{executor},</if>
<if test="executeDate != null">execute_date = #{executeDate},</if>
<if test="executeTime != null">execute_time = #{executeTime},</if>
<if test="sheepScope != null and sheepScope != ''">sheep_scope = #{sheepScope,typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},</if>
<if test="location != null">location = #{location,typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},</if>
<if test="materialList != null">material_list = #{materialList},</if>
<if test="toolList != null">tool_list = #{toolList},</if>
<if test="status != null">status = #{status},</if>
<if test="priority != null">priority = #{priority},</if>
<if test="issuerId != null">issuer_id = #{issuerId},</if>
<if test="issuer != null">issuer = #{issuer},</if>
<if test="issueTime != null">issue_time = #{issueTime},</if>
<if test="receiverId != null">receiver_id = #{receiverId},</if>
<if test="receiver != null">receiver = #{receiver},</if>
<if test="receiveTime != null">receive_time = #{receiveTime},</if>
<if test="finishTime != null">finish_time = #{finishTime},</if>
<if test="result != null">`result` = #{result},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="deleted != null">deleted = #{deleted},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteWorkOrderById" parameterType="Long">
delete from work_order where id = #{id}
</delete>
<delete id="deleteWorkOrderByIds" parameterType="String">
delete from work_order where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>