Merge branch 'gzdyh_prod'

xusd

yesterday e9de6064cc94d6bc63685c5e62046ff810b96dab

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/analysis/service/AnalysisService.java

@@ -927,6 +927,17 @@
                            statisticsCirculationDTO.setLzl(Double.parseDouble(df.format(lzl)));
                            statisticsCirculationDTO.setLzz((int) lzz);
                            BeanUtils.copyProperties(statisticsCirculationDTO, statisticsCirculationDTONew);
                            if("本级".equals(region)){
                                if(terms.containsKey("queRoad")){
                                    statisticsCirculationDTO.setGroupCode("queRoad#"+terms.get("queRoad").toString());
                                }else if(terms.containsKey("queArea")){
                                    statisticsCirculationDTO.setGroupCode("queArea#"+terms.get("queArea").toString());
                                }else if(terms.containsKey("queCity")){
                                    statisticsCirculationDTO.setGroupCode("queCity#"+terms.get("queCity").toString());
                                }else if(terms.containsKey("queProv")){
                                    statisticsCirculationDTO.setGroupCode("queProv"+terms.get("queProv").toString());
                                }
                            }
                        }
                    }
                    statisticsCirculationDTONew.setGroupName(region);
@@ -949,6 +960,17 @@
                            double lzl = (lzz + lzsl) / zdj * 100;
                            statisticsCirculationDTO.setLzl(Double.parseDouble(df.format(lzl)));
                            statisticsCirculationDTO.setLzz((int) lzz);
                            if("本级".equals(region)){
                                if(terms.containsKey("queRoad")){
                                    statisticsCirculationDTO.setGroupCode("queRoad#"+terms.get("queRoad").toString());
                                }else if(terms.containsKey("queArea")){
                                    statisticsCirculationDTO.setGroupCode("queArea#"+terms.get("queArea").toString());
                                }else if(terms.containsKey("queCity")){
                                    statisticsCirculationDTO.setGroupCode("queCity#"+terms.get("queCity").toString());
                                }else if(terms.containsKey("queProv")){
                                    statisticsCirculationDTO.setGroupCode("queProv#"+terms.get("queProv").toString());
                                }
                            }
                        }
                    }
                    if (flag) {