Merge branch 'dev'
This commit is contained in:
commit
fd98a12cdc
|
@ -8,6 +8,8 @@ import io.renren.modules.date_snapshot.entity.SysDateSnapshotEntity;
|
|||
import io.renren.modules.date_snapshot.service.SysDateSnapshotService;
|
||||
import io.renren.modules.processForm.service.TAbilityApplicationService;
|
||||
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.stereotype.Service;
|
||||
|
||||
|
@ -21,6 +23,8 @@ import java.util.*;
|
|||
*/
|
||||
@Service
|
||||
public class SysDateSnapshotServiceImpl extends CrudServiceImpl<SysDateSnapshotDao, SysDateSnapshotEntity, SysDateSnapshotDTO> implements SysDateSnapshotService {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(SysDateSnapshotServiceImpl.class);
|
||||
@Autowired
|
||||
private TAbilityApplicationService tAbilityApplicationService;
|
||||
@Autowired
|
||||
|
@ -48,9 +52,13 @@ public class SysDateSnapshotServiceImpl extends CrudServiceImpl<SysDateSnapshotD
|
|||
put("count", countApply);
|
||||
put("type", "资源申请量");
|
||||
}});
|
||||
try {
|
||||
if (resultMap.containsKey("total")) {
|
||||
addAll((Collection<? extends Map<String, Object>>) resultMap.get("total"));
|
||||
}
|
||||
} catch (Exception exception) {
|
||||
logger.error("获取资源数量失败", exception);
|
||||
}
|
||||
}};
|
||||
|
||||
sysDateSnapshotDTO.setCreateDate(new Date());
|
||||
|
|
Loading…
Reference in New Issue