feat(bag): 存取包处理

src/main/java/com/dlbridge/jadp/plugins/partner/mapper/BagDeliveryMapper.xml

@@ -109,6 +109,7 @@
     <select id="getBagDeliveryCount" resultType="long">
         select count(1)
         from bag_delivery a
+        LEFT JOIN geerunner.cmpt_enroll b ON a.cmpt_id=b.cmpt_id AND a.mark_no=b.nick_id and b.del_flg = 0
         where a.del_flag=0
         <include refid="bag-where-sql"/>
     </select>
@@ -137,11 +138,10 @@
             d.point_name storagePoint,
             a.status
         from gksite.bag_delivery a
-        LEFT JOIN geerunner.cmpt_enroll b ON a.cmpt_id=b.cmpt_id AND a.mark_no=b.nick_id
-        LEFT JOIN geerunner.cmpt_item c ON c.cmpt_id=b.cmpt_id AND b.cmpt_item=c.item_id
+        LEFT JOIN geerunner.cmpt_enroll b ON a.cmpt_id=b.cmpt_id AND a.mark_no=b.nick_id and b.del_flg = 0
+        LEFT JOIN geerunner.cmpt_item c ON c.cmpt_id=b.cmpt_id AND b.cmpt_item=c.item_id and c.del_flg = 0
         LEFT JOIN gksite.bag_drop_points d on d.cmpt_id = a.cmpt_id and d.id = a.storage_point and d.del_flag = 0
         WHERE a.del_flag = 0
-        AND b.del_flg=0 AND c.del_flg=0
         <include refid="bag-where-sql"/>
     </select>
 
@@ -151,8 +151,12 @@
             and a.status=#{param.status}
         </if>
         <if test="param.keyword != null and param.keyword != ''">
-            and a.mark_no like concat('%',#{param.keyword},'%') or a.name like concat('%',#{param.keyword},'%')
-            or a.phone like concat('%',#{param.keyword},'%') or b.identity_no like concat('%',#{param.keyword},'%')
+            AND (
+            a.mark_no LIKE concat('%', trim(#{param.keyword}), '%')
+            OR a.name LIKE concat('%', trim(#{param.keyword}), '%')
+            OR a.phone LIKE concat('%', trim(#{param.keyword}), '%')
+            OR b.identity_no LIKE concat('%', trim(#{param.keyword}), '%')
+            )
         </if>
         <if test="param.markNo != null and param.markNo != ''">
             and a.mark_no = #{param.markNo}