From 5325dfb2fda7bd21bcbcf3c8c10be1ac95793d86 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 05 八月 2024 20:40:48 +0800
Subject: [PATCH] 检验下单的委托人如果制单人的委托单位与选择的委托单位不一致,则委托人必须要进行填写,如果一致那么委托人就默认是制单人+.检验设备第一次进来直接所有样品的这个项目全部使用该设备，第二次修改就只针对当前样品
---
inspect-server/src/main/resources/mapper/InsUnPassMapper.xml | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsUnPassMapper.xml b/inspect-server/src/main/resources/mapper/InsUnPassMapper.xml
index 79658de..d67f656 100644
--- a/inspect-server/src/main/resources/mapper/InsUnPassMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsUnPassMapper.xml
@@ -6,7 +6,7 @@
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsUnPass">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="sample" column="sample" jdbcType="VARCHAR"/>
- <result property="inspectionItems" column="inspection_items" jdbcType="VARCHAR"/>
+ <result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
<result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
<result property="lastValue" column="last_value" jdbcType="VARCHAR"/>
<result property="model" column="model" jdbcType="VARCHAR"/>
@@ -19,15 +19,10 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
<select id="pageInsUnPass" resultType="com.yuanchu.mom.dto.UnPassPageDto">
--- select *
--- from (
--- select
--- iu.*,io.entrust_code,u.name write_user_name
--- from ins_un_pass iu
--- left join ins_order io on io.id = iu.ins_order_id
--- left join user u on u.id = iu.create_user
--- ) a
- select *
- from ins_un_pass iu
+ SELECT * FROM
+ ins_un_pass iu
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
</select>
-</mapper>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.3