d

whh1009 · Apr 11, 2019 · f1644ca · f1644ca
1 parent 8a8e943
commit f1644ca
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/cw/WebRoot/WEB-INF/lib/servlet-api.jar b/cw/WebRoot/WEB-INF/lib/servlet-api.jar
diff --git a/cw/WebRoot/out/test.txt b/cw/WebRoot/out/test.txt
diff --git a/cw/src/com/wuzhou/service/BookIncomingService.java b/cw/src/com/wuzhou/service/BookIncomingService.java
@@ -230,7 +230,7 @@ public Page<CwSaleModel> groupByBookNum (String startTime, String endTime, Strin
 		if(StrKit.notBlank(platform) && !"0".equals(platform)) {
 			sqlExceptSelect += " AND platform = '"+platform+"'"; 
 		}
-		sqlExceptSelect += " GROUP BY book_num ORDER BY id DESC";
+		sqlExceptSelect += " GROUP BY platform, book_num ORDER BY id DESC";
 		System.out.println(sqlExceptSelect);
 		return CwSaleModel.dao.paginate(pageNumber, 15, select, sqlExceptSelect);
 	}
@@ -245,7 +245,7 @@ public String createXsltGroupByBookNum(String startTime, String endTime, String
 		if(StrKit.notBlank(platform) && !"0".equals(platform)) {
 			sql += " AND platform = '"+platform+"'"; 
 		}
-		sql += " GROUP BY book_num ORDER BY id DESC";
+		sql += " GROUP BY platform, book_num ORDER BY id DESC";
 		List<CwSaleModel> list = CwSaleModel.dao.find(sql);
 		if(list==null||list.isEmpty()){
 			return "";

diff --git a/cw/src/db_config.txt b/cw/src/db_config.txt
@@ -1,3 +1,3 @@
-jdbcUrl = jdbc:mysql://localhost:3306/wuzhou?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
+jdbcUrl = jdbc:mysql://172.16.1.214:3606/wuzhou?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
 user = root
-password = 123456
+password = cp_#1897&Whh