Merge branch 'dev' of humingfen/wlyy2.0 into dev

svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/statics/DoorStatisticAnalyzeService.java

@@ -1489,14 +1489,16 @@ public class DoorStatisticAnalyzeService {
        //服务费用
        List<SaveModel> slaveList = elasticsearchUtil.findDateQuotaLevel2(startDate, endDate, area, level, "177", ddlOrZl, slaveKey1,"020", null, lowLevel);
        for (SaveModel saveModel:slaveList1){
            Map<String, Object> map = statisticsUtilService.getMapTurnDownResult2(saveModel,lowLevel,"num");
            for (SaveModel one:slaveList){
                if(statisticsUtilService.compareSaveModel(saveModel,one,lowLevel)){
                    map.put("price",one.getResult1());
                    break;
            if(saveModel.getId() != null) {
                Map<String, Object> map = statisticsUtilService.getMapTurnDownResult2(saveModel, lowLevel, "num");
                for (SaveModel one : slaveList) {
                    if (statisticsUtilService.compareSaveModel(saveModel, one, lowLevel)) {
                        map.put("price", one.getResult1());
                        break;
                    }
                }
                resultList.add(map);
            }
            resultList.add(map);
        }