|
@@ -358,7 +358,7 @@ public class TimerServiceImpl implements TimerService {
|
|
" WHERE 1=1 " ;
|
|
" WHERE 1=1 " ;
|
|
/*sql获取第一层合计数据*/
|
|
/*sql获取第一层合计数据*/
|
|
sql[1]= "SELECT " +
|
|
sql[1]= "SELECT " +
|
|
- " '合计' as `month` , " +
|
|
|
|
|
|
+ " '总合计' as `month` , " +
|
|
" sum( predict_income ) predict_income," +
|
|
" sum( predict_income ) predict_income," +
|
|
" NULL as project_name, " +
|
|
" NULL as project_name, " +
|
|
" SUM( `open` ) `open`, " +
|
|
" SUM( `open` ) `open`, " +
|
|
@@ -425,7 +425,7 @@ public class TimerServiceImpl implements TimerService {
|
|
" WHERE 1=1";
|
|
" WHERE 1=1";
|
|
/*sql获取第二层合计数据*/
|
|
/*sql获取第二层合计数据*/
|
|
sql[1] = "SELECT " +
|
|
sql[1] = "SELECT " +
|
|
- " '合计' as `month`, " +
|
|
|
|
|
|
+ " '总合计' as `month`, " +
|
|
" sum( predict_income ) predict_income," +
|
|
" sum( predict_income ) predict_income," +
|
|
" NULL as project_name, " +
|
|
" NULL as project_name, " +
|
|
" SUM( `open` ) `open`, " +
|
|
" SUM( `open` ) `open`, " +
|