|
|
@@ -10,21 +10,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
|
|
|
|
<select id="getList" parameterType="BizTaksStockLot" resultMap="BizTaksStockLotResult">
|
|
|
- SELECT distinct t1.*, (
|
|
|
- SELECT
|
|
|
- GROUP_CONCAT(t2.carrier_code ORDER BY t2.carrier_code SEPARATOR ',')
|
|
|
- FROM biz_daywork_carrier t2
|
|
|
- WHERE t2.daywork_id = t1.daywork_id
|
|
|
- AND t2.is_changed=0
|
|
|
- and t2.process_inspection_id = 0
|
|
|
- AND t2.deleted = 0
|
|
|
- ) AS carrierNames from biz_taks_stock_lot t1
|
|
|
+ SELECT distinct t1.*
|
|
|
+<!-- , (-->
|
|
|
+<!-- SELECT-->
|
|
|
+<!-- GROUP_CONCAT(t2.carrier_code ORDER BY t2.carrier_code SEPARATOR ',')-->
|
|
|
+<!-- FROM biz_daywork_carrier t2-->
|
|
|
+<!-- WHERE t2.daywork_id = t1.daywork_id-->
|
|
|
+<!-- AND t2.is_changed=0-->
|
|
|
+<!-- and t2.process_inspection_id = 0-->
|
|
|
+<!-- AND t2.deleted = 0-->
|
|
|
+<!-- ) AS carrierNames -->
|
|
|
+ from biz_taks_stock_lot t1
|
|
|
<trim prefix=" WHERE" suffix="" suffixOverrides="AND">
|
|
|
t1.deleted = 0 and t1.dept_id = #{deptId} and t1.take_stock_period_id = #{takeStockPeriodId} and t1.daywork_id != 0
|
|
|
- <if test="keywords != null and keywords != ''"> AND (t1.lot_code LIKE CONCAT('%',#{keywords},'%') OR
|
|
|
- t1.daywork_id in (select daywork_id from
|
|
|
- biz_daywork_carrier where deleted = 0 AND is_changed=0 and carrier_code LIKE CONCAT('%',
|
|
|
- #{keywords}, '%')))</if>
|
|
|
+ <if test="keywords != null and keywords != ''"> AND (t1.lot_code LIKE CONCAT('%',#{keywords},'%')
|
|
|
+<!-- OR-->
|
|
|
+<!-- t1.daywork_id in (select daywork_id from-->
|
|
|
+<!-- biz_daywork_carrier where deleted = 0 AND is_changed=0 and carrier_code LIKE CONCAT('%',-->
|
|
|
+<!-- #{keywords}, '%')))-->
|
|
|
+ </if>
|
|
|
</trim>
|
|
|
</select>
|
|
|
|
