From d2be6e4afe1dba009b56f8555792f2823f9e4535 Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期一, 22 二月 2021 10:34:59 +0800 Subject: [PATCH] 订单入库备货领取的返回 和修改 试剂直接入库和试剂管理 的搜索排序 --- src/main/java/com/nanometer/smartlab/dao/SysAlarmPersonDao.xml | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/dao/SysAlarmPersonDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysAlarmPersonDao.xml index 34b6b9e..c5bdf3d 100644 --- a/src/main/java/com/nanometer/smartlab/dao/SysAlarmPersonDao.xml +++ b/src/main/java/com/nanometer/smartlab/dao/SysAlarmPersonDao.xml @@ -9,11 +9,12 @@ <result property="warningLevel" column="warning_level" typeHandler="com.nanometer.smartlab.entity.handler.WarningLevelHandler"></result> <result property="userId" column="user_id"></result> <result property="warningPoint" column="warning_point"></result> + <result property="refId" column="daping_alarm_id"/> </resultMap> <insert id="insertSysAlarmPerson" parameterType="com.nanometer.smartlab.entity.SysAlarmPerson"> - insert into sys_warning(container_code, warning_id, warning_time, warning_level, user_id, warning_point,daping_alarm_id) - values (#{containerCode}, #{warningId}, #{warningTime}, #{warningLevel}, #{userId}, #{warningPoint},#{refId} ) + insert into sys_warning(container_code, warning_id, warning_time, warning_level, user_id, warning_point,daping_alarm_id,memo) + values (#{containerCode}, #{warningId}, #{warningTime}, #{warningLevel}, #{userId}, #{warningPoint},#{refId},#{memo} ) </insert> @@ -24,5 +25,14 @@ and warning_time = #{warningTime} and warning_level = #{warningLevel} </select> - + <select id="selectByCode" resultType="com.nanometer.smartlab.entity.SysAlarmPerson"> + select + id, + container_code as containerCode, + warning_id as warningId, + daping_alarm_id as refId + from sys_warning + where container_code = #{containerCode} + and warning_id = #{warningId} + </select> </mapper> -- Gitblit v1.9.2