wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev'

This commit is contained in:
wangliwen 2023-01-03 17:31:59 +08:00
parent 011753bb7d a9fd6f2455
commit fd98a12cdc
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
renren-admin/src/main/java/io/renren/modules/date_snapshot/service/impl/SysDateSnapshotServiceImpl.java
View File

@ -8,6 +8,8 @@ import io.renren.modules.date_snapshot.entity.SysDateSnapshotEntity;
import io.renren.modules.date_snapshot.service.SysDateSnapshotService; import io.renren.modules.date_snapshot.service.SysDateSnapshotService;
import io.renren.modules.processForm.service.TAbilityApplicationService; import io.renren.modules.processForm.service.TAbilityApplicationService;
import io.renren.modules.resource.service.ResourceService; import io.renren.modules.resource.service.ResourceService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -21,6 +23,8 @@ import java.util.*;
*/ */
@Service @Service
public class SysDateSnapshotServiceImpl extends CrudServiceImpl<SysDateSnapshotDao, SysDateSnapshotEntity, SysDateSnapshotDTO> implements SysDateSnapshotService { public class SysDateSnapshotServiceImpl extends CrudServiceImpl<SysDateSnapshotDao, SysDateSnapshotEntity, SysDateSnapshotDTO> implements SysDateSnapshotService {
private static final Logger logger = LoggerFactory.getLogger(SysDateSnapshotServiceImpl.class);
@Autowired @Autowired
private TAbilityApplicationService tAbilityApplicationService; private TAbilityApplicationService tAbilityApplicationService;
@Autowired @Autowired
@ -48,8 +52,12 @@ public class SysDateSnapshotServiceImpl extends CrudServiceImpl<SysDateSnapshotD
put("count", countApply); put("count", countApply);
put("type", "资源申请量"); put("type", "资源申请量");
}}); }});
if (resultMap.containsKey("total")) { try {
addAll((Collection<? extends Map<String, Object>>) resultMap.get("total")); if (resultMap.containsKey("total")) {
addAll((Collection<? extends Map<String, Object>>) resultMap.get("total"));
}
} catch (Exception exception) {
logger.error("获取资源数量失败", exception);
} }
}}; }};