|
@@ -326,6 +326,10 @@ public class TimerServiceImpl implements TimerService {
|
|
|
@Override
|
|
|
public List<ProjectAnalysis> projectAnalysisGroup(Map<String, Object> data){
|
|
|
final String[] sql = {"",""};
|
|
|
+ int pageStart = (Integer.parseInt(data.get("page").toString()) - 1) * Integer.parseInt(data.get("num").toString());
|
|
|
+ int pageEnd = Integer.parseInt(data.get("page").toString()) * Integer.parseInt(data.get("num").toString());
|
|
|
+ data.remove("page");
|
|
|
+ data.remove("num");
|
|
|
if (!data.containsKey("month")){
|
|
|
sql[0] = "SELECT " +
|
|
|
" `month`, " +
|
|
@@ -358,7 +362,7 @@ public class TimerServiceImpl implements TimerService {
|
|
|
sql[0] = sql[0] +
|
|
|
" GROUP BY " +
|
|
|
" `month`" +
|
|
|
- " order by `month` DESC";
|
|
|
+ " order by `month` DESC LIMIT " + pageStart + "," + pageEnd;
|
|
|
sql[1]= "SELECT " +
|
|
|
" '合计' as `month` , " +
|
|
|
" sum( predict_income ) predict_income," +
|
|
@@ -441,8 +445,8 @@ public class TimerServiceImpl implements TimerService {
|
|
|
sql[1] = sql[1] + " AND `" + k +"` = \"" + v +"\"" ;
|
|
|
}
|
|
|
});
|
|
|
- sql[1] = sql[1] + " GROUP BY `month` ";
|
|
|
- sql[0] = sql[0] + " order by `month` DESC ";
|
|
|
+ sql[1] = sql[1] + " GROUP BY `month` ";
|
|
|
+ sql[0] = sql[0] + " order by `month` DESC LIMIT " + pageStart + "," + pageEnd;
|
|
|
}
|
|
|
// Class.forName(driver);
|
|
|
// Connection connection = DriverManager.getConnection(url, username, password);
|