--no commit message

app/statistics/src/main/java/com/zrqx/statistics/bg/mapper/GoodsLogMapper.java

@@ -88,11 +88,18 @@ public interface GoodsLogMapper extends BaseMapper<GoodsLog> {
     List<GoodsLog> selectDataByYear(@Param("firstDay") String firstDay, @Param("lastDay") String lastDay, @Param("siteId") String siteid, @Param("conds") String conds);
 
     
+//    @Select("<script>"
+//            + " select id,name,sum(clicknum) clicknum,sum(collectnum) collectnum,sum(tradenum) tradenum,sum(tradeamount) tradeamount, "
+//            + " sum(downloadnum) downloadnum,type,typezh,siteid,DATE_FORMAT(createTime,#{conds}) createTime from sta_goods_log "
+//            + " group by name order by sum(clicknum) desc "
+//            + "</script>")
     @Select("<script>"
-            + " select id,name,sum(clicknum) clicknum,sum(collectnum) collectnum,sum(tradenum) tradenum,sum(tradeamount) tradeamount, "
-            + " sum(downloadnum) downloadnum,type,typezh,siteid,DATE_FORMAT(createTime,#{conds}) createTime from sta_goods_log "
-            + " group by name order by sum(clicknum) desc "
-            + "</script>")
+    		+ " SELECT  a.id,a.name,a.clicknum,a.collectnum,a.clicknum+a.collectnum zhihe , a.tradenum,a.tradeamount,"
+    		+ " a.downloadnum,a.type,a.typezh,a.siteid,a.createTime FROM ("
+    		+ " SELECT id,NAME,SUM(clicknum) clicknum,SUM(collectnum) collectnum, SUM(tradenum) tradenum,SUM(tradeamount) tradeamount,"
+    		+ "  SUM(downloadnum) downloadnum,TYPE,typezh,siteid,DATE_FORMAT(createTime,'%Y-%m-%d') createTime FROM sta_goods_log GROUP BY NAME)a "
+    		+ "  ORDER BY zhihe DESC "
+    		+ "</script>")
     List<GoodsLog> getHot();
 
     @Select("<script>"