|
@@ -371,7 +371,8 @@ public class TimerServiceImpl implements TimerService {
|
|
" SUM( net_profit ) net_profit, " +
|
|
" SUM( net_profit ) net_profit, " +
|
|
" SUM( net_profit )/ SUM( income ) net_margin " +
|
|
" SUM( net_profit )/ SUM( income ) net_margin " +
|
|
"FROM " +
|
|
"FROM " +
|
|
- " lanyun_project_analysis " ;
|
|
|
|
|
|
+ " lanyun_project_analysis " +
|
|
|
|
+ "WHERE 1=1 " ;
|
|
sql[2] = "SELECT " +
|
|
sql[2] = "SELECT " +
|
|
" COUNT(*) total_count " +
|
|
" COUNT(*) total_count " +
|
|
"FROM " +
|
|
"FROM " +
|
|
@@ -390,9 +391,6 @@ public class TimerServiceImpl implements TimerService {
|
|
" GROUP BY " +
|
|
" GROUP BY " +
|
|
" `month`" +
|
|
" `month`" +
|
|
" order by `month` DESC LIMIT " + pageStart + "," + pageEnd;
|
|
" order by `month` DESC LIMIT " + pageStart + "," + pageEnd;
|
|
- sql[1] =sql[1] +
|
|
|
|
- " GROUP BY " +
|
|
|
|
- " `month`" ;
|
|
|
|
|
|
|
|
}else {
|
|
}else {
|
|
sql[0] = "SELECT " +
|
|
sql[0] = "SELECT " +
|