modify

Helius

2021-01-25 9e6d975a3acabb456be8615894af00ddac0ef4b6

modify

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

@@ -966,7 +966,7 @@
            b.SHOP_IMAG photo,
            sum(IFNULL(a.free_consume,0) + IFNULL(a.his_consume,0)) amount
        from achieve_new a
        left join sys_shop_info b on a.shop_id=b.ID
        left join sys_shop_info b on a.shop_id=b.ID and b.shop_type!=1
        <where>
            <if test="record.companyId != null">
                and a.company_id=#{record.companyId}
@@ -1067,7 +1067,7 @@
            b.SHOP_IMAG photo,
            sum(IFNULL(a.consume,0) + IFNULL(a.card_cash,0)) amount
        from achieve_new a
        left join sys_shop_info b on a.shop_id=b.ID
        left join sys_shop_info b on a.shop_id=b.ID and shop_type!=1
        <where>
            <if test="record.companyId != null">
                and a.company_id=#{record.companyId}