数据漏斗模型bugfix

src/main/resources/mapper/ShopMapper.xml

@@ -409,24 +409,24 @@
                s.contractMobile,
                cmr.addTime,
                <if test="type == 1">
-                (SELECT reportDate FROM cm_market_report WHERE id = #{marketReportId} LIMIT 1) AS reportDate,
+                (SELECT reportDate FROM cm_market_report WHERE id = #{marketReportId} and delflag = 0 LIMIT 1) AS reportDate,
                </if>
                <if test="type != 1">
-                (SELECT reportDate FROM cm_market_report WHERE marketId = css.id ORDER BY addTime ASC LIMIT 1) AS startDate,
-                (SELECT reportDate FROM cm_market_report WHERE marketId = css.id ORDER BY addTime DESC LIMIT 1) AS endDate,
+                (SELECT reportDate FROM cm_market_report WHERE marketId = css.id and delflag = 0 ORDER BY addTime ASC LIMIT 1) AS startDate,
+                (SELECT reportDate FROM cm_market_report WHERE marketId = css.id and delflag = 0 ORDER BY addTime DESC LIMIT 1) AS endDate,
                </if>
                css.logo
         FROM cm_shop_statistics css
-                left join cm_shop_product csp on csp.statisticsId = css.id
-                 LEFT JOIN cm_market_report cmr ON cmr.marketId = csp.id
-                 LEFT JOIN shop s ON s.shopId = css.shopId
+        LEFT JOIN cm_shop_product csp on csp.statisticsId = css.id
+        LEFT JOIN cm_market_report cmr ON cmr.marketId = csp.id
+        LEFT JOIN shop s ON s.shopId = css.shopId
         WHERE css.delFlag = 0
           <if test="type == 1">
               and cmr.id = #{marketReportId}
           </if>
-            <if test="type != 1">
-                and css.shopId = #{shopId}
-            </if>
+          <if test="type != 1">
+              and css.shopId = #{shopId}
+          </if>
         ORDER BY cmr.addTime DESC
         limit 1
     </select>
@@ -480,7 +480,8 @@
                consultation,
                report
         FROM cm_market_funnelModel
-        WHERE marketReportId in
+        WHERE delflag = 0
+         and marketReportId in
         <foreach collection="marketReportIds" item="marketReportId" open="(" separator="," close=")">
             #{marketReportId}
         </foreach>
@@ -598,7 +599,8 @@
                remarkNumber,
                addTime
         FROM cm_market_remark
-        WHERE marketReportId in
+        WHERE delflag = 0
+          and marketReportId in
         <foreach collection="marketReportIds" item="marketReportId" open="(" separator="," close=")">
             #{marketReportId}
         </foreach>