Merge remote-tracking branch 'origin/企微聊天' into 企微聊天

fs-service/src/main/java/com/fs/his/mapper/FsPackageOrderMapper.java

@@ -78,7 +78,7 @@ public interface FsPackageOrderMapper
     @Select({"<script> " +
             "select o.order_id,o.package_second_name,o.source,o.order_sn,o.package_name,o.pay_time,o.is_pay, o.days,o.pay_price, " +
             "o.pay_money,o.pay_type,o.`status`,o.package_sub_type,o.create_time,o.start_time,o.finish_time      " +
-            ",d.doctor_name,u.nick_name,u.phone,c.company_name,cu.nick_name company_user_name,csc.name miniProgramName," +
+            ",d.doctor_name,u.nick_name,u.phone,c.company_name,cu.nick_name company_nick_name,cu.user_name company_user_name,csc.name miniProgramName," +
             "JSON_UNQUOTE(JSON_EXTRACT(o.patient_json, '$.patientName')) AS patientName,fso.delivery_status,fso.delivery_pay_status  " +
             "from fs_package_order o " +
             "LEFT JOIN fs_doctor d ON d.doctor_id=o.doctor_id " +
@@ -110,6 +110,7 @@ public interface FsPackageOrderMapper
             "            <if test=\"maps.companyUserId != null \"> and o.company_user_id = #{maps.companyUserId}</if>\n" +
             "            <if test=\"maps.companyName != null \"> and c.company_name like concat('%', #{maps.companyName}, '%')</if>\n" +
             "            <if test=\"maps.companyUserName != null \"> and cu.user_name like concat('%', #{maps.companyUserName}, '%')</if>\n" +
+            "            <if test=\"maps.companyNickName != null \"> and cu.nick_name like concat('%', #{maps.companyNickName}, '%')</if>\n" +
             "            <if test = 'maps.companyId != null  and   maps.companyId != \"-1\" '> and o.company_id =#{maps.companyId} </if>" +
             "            <if test = ' maps.companyId == \"-1\" '> and o.company_id is null </if>" +
             "            <if test = 'maps.deptId != null    '> AND (o.dept_id = #{maps.deptId} OR o.dept_id IN ( SELECT t.dept_id FROM company_dept t WHERE find_in_set(#{maps.deptId}, ancestors) )) </if>" +

fs-service/src/main/java/com/fs/his/param/FsPackageOrderParam.java

@@ -94,6 +94,7 @@ public class FsPackageOrderParam  extends BaseEntity{
     private String companyName;
 
     private String companyUserName;
+    private String companyNickName;
 
     private String userName;//收货人
 

fs-service/src/main/java/com/fs/his/vo/FsPackageOrderListVO.java

@@ -22,6 +22,7 @@ public class FsPackageOrderListVO {
     private String companyName;
     @Excel(name = "员工")
     private String companyUserName;
+    private String companyNickName;
     @Excel(name = "应收金额")
     private BigDecimal payPrice;
     @Excel(name = "实收金额")