|
@@ -326,8 +326,10 @@ public class TimerServiceImpl implements TimerService {
|
|
|
@Override
|
|
|
public Map<String, Object> 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()) - 1;
|
|
|
+ int pageStart = (Integer.parseInt(data.get("page").toString()) - 1) * (Integer.parseInt(data.get("num").toString())-1);
|
|
|
+ int pageEnd = Integer.parseInt(data.get("num").toString()) - 1;
|
|
|
+ log.info("pageStart:{}",pageStart);
|
|
|
+ log.info("pageEnd:{}",pageEnd);
|
|
|
data.remove("page");
|
|
|
data.remove("num");
|
|
|
if (!data.containsKey("month")){
|
|
@@ -392,6 +394,7 @@ public class TimerServiceImpl implements TimerService {
|
|
|
" `month`" +
|
|
|
" order by `month` DESC LIMIT " + pageStart + "," + pageEnd;
|
|
|
|
|
|
+ log.info("sql[1]:{}",sql[1]);
|
|
|
}else {
|
|
|
sql[0] = "SELECT " +
|
|
|
" `month`," +
|
|
@@ -465,6 +468,7 @@ public class TimerServiceImpl implements TimerService {
|
|
|
sql[1] = sql[1] + " GROUP BY `month` ";
|
|
|
sql[0] = sql[0] + " order by `month` DESC LIMIT " + pageStart + "," + pageEnd;
|
|
|
sql[2] = sql[2] + " GROUP BY `month` ";
|
|
|
+ log.info("sql[0]:{}",sql[0]);
|
|
|
|
|
|
}
|
|
|
// Class.forName(driver);
|