blame | history | patch | commit | commitdiff | ignore whitespace
jyy
2021-07-10 e215a04a9eea0427a954c2361e1770996042244c 
 zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml


@@ -104,6 +104,9 @@


               test="(record.shopId!=null and record.shopId!='') or  (record.shopId!='' and record.shopId==0)  ">


               and a.shop_id = #{record.shopId}


            </if>


            <if test="record.achieveRuleId != null  ">


               and e.achieve_rule_id = #{record.achieveRuleId}


            </if>


            <if test="record.year != null and record.year !='' ">


               and YEAR (a.datatime) = #{record.year}


            </if>


@@ -1047,7 +1050,7 @@


         b.code goodsNo,


         b.name goodsName,


         c.su_name meiliao,


         d.count*d.zk_price zk_total


         TRUNCATE(d.count*d.zk_price,2) zk_total


      from achieve_new a


      left join shopping_goods b on a.shopping_goods_id=b.id


      left join sys_users c on a.beault_id=c.su_id