瀏覽代碼

Merge remote-tracking branch 'origin/test' into test

syh 4 年之前
父節點
當前提交
a39370362c

+ 31 - 31
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouReportDailyAccountMapper.xml

@@ -531,8 +531,8 @@
     </select>
 
     <select id="getKuaishouAccountInfoByProjectId" resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccountDTO">
-        select * from
-        (
+--         select * from
+--         (
         select
         #{yn} as 'yn',
         concat(#{startDate}, '~' ,#{endDate}) as 'statDate',
@@ -608,15 +608,15 @@
         </if>
         group by a.account_id
         order by sum(a.charge) desc
-        )m
-        <if test="yn=1">
-            where
-            m.charge != 0
-        </if>
+<!--        )m-->
+<!--        <if test="yn=1">-->
+<!--            where-->
+<!--            m.charge != 0-->
+<!--        </if>-->
     </select>
 
     <select id="getKuaishouProjectInfo" resultType="cn.com.ctop.kuaishou.modules.report.entity.ProjectAccountDTO">
-        select* from (
+--         select* from (
              select
         #{yn} as 'yn',
             concat(#{startDate}, '~' , #{endDate}) as 'statDate',
@@ -692,17 +692,17 @@
             </foreach>
             group by b.project_id
             order by sum(a.charge) desc
-        ) m
-        <if test="yn = 1">
-        where
-            m.charge != 0
-        </if>
+<!--        ) m-->
+<!--        <if test="yn = 1">-->
+<!--        where-->
+<!--            m.charge != 0-->
+<!--        </if>-->
     </select>
 
     <!-- 计划汇总 -->
     <select id="getKuaishouCampaignInfoByAccountId" resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccountDTO">
-        select * from
-        (select
+--         select * from(
+        select
         #{yn} as 'yn',
         concat(#{startDate}, '~' ,#{endDate}) as 'statDate',
         b.project_id as 'projectId',
@@ -778,17 +778,17 @@
 
         group by a.campaign_id
         order by sum(a.charge) desc
-        ) m
+<!--        ) m-->
 
-        <if test="yn = 1">
-            where
-            m.charge != 0
-        </if>
+<!--        <if test="yn = 1">-->
+<!--            where-->
+<!--            m.charge != 0-->
+<!--        </if>-->
     </select>
 
     <!-- 根据计划id获取组信息 -->
     <select id="getKuaishouUnitInfoByCampaignId" resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccountDTO">
-        select * from (
+--         select * from (
         select
         #{yn} as 'yn',
         concat(#{startDate}, '~' ,#{endDate}) as 'statDate',
@@ -867,11 +867,11 @@
             </if>
             group by unit_id
             order by sum(a.charge) desc
-            ) m
-        <if test="yn = 1">
-            where
-            m.charge != 0
-        </if>
+<!--            ) m-->
+<!--        <if test="yn = 1">-->
+<!--            where-->
+<!--            m.charge != 0-->
+<!--        </if>-->
     </select>
 
     <select id="queryProjectMemberByUserId" resultType="long">
@@ -967,7 +967,7 @@
     </select>
 
     <select id="getKuaishouCreativeInfoByUnitId" resultType="cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAccountDTO">
-        select * from (
+--         select * from (
             select
         #{yn} as 'yn',
             concat(#{startDate}, '~' ,#{endDate}) as 'statDate',
@@ -1052,10 +1052,10 @@
             </if>
             group by a.creative_id
             order by sum(a.charge) desc
-        )m
-        <if test="yn=1">
-            where m.charge != 0
-        </if>
+<!--        )m-->
+<!--        <if test="yn=1">-->
+<!--            where m.charge != 0-->
+<!--        </if>-->
     </select>
 
     <!-- 获取项目成员所在所有项目下的所有账户id -->