|
|
@ -482,7 +482,7 @@ public class StatisticsController extends BaseController {
|
|
|
* @param date
|
|
|
* @param area
|
|
|
* @param level level1_type等级 1:团队 2社区机构 3区级 4市级
|
|
|
* @param index quotoCode 18/19两率 28 13 17
|
|
|
* @param index quotoCode 18/19两率 2 3 4 5 7 9 10 13 17 20 21 28 29
|
|
|
* @param sort 0:升序 1:降序
|
|
|
* @param lowCode
|
|
|
* @return
|
|
|
@ -513,7 +513,7 @@ public class StatisticsController extends BaseController {
|
|
|
for (String idx : indexes) {
|
|
|
if (idx.equals("18") || index.equals("19")) {
|
|
|
result.put("index_" + idx, statisticsAllService.getLowLevelTotalSpecial(date, area, level, idx, sort, lowLevel));
|
|
|
} else if (idx.equals("1") || index.equals("21")) {
|
|
|
} else if ( index.equals("21")) {
|
|
|
result.put("index_" + idx, statisticsAllService.getLowLevelTotal2(date, area, level, idx, sort, lowLevel));
|
|
|
} else if (idx.equals("28")) {
|
|
|
result.put("index_" + idx, statisticsService.getAvgAllInfo(level, area, lowLevel));
|
|
|
@ -582,10 +582,10 @@ public class StatisticsController extends BaseController {
|
|
|
JSONObject result = new JSONObject();
|
|
|
|
|
|
for (String idx : indexes) {
|
|
|
if((idx.equals("21"))||(idx.equals("20"))){
|
|
|
//如果是21或者20的指标 默认找最新的日期
|
|
|
endDate= DateUtil.getStringDate("yyyy-MM-dd");
|
|
|
}
|
|
|
// if((idx.equals("21"))||(idx.equals("20"))){
|
|
|
// //如果是21或者20的指标 默认找最新的日期
|
|
|
// endDate= DateUtil.getStringDate("yyyy-MM-dd");
|
|
|
// }
|
|
|
Long total = statisticsAllService.getIndexTotal(endDate, area, level, idx);
|
|
|
super.infoMessage("原来的总数:" + total);
|
|
|
//如果year不为空 那么因为是到达量 所以要加上一年的数据 21和20的指标不安年度统计 所以不用累加
|
|
|
@ -1443,7 +1443,7 @@ public class StatisticsController extends BaseController {
|
|
|
//社区的转签人数
|
|
|
switchIndex = "39";
|
|
|
//社区的转签原因
|
|
|
switchIndexReson = "47";
|
|
|
switchIndexReson = "30";
|
|
|
//社区的签入
|
|
|
signIn = "38";
|
|
|
//社区的签出
|
|
|
@ -1452,7 +1452,7 @@ public class StatisticsController extends BaseController {
|
|
|
//区和市的转签人数
|
|
|
switchIndex = "39";
|
|
|
//区和市的转签原因
|
|
|
switchIndexReson = "48";
|
|
|
switchIndexReson = "30";
|
|
|
//区和市的签入
|
|
|
signIn = "40";
|
|
|
//区和市的签出
|
