|
@@ -104,7 +104,6 @@ public class IndexViewServiceImpl extends BaseServiceImpl implements IndexViewSe
|
|
|
item.setType(tableNameAndType[1]);
|
|
|
}
|
|
|
}
|
|
|
- String[] date = menu.getTimeArr().split(",");
|
|
|
for (Map.Entry<String, List<MenuInfo>> entry : resultMap.entrySet()) {
|
|
|
String subclass = entry.getKey();
|
|
|
IndexViewInfo indexViewInfo = new IndexViewInfo();
|
|
@@ -133,8 +132,11 @@ public class IndexViewServiceImpl extends BaseServiceImpl implements IndexViewSe
|
|
|
MenuInfo menuInfo1 = new MenuInfo();
|
|
|
setSookaDataBase(menuInfo1);
|
|
|
BeanUtils.copyProperties(menuInfo, menuInfo1);
|
|
|
- menuInfo1.setStartDate(date[0]);
|
|
|
- menuInfo1.setEndDate(date[1]);
|
|
|
+ if (menu.getTimeArr()!=null){
|
|
|
+ String[] date = menu.getTimeArr().split(",");
|
|
|
+ menuInfo1.setStartDate(date[0]);
|
|
|
+ menuInfo1.setEndDate(date[1]);
|
|
|
+ }
|
|
|
Long updateCount = indexViewMapper.getBasicDataCount(menuInfo1);
|
|
|
indexViewInfo.setUpdataCount(indexViewInfo.getUpdataCount() + updateCount);
|
|
|
|
|
@@ -324,7 +326,6 @@ public class IndexViewServiceImpl extends BaseServiceImpl implements IndexViewSe
|
|
|
map.put("梨树县","0,100,365,371");
|
|
|
int a = 101;
|
|
|
Map<String,Object> td = new LinkedHashMap<>();
|
|
|
- String[] date = menuInfo.getTimeArr().split(",");
|
|
|
for (Map.Entry<String, Object> m : map.entrySet()){
|
|
|
Long updateCount = 0L;
|
|
|
Long count = 0L;
|
|
@@ -339,8 +340,11 @@ public class IndexViewServiceImpl extends BaseServiceImpl implements IndexViewSe
|
|
|
MenuInfo info1 = new MenuInfo();
|
|
|
setSookaDataBase(info1);
|
|
|
BeanUtils.copyProperties(item,info1);
|
|
|
- info1.setStartDate(date[0]);
|
|
|
- info1.setEndDate(date[1]);
|
|
|
+ if (menuInfo.getTimeArr()!=null){
|
|
|
+ String[] date = menuInfo.getTimeArr().split(",");
|
|
|
+ info1.setStartDate(date[0]);
|
|
|
+ info1.setEndDate(date[1]);
|
|
|
+ }
|
|
|
updateCount += indexViewMapper.getBasicDataCount(info1);
|
|
|
}
|
|
|
td.put("count"+a,count);
|