|
@@ -67,7 +67,6 @@ import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.Objects;
|
|
|
import java.util.Set;
|
|
|
-import java.util.concurrent.TimeUnit;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
@@ -1124,16 +1123,15 @@ public class ReportExportServiceImpl implements ReportExportService {
|
|
|
// 服务周期取 积分包领取审核通过时间~管理员审核积分包时最后审核通过的时间
|
|
|
Map<String, String> serviceTimeRangeMap = wmScorePackageStatusService.getServiceTimeRange(wmScorePackage1);
|
|
|
excelMap.put("service_date", serviceTimeRangeMap.get("service_start_date") + "至" + serviceTimeRangeMap.get("service_end_date"));
|
|
|
-// excelMap.put("service_date", stringMap.get("mindate") + "至" + stringMap.get("maxdate"));
|
|
|
try {
|
|
|
minDateStr = serviceTimeRangeMap.get("service_start_date").substring(5, 7);
|
|
|
maxDateStr = serviceTimeRangeMap.get("service_end_date").substring(5, 7);
|
|
|
|
|
|
- } catch (Exception ex) {
|
|
|
- ex.printStackTrace();
|
|
|
+ } catch (Exception ignored) {
|
|
|
}
|
|
|
excelMap.put("tMoney", stringMap.get("sumscore") + "");
|
|
|
- excelMap.put("report_users", stringMap.get("realname") + "");
|
|
|
+ Object realname = stringMap.get("realname");
|
|
|
+ excelMap.put("report_users", Objects.nonNull(realname) ? realname.toString() : "");
|
|
|
|
|
|
|
|
|
String ruleDate = wmScorePackage1.getBelongDate();
|