瀏覽代碼

Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5.1

魏超 5 年之前
父節點
當前提交
6668eeeca0

+ 1
- 0
src/main/resources/mapper/statistic/TsCustomerStatisticDailyMapper.xml 查看文件

58
         AND customer_type = #{customerType}
58
         AND customer_type = #{customerType}
59
         AND date_format( create_date, '%Y-%m-%d' ) >= date_format( #{beforeDate}, '%Y-%m-%d' )
59
         AND date_format( create_date, '%Y-%m-%d' ) >= date_format( #{beforeDate}, '%Y-%m-%d' )
60
         AND date_format( create_date, '%Y-%m-%d' ) <= date_format( #{nowDate}, '%Y-%m-%d' )
60
         AND date_format( create_date, '%Y-%m-%d' ) <= date_format( #{nowDate}, '%Y-%m-%d' )
61
+        order by `day`
61
     </select>
62
     </select>
62
 </mapper>
63
 </mapper>

+ 1
- 0
src/main/resources/mapper/statistic/TsCustomerStatisticMonthlyMapper.xml 查看文件

54
         AND customer_type = #{customerType}
54
         AND customer_type = #{customerType}
55
         AND date_format( create_date, '%Y-%m-%d' ) >= date_format( #{beforeDate}, '%Y-%m-%d' )
55
         AND date_format( create_date, '%Y-%m-%d' ) >= date_format( #{beforeDate}, '%Y-%m-%d' )
56
         AND date_format( create_date, '%Y-%m-%d' ) &lt;= date_format( #{nowDate}, '%Y-%m-%d' )
56
         AND date_format( create_date, '%Y-%m-%d' ) &lt;= date_format( #{nowDate}, '%Y-%m-%d' )
57
+         order by `month`
57
     </select>
58
     </select>
58
 </mapper>
59
 </mapper>