|
@@ -91,7 +91,7 @@ public class KuaiShouAccountReportServiceImpl implements IKuaiShouAccountReportS
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public List<JSONObject> getListDataBy(String mediaId, BigDecimal discount, JSONArray accounts, String startDate, String endDate, int hour, String target, String order) {
|
|
|
|
|
|
+ public List<JSONObject> getListDataBy(String mediaId, JSONArray accounts, String startDate, String endDate, int hour, String target, String order) {
|
|
List<JSONObject> result;
|
|
List<JSONObject> result;
|
|
if (!Check.isNull(target) && "photo_show".equals(target)) {
|
|
if (!Check.isNull(target) && "photo_show".equals(target)) {
|
|
target = "`show`";
|
|
target = "`show`";
|
|
@@ -127,9 +127,7 @@ public class KuaiShouAccountReportServiceImpl implements IKuaiShouAccountReportS
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public List<JSONObject> getExcelDataBy(String filed, String mediaId, JSONArray accounts, String startDate, String endDate, int hour, String target, String order) {
|
|
public List<JSONObject> getExcelDataBy(String filed, String mediaId, JSONArray accounts, String startDate, String endDate, int hour, String target, String order) {
|
|
- filed = filed.replace("photo_show", "`show`")
|
|
|
|
- .replace("keyAction", "key_action")
|
|
|
|
- .replace("keyActionCost", "key_action_cost");
|
|
|
|
|
|
+ filed = filed.replace("photo_show", "`show`");
|
|
List<JSONObject> result;
|
|
List<JSONObject> result;
|
|
if (startDate.equals(endDate)) {
|
|
if (startDate.equals(endDate)) {
|
|
if (startDate.equals(DateUtils.date2Str())) {
|
|
if (startDate.equals(DateUtils.date2Str())) {
|