modify

Helius

2021-01-16 3e3f68160f81344f5713a354bb9330ba80480896

modify

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

@@ -625,7 +625,7 @@
                #{item.beginTime} dataTime,
                (select shop_short_name from sys_shop_info where id=#{shopId}) shopName,
                (select IFNULL(sum(amount),0) from sys_order_flow
                    where <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
                    where <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]> and pay_method!='欠款'
                    <if test="shopId != null">
                        and shop_id=#{shopId}
                    </if>
@@ -678,26 +678,26 @@
                        and company_id=#{companyId}
                    </if>
                    ) refundCardPay,
                (select IFNULL(sum(amount),0) from sys_order_flow a
                    inner join sys_order_item b on a.order_id=b.ORDER_ID
                    inner join shopping_goods c on b.goods_id=c.id
                    where c.good_type='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
                (select IFNULL(sum(zk_price),0) from sys_order_item a
                    inner join shopping_goods b on a.goods_id=b.id
                    inner join sys_order c on a.ORDER_ID=c.id
                    where b.good_type='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
                    <if test="shopId != null">
                        and a.shop_id=#{shopId}
                        and c.shop_id=#{shopId}
                    </if>
                    <if test="companyId != null">
                        and a.company_id=#{companyId}
                        and c.company_id=#{companyId}
                    </if>
                    ) productAchieve,
                (select IFNULL(sum(amount),0) from sys_order_flow a
                    inner join sys_order_item b on a.order_id=b.ORDER_ID
                    inner join shopping_goods c on b.goods_id=c.id
                    where c.good_type!='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
                (select IFNULL(sum(zk_price),0) from sys_order_item a
                    inner join shopping_goods b on a.goods_id=b.id
                    inner join sys_order c on a.ORDER_ID=c.id
                    where b.good_type!='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
                    <if test="shopId != null">
                        and a.shop_id=#{shopId}
                        and c.shop_id=#{shopId}
                    </if>
                    <if test="companyId != null">
                        and a.company_id=#{companyId}
                        and c.company_id=#{companyId}
                    </if>
                    ) cardAchieve,
                (select IFNULL(sum(amount),0) from sys_order_flow where flow_type = '还款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
@@ -805,7 +805,7 @@
            select
            #{item.beginTime} dataTime,
            (select IFNULL(sum(amount),0) from sys_order_flow
            where <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
            where <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]> and pay_method!='欠款'
            <if test="shopId != null">
                and shop_id=#{shopId}
            </if>
@@ -840,20 +840,20 @@
                and shop_id=#{shopId}
            </if>
            ) refundCardPay,
            (select IFNULL(sum(amount),0) from sys_order_flow a
            inner join sys_order_item b on a.order_id=b.ORDER_ID
            inner join shopping_goods c on b.goods_id=c.id
            where c.good_type='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
            (select IFNULL(sum(zk_price),0) from sys_order_item a
            inner join shopping_goods b on a.goods_id=b.id
            inner join sys_order c on a.ORDER_ID=c.id
            where b.good_type='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
            <if test="shopId != null">
                and a.shop_id=#{shopId}
                and c.shop_id=#{shopId}
            </if>
            ) productAchieve,
            (select IFNULL(sum(amount),0) from sys_order_flow a
            inner join sys_order_item b on a.order_id=b.ORDER_ID
            inner join shopping_goods c on b.goods_id=c.id
            where c.good_type!='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
            (select IFNULL(sum(zk_price),0) from sys_order_item a
            inner join shopping_goods b on a.goods_id=b.id
            inner join sys_order c on a.ORDER_ID=c.id
            where b.good_type!='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
            <if test="shopId != null">
                and a.shop_id=#{shopId}
                and c.shop_id=#{shopId}
            </if>
            ) cardAchieve,
            (select IFNULL(sum(amount),0) from sys_order_flow where flow_type = '退款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html

@@ -305,9 +305,9 @@
    btns[0]='<a  class="text-primary mr-5" onClick="openPb(\'VALUE\')"  title="排班"><i class="fa fa-calendar">排班</i></a>&nbsp;'
</script>

<script matrix:btn="serviceClub-paidan"  >
    btns[1]='<a  class="text-primary mr-5" onClick="openPd(\'VALUE\')"  title="派单"><i class="fa fa-sign-in">派单</i></a>'
</script>
<!--<script matrix:btn="serviceClub-paidan"  >-->
<!--    btns[1]='<a  class="text-primary mr-5" onClick="openPd(\'VALUE\')"  title="派单"><i class="fa fa-sign-in">派单</i></a>'-->
<!--</script>-->

<script matrix:btn="serviceClub-edit"  >
    btns[2]='<a  class="text-primary mr-5" onClick="updatePd(\'VALUE\')"  title="修改"><i class="fa fa-edit">修改</i></a>'