|
@@ -6,6 +6,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
|
|
|
import com.ruoyi.common.core.web.page.PageDomain;
|
|
|
import com.ruoyi.common.core.web.page.TableDataInfo;
|
|
|
import com.ruoyi.common.core.web.page.TableSupport;
|
|
|
+import com.ruoyi.common.security.utils.DictUtils;
|
|
|
import com.sooka.sponest.mobile.event.domain.*;
|
|
|
import com.sooka.sponest.mobile.event.service.AppEventService;
|
|
|
import com.sooka.sponest.mobile.remoteapi.RemoteDataBaseService;
|
|
@@ -202,7 +203,11 @@ public class AppEventServiceImpl implements AppEventService {
|
|
|
Integer pageSize = pageDomain.getPageSize();
|
|
|
TableDataInfo collectList = remoteEventBaseService.getCollectList(pageNum, pageSize, appEventCollect.getUserId(), appEventCollect.getEventName(), appEventCollect.getReportTimeRange());
|
|
|
if(collectList.getCode() == 200){
|
|
|
- return AjaxResult.success(collectList.getRows());
|
|
|
+ List<Map<String,Object>> rows = (List<Map<String, Object>>) collectList.getRows();
|
|
|
+ rows.forEach(row -> {
|
|
|
+ row.put("reportSource",DictUtils.getDictDataByValue("reporting_source",row.get("reportSource").toString()));
|
|
|
+ });
|
|
|
+ return AjaxResult.success();
|
|
|
}else{
|
|
|
return AjaxResult.error(collectList.getCode(), collectList.getMsg());
|
|
|
}
|