|
@@ -996,14 +996,15 @@ public class CustomDisplayServiceImpl implements CustomDisplayService {
|
|
|
String censusDate;
|
|
|
for (Map<String,Object> one : dmaList){
|
|
|
Long dmaId = Long.parseLong(String.valueOf(one.get("id")));
|
|
|
- Calendar cal = Calendar.getInstance();
|
|
|
- cal.add(Calendar.DATE,-1);
|
|
|
List<Map<String,Object>> leakageList;
|
|
|
if(dmaLevel == 3){
|
|
|
censusDate = new SimpleDateFormat( "yyyy").format(new Date());
|
|
|
one.put("data",customDisplayMapper.getLevelDmaLeak(dmaId,null,null,censusDate));
|
|
|
}else {
|
|
|
- censusDate = new SimpleDateFormat( "yyyy-MM").format(cal.getTime());
|
|
|
+ Calendar calendar = Calendar.getInstance();
|
|
|
+
|
|
|
+ calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1);
|
|
|
+ censusDate = new SimpleDateFormat( "yyyy-MM").format(calendar.getTime());
|
|
|
leakageList = customDisplayMapper.getLevelDmaLeak(dmaId,null,censusDate,null);
|
|
|
String leakageRate = "";
|
|
|
for(Map<String,Object> leakageOne : leakageList){
|