From 5325dfb2fda7bd21bcbcf3c8c10be1ac95793d86 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期一, 05 八月 2024 20:40:48 +0800 Subject: [PATCH] 检验下单的委托人如果制单人的委托单位与选择的委托单位不一致,则委托人必须要进行填写,如果一致那么委托人就默认是制单人+.检验设备第一次进来直接所有样品的这个项目全部使用该设备,第二次修改就只针对当前样品 --- cnas-server/src/main/resources/mapper/SealMapper.xml | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cnas-server/src/main/resources/mapper/SealMapper.xml b/cnas-server/src/main/resources/mapper/SealMapper.xml index 0ae0d6e..0e1dc5f 100644 --- a/cnas-server/src/main/resources/mapper/SealMapper.xml +++ b/cnas-server/src/main/resources/mapper/SealMapper.xml @@ -3,14 +3,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.yuanchu.mom.mapper.SealMapper"> - <select id="selectSeal" resultType="com.yuanchu.mom.mapper.SealMapper"> - select s.address,s.type,u.`name`,s.create_time - from seal s - LEFT JOIN `user` u - on s.create_user=u.id + <select id="selectSeal" resultType="com.yuanchu.mom.pojo.Seal"> + select l.id,s.lab_id,l.laboratory_name ,s.address, s.type as Type,s.create_time + from seal s LEFT JOIN laboratory l on s.lab_id=l.id <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''"> ${ew.customSqlSegment} </if> - </select> + </select> + <select id="selectLaboratory" resultType="com.yuanchu.mom.pojo.Laboratory"> + SELECT * + from laboratory + WHERE id = #{labId} + </select> </mapper> \ No newline at end of file -- Gitblit v1.9.3