finish

Helius

2020-12-27 7b578f8330cf25fe4a914436d45c355972190146

 zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml

@@ -388,6 +388,7 @@
      c.volume as gs_volume,
      c.price as gs_price,
      c.wholesale as gs_wholesale,
      c.img as gs_img,
      a.shop_id,
      a.company_id
      from
@@ -813,6 +814,9 @@
         <if test=" record.endTime!=null  ">
            <![CDATA[    and #{record.endTime} >=b.create_time]]>
         </if>
         <if test="record.companyId != null and record.companyId !='' ">
            and   b.company_id = #{record.companyId}
         </if>
      </where>
      UNION ALL
      SELECT
@@ -848,6 +852,9 @@
         <if test=" record.endTime!=null   ">
            <![CDATA[    and #{record.endTime} >= t2_b.create_time  ]]>
         </if>
         <if test="record.companyId != null and record.companyId !='' ">
            and   t2_b.company_id = #{record.companyId}
         </if>
      </where>
      ) t