Browse Source

直播数据报表 报表数据 素材报表 时间问题

zhaoxian 3 years ago
parent
commit
2184379a33

+ 1 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/live/service/impl/LiveDataMaterialServiceImpl.java

@@ -8,7 +8,6 @@ import cn.com.ctop.common.module.utils.LoadFileUtil;
 import cn.com.ctop.common.module.vo.ResFileDTO;
 import cn.com.ctop.kuaishou.modules.live.entity.LiveDataMaterial;
 import cn.com.ctop.kuaishou.modules.live.enums.MaterialEnum;
-import cn.com.ctop.kuaishou.modules.live.enums.ProvinceEnum;
 import cn.com.ctop.kuaishou.modules.live.enums.liveDataUtil;
 import cn.com.ctop.kuaishou.modules.live.mapper.LiveDataMaterialMapper;
 import cn.com.ctop.kuaishou.modules.live.service.ILiveDataMaterialService;
@@ -147,7 +146,7 @@ public class LiveDataMaterialServiceImpl extends ServiceImpl<LiveDataMaterialMap
                     return Result.error("数据缺失,文档中第" + (i + 1) + "行,【" + MaterialEnum.getNameByCode(code) + "】为空项,请补充完善后导入");
                 }
                 if ("statDate".equals(code)) {
-                    value = DateUtils.formatDate(value.replace("/", "-"), DateUtils.NEW_FORMAT);
+                    value = DateUtils.formatDate(value.replace("/", "-"), DateUtils.WEB_FORMAT);
                 }
                 value = liveDataUtil.NUMBER_FORMULA(value);
                 if (value.contains("%")) {

+ 0 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/live/service/impl/LiveDataTouchServiceImpl.java

@@ -8,7 +8,6 @@ import cn.com.ctop.kuaishou.modules.live.enums.liveDataUtil;
 import cn.com.ctop.kuaishou.modules.live.mapper.LiveDataTouchMapper;
 import cn.com.ctop.kuaishou.modules.live.service.ILiveDataTouchService;
 import cn.hutool.core.util.CharsetUtil;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;