添加搜索条件

fs-service-system/src/main/java/com/fs/live/domain/LiveOrder.java

@@ -29,11 +29,11 @@ public class LiveOrder extends BaseEntity {
     private String userId;
 
     /** APP(his_java)用户ID */
-    @Excel(name = "APP用户ID")
+    @Excel(name = "院端用户")
     private Long appUserId;
 
     /** APP(his_java)部门名称 */
-    @Excel(name = "APP部门名称")
+    @Excel(name = "院端部门")
     private String appDeptName;
 
     /** 管易云订单号 */

fs-service-system/src/main/java/com/fs/live/vo/LiveOrderQueryVO.java

@@ -26,6 +26,12 @@ public class LiveOrderQueryVO extends BaseEntity {
     @Excel(name = "会员ID")
     private String userId;
 
+    /** 院端用户ID（his_java） */
+    private Long appUserId;
+
+    /** 院端部门名称（his_java） */
+    private String appDeptName;
+
     /** 管易云订单号 */
     @Excel(name = "管易云订单号")
     private String extendOrderId;

fs-service-system/src/main/java/com/fs/store/mapper/FsStoreOrderMapper.java

@@ -98,6 +98,12 @@ public interface FsStoreOrderMapper
             "<if test = 'maps.userId != null      '> " +
             "and o.user_id =#{maps.userId} " +
             "</if>" +
+            "<if test = 'maps.appUserId != null      '> " +
+            "and u.app_user_id =#{maps.appUserId} " +
+            "</if>" +
+            "<if test = 'maps.appDeptName != null and maps.appDeptName != \"\"     '> " +
+            "and u.app_dept_name like CONCAT('%',#{maps.appDeptName},'%') " +
+            "</if>" +
             "<if test = 'maps.deliveryId != null  and  maps.deliveryId !=\"\"    '> " +
             "and o.delivery_id =#{maps.deliveryId} " +
             "</if>" +
@@ -198,6 +204,12 @@ public interface FsStoreOrderMapper
             "<if test = 'maps.userId != null      '> " +
             "and o.user_id =#{maps.userId} " +
             "</if>" +
+            "<if test = 'maps.appUserId != null      '> " +
+            "and u.app_user_id =#{maps.appUserId} " +
+            "</if>" +
+            "<if test = 'maps.appDeptName != null and maps.appDeptName != \"\"     '> " +
+            "and u.app_dept_name like CONCAT('%',#{maps.appDeptName},'%') " +
+            "</if>" +
             "<if test = 'maps.deliveryId != null  and  maps.deliveryId !=\"\"    '> " +
             "and o.delivery_id =#{maps.deliveryId} " +
             "</if>" +
@@ -296,6 +308,12 @@ public interface FsStoreOrderMapper
             "<if test = 'maps.userId != null      '> " +
             "and o.user_id =#{maps.userId} " +
             "</if>" +
+            "<if test = 'maps.appUserId != null      '> " +
+            "and u.app_user_id =#{maps.appUserId} " +
+            "</if>" +
+            "<if test = 'maps.appDeptName != null and maps.appDeptName != \"\"     '> " +
+            "and u.app_dept_name like CONCAT('%',#{maps.appDeptName},'%') " +
+            "</if>" +
             "<if test = 'maps.deliveryId != null  and  maps.deliveryId !=\"\"    '> " +
             "and o.delivery_id =#{maps.deliveryId} " +
             "</if>" +
@@ -564,6 +582,12 @@ public interface FsStoreOrderMapper
             "<if test = 'maps.userId != null      '> " +
             "and o.user_id =#{maps.userId} " +
             "</if>" +
+            "<if test = 'maps.appUserId != null      '> " +
+            "and u.app_user_id =#{maps.appUserId} " +
+            "</if>" +
+            "<if test = 'maps.appDeptName != null and maps.appDeptName != \"\"     '> " +
+            "and u.app_dept_name like CONCAT('%',#{maps.appDeptName},'%') " +
+            "</if>" +
             "<if test = 'maps.deliveryId != null  and  maps.deliveryId !=\"\"    '> " +
             "and o.delivery_id =#{maps.deliveryId} " +
             "</if>" +
@@ -660,6 +684,12 @@ public interface FsStoreOrderMapper
             "<if test = 'maps.userId != null      '> " +
             "and o.user_id =#{maps.userId} " +
             "</if>" +
+            "<if test = 'maps.appUserId != null      '> " +
+            "and u.app_user_id =#{maps.appUserId} " +
+            "</if>" +
+            "<if test = 'maps.appDeptName != null and maps.appDeptName != \"\"     '> " +
+            "and u.app_dept_name like CONCAT('%',#{maps.appDeptName},'%') " +
+            "</if>" +
             "<if test = 'maps.deliveryId != null  and  maps.deliveryId !=\"\"    '> " +
             "and o.delivery_id =#{maps.deliveryId} " +
             "</if>" +
@@ -741,6 +771,12 @@ public interface FsStoreOrderMapper
             "<if test = 'maps.userId != null      '> " +
             "and o.user_id =#{maps.userId} " +
             "</if>" +
+            "<if test = 'maps.appUserId != null      '> " +
+            "and u.app_user_id =#{maps.appUserId} " +
+            "</if>" +
+            "<if test = 'maps.appDeptName != null and maps.appDeptName != \"\"     '> " +
+            "and u.app_dept_name like CONCAT('%',#{maps.appDeptName},'%') " +
+            "</if>" +
             "<if test = 'maps.deliveryId != null  and  maps.deliveryId !=\"\"    '> " +
             "and o.delivery_id =#{maps.deliveryId} " +
             "</if>" +

fs-service-system/src/main/java/com/fs/store/param/FsStoreOrderParam.java

@@ -58,6 +58,10 @@ public class FsStoreOrderParam extends BaseEntity implements Serializable
 
     private Long userId;
 
+    private Long appUserId;
+
+    private String appDeptName;
+
     private Long customerId;
 
     private String realName;

fs-service-system/src/main/java/com/fs/store/vo/FsStoreOrderExportVO.java

@@ -29,10 +29,10 @@ public class FsStoreOrderExportVO implements Serializable
     @Excel(name = "会员ID")
     private Long userId;
 
-    @Excel(name = "APP用户ID")
+    @Excel(name = "院端用户")
     private Long appUserId;
 
-    @Excel(name = "APP部门名称")
+    @Excel(name = "院端部门")
     private String appDeptName;
 
     /** 额外订单号 */

fs-service-system/src/main/java/com/fs/store/vo/FsStoreOrderVO.java

@@ -29,10 +29,10 @@ public class FsStoreOrderVO implements Serializable
     @Excel(name = "会员ID")
     private Long userId;
 
-    @Excel(name = "APP用户ID")
+    @Excel(name = "院端用户")
     private Long appUserId;
 
-    @Excel(name = "APP部门名称")
+    @Excel(name = "院端部门")
     private String appDeptName;
 
     /** 额外订单号 */

fs-service-system/src/main/resources/mapper/live/LiveOrderMapper.xml

@@ -123,6 +123,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="storeId != null "> and store_id = #{storeId}</if>
             <if test="orderCode != null  and orderCode != ''"> and a.order_code = #{orderCode}</if>
             <if test="userId != null  and userId != ''"> and a.user_id = #{userId}</if>
+            <if test="appUserId != null"> and fu.app_user_id = #{appUserId}</if>
+            <if test="appDeptName != null and appDeptName != ''"> and fu.app_dept_name like concat('%', #{appDeptName}, '%')</if>
             <if test="userName != null  and userName != ''"> and a.user_name like concat('%', #{userName}, '%')</if>
             <if test="userPhone != null  and userPhone != ''"> and a.user_phone = #{userPhone}</if>
             <if test="userAddress != null  and userAddress != ''"> and a.user_address = #{userAddress}</if>

fs-service-system/src/main/resources/mapper/store/FsStoreOrderMapper.xml

@@ -587,6 +587,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test = 'maps.userId != null      '>
                 and o.user_id =#{maps.userId}
             </if>
+            <if test = 'maps.appUserId != null      '>
+                and u.app_user_id =#{maps.appUserId}
+            </if>
+            <if test = 'maps.appDeptName != null and maps.appDeptName != ""     '>
+                and u.app_dept_name like CONCAT('%',#{maps.appDeptName},'%')
+            </if>
             <if test = 'maps.deliveryId != null  and  maps.deliveryId !=""    '>
                 and deliver.deliver_id =#{maps.deliveryId}
             </if>