瀏覽代碼

no message

FengChaoYu 9 月之前
父節點
當前提交
6048b60dab
共有 1 個文件被更改,包括 46 次插入48 次删除
  1. 46 48
      mall-server-api/src/main/resources/mapper/DailyMapper.xml

+ 46 - 48
mall-server-api/src/main/resources/mapper/DailyMapper.xml

@@ -229,62 +229,60 @@
     </select>
 
     <select id="cwSummaryList" resultType="com.gree.mall.manager.bean.settle.repair.DailySummaryDataBean">
-        select
-        t.*
-        from
-        (select
-        summary_batch_no,
-        month,
-        count(distinct(service_number)) 'summaryNum',
-        sum(repair_count) 'summaryOrderNum',
-        sum(repair_total_amount) 'totalRepairCostC',
-        sum(issue_cost) 'issueCostC',
-        if(find_in_set('4',group_concat(distinct if(issue_cost>0,status,2))) > 0 || find_in_set('1',group_concat(distinct if(issue_cost>0,status,2))) > 0  ,1,status) 'status',
-        status 'groupStatus',
-        summary_by,
-        summary_time,
-        issue_time,
-        issue_by,
-        create_time
-        from
-        settle_daily_issue_summary_record a
-        <where>
-            <if test="companyWechatIds != null and companyWechatIds.size > 0">
-                AND a.company_wechat_id IN
-                <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="adminWebsitIds != null and adminWebsitIds.size > 0">
-                AND a.websit_number IN
-                <foreach item="item" index="index" collection="adminWebsitIds" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="summaryStartTime != null and summaryStartTime !='' and summaryEndTime != null and summaryEndTime != ''">
-                and summary_time between #{summaryStartTime} and concat(#{summaryEndTime},' 23:59:59')
-            </if>
-
-            <if test="issueStartTime != null and issueStartTime !='' and issueEndTime != null and issueEndTime != ''">
-                and issue_time between #{issueStartTime} and concat(#{issueEndTime},' 23:59:59')
-            </if>
+        SELECT
+            t.*
+        FROM
+        (
+            SELECT
+                summary_batch_no,
+                month,
+                COUNT(DISTINCT (service_number)) AS 'summaryNum',
+                SUM(repair_count) AS 'summaryOrderNum',
+                SUM(repair_total_amount) AS 'totalRepairCostC',
+                SUM(issue_cost) AS 'issueCostC',
+                IF(FIND_IN_SET('4', GROUP_CONCAT(DISTINCT IF(issue_cost > 0, status, 2))) > 0 || FIND_IN_SET('1',GROUP_CONCAT(DISTINCT IF(issue_cost > 0, status, 2))) > 0, 1, status) AS 'status',
+                status AS 'groupStatus',
+                summary_by,
+                summary_time,
+                issue_time,
+                issue_by,
+                create_time
+            FROM
+                settle_daily_issue_summary_record a
+                <where>
+                    <if test="companyWechatIds != null and companyWechatIds.size > 0">
+                        AND a.company_wechat_id IN
+                        <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
+                            #{item}
+                        </foreach>
+                    </if>
+                    <if test="adminWebsitIds != null and adminWebsitIds.size > 0">
+                        AND a.websit_number IN
+                        <foreach item="item" index="index" collection="adminWebsitIds" open="(" separator="," close=")">
+                            #{item}
+                        </foreach>
+                    </if>
+                    <if test="summaryStartTime != null and summaryStartTime !='' and summaryEndTime != null and summaryEndTime != ''">
+                        AND summary_time BETWEEN #{summaryStartTime} AND concat(#{summaryEndTime},' 23:59:59')
+                    </if>
 
-            <if test="summaryBatchNo != null and summaryBatchNo != ''">
-                and summary_batch_no = #{summaryBatchNo}
-            </if>
+                    <if test="issueStartTime != null and issueStartTime !='' and issueEndTime != null and issueEndTime != ''">
+                        AND issue_time BETWEEN #{issueStartTime} AND concat(#{issueEndTime},' 23:59:59')
+                    </if>
 
-        </where>
-        group by
-        summary_batch_no
+                    <if test="summaryBatchNo != null and summaryBatchNo != ''">
+                        AND summary_batch_no = #{summaryBatchNo}
+                    </if>
+                </where>
+            GROUP BY
+            summary_batch_no
         ) t
         <where>
             <if test="status !='' and status != null">
                 t.status = #{status}
             </if>
-
         </where>
-
-        order by t.create_time desc
+        ORDER BY t.create_time DESC
     </select>
 
     <select id="workerDetailList" resultType="com.gree.mall.manager.bean.settle.repair.DailyWorkerIssueSalaryBean">