shudonghui 1 anno fa
parent
commit
09cf9411de

+ 15 - 3
sop-business/src/main/resources/mapper/CrmAnalyseMapper.xml

@@ -89,7 +89,11 @@
     </select>
 
     <select id="monthly" resultType="java.util.Map">
-        SELECT MONTH ( FROM_UNIXTIME( s.start_time / 1000 )) month,
+        SELECT YEAR
+        (
+        FROM_UNIXTIME( s.start_time / 1000 )) year,
+        MONTH (
+        FROM_UNIXTIME( s.start_time / 1000 )) month,
         count( c.id ) count
         FROM
         t_b_crm c
@@ -111,8 +115,16 @@
             </if>
 
         </where>
-        GROUP BY MONTH ( FROM_UNIXTIME( s.start_time / 1000 ))
-        order BY MONTH ( FROM_UNIXTIME( s.start_time / 1000 ))
+        GROUP BY
+        YEAR (
+        FROM_UNIXTIME( s.start_time / 1000 )),
+        MONTH (
+        FROM_UNIXTIME( s.start_time / 1000 ))
+        ORDER BY
+        YEAR (
+        FROM_UNIXTIME( s.start_time / 1000 )),
+        MONTH (
+        FROM_UNIXTIME( s.start_time / 1000 ))
     </select>