From 3ee4e9caf94fab32112fb1e266929f555ec325ed Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 15 Aug 2024 16:15:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E8=AF=A6=E6=83=85=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../req/collect/CollectOrderBizRequest.java   |  4 +++
 .../collect/IoCollectOrderBizMapper.xml       | 30 +++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java
index 121766df3..f9afb6b77 100644
--- a/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java
+++ b/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java
@@ -21,6 +21,8 @@ public class CollectOrderBizRequest extends ListPageRequest {
      */
     private String thrCode;
 
+
+    private String unionCode;
     /**
      * 医保编码
      */
@@ -110,4 +112,6 @@ public class CollectOrderBizRequest extends ListPageRequest {
      * 更新时间
      */
     private Date updateTime;
+
+    private Long relId;
 }
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
index bfaf8d61a..8e8c9f82a 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
@@ -1,4 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.collect.IoCollectOrderBizMapper">
+    <select id="filterList" parameterType="com.glxp.api.req.collect.CollectOrderBizRequest"
+            resultType="com.glxp.api.res.collect.CollectOrderBizResponse">
+        SELECT icob.*, bp.nameCode diCode, bp.zczbhhzbapzbh, bp.manufactory
+        FROM io_collect_order_biz icob
+                     left join basic_udirel bu on icob.relId = bu.id
+                     left join basic_products bp on bu.uuid = bp.uuid
+        <where>
+            <if test="thrCode != '' and thrCode != null">
+                AND icob.thrCode LIKE concat('%', #{thrCode}, '%')
+            </if>
+            <if test="orderIdFk != null and orderIdFk != ''">
+                AND icob.orderIdFk = #{orderIdFk}
+            </if>
+            <if test="relId != null">
+                AND icob.relId = #{relId}
+            </if>
+            <if test="cpmctymc != null and cpmctymc != ''">
+                AND icob.cpmctymc LIKE concat('%', #{cpmctymc}, '%')
+            </if>
+            <if test="unionCode != '' and unionCode != null">
+                and (
+                        bp.nameCode LIKE concat('%', #{unionCode}, '%')
+                                or bp.ybbm LIKE concat('%', #{unionCode}, '%')
+                                or bp.sptm LIKE concat('%', #{unionCode}, '%'))
+            </if>
+            <if test="ggxh != '' and ggxh != null">
+                AND ggxh LIKE concat('%', #{ggxh}, '%')
+            </if>
+        </where>
+    </select>
 </mapper>