|
@@ -1,6 +1,7 @@
|
|
|
package org.jeecg.modules.bytedance.advertise.service.impl;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
import com.github.pagehelper.PageInfo;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
@@ -8,20 +9,16 @@ import org.jeecg.common.api.vo.Result;
|
|
|
import org.jeecg.modules.bytedance.advertise.entity.ByteDanceCreativeWordPackage;
|
|
|
import org.jeecg.modules.bytedance.advertise.entity.ByteDanceGeneralCopywriter;
|
|
|
import org.jeecg.modules.bytedance.advertise.mapper.ByteDanceGeneralCopywriterMapper;
|
|
|
-import org.jeecg.modules.bytedance.advertise.mapper.BytedanceVideoSlogenInfoMapper;
|
|
|
import org.jeecg.modules.bytedance.advertise.service.IByteDanceGeneralCopywriterService;
|
|
|
import org.jeecg.modules.bytedance.common.service.IUserAllocationService;
|
|
|
import org.jeecg.modules.bytedance.common.utils.Check;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
-
|
|
|
import javax.annotation.Resource;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.text.DecimalFormat;
|
|
|
import java.util.ArrayList;
|
|
|
-import java.util.Arrays;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
@@ -40,8 +37,6 @@ public class ByteDanceGeneralCopywriterServiceImpl extends ServiceImpl<ByteDance
|
|
|
|
|
|
@Override
|
|
|
public Result getGeneralCopywriterReport(String userId, String accountId, String keyWord, Integer status, String startTime, String endTime, Integer pageNum, Integer pageSize){
|
|
|
-
|
|
|
-
|
|
|
List<String> accountIds = new ArrayList<>();
|
|
|
//查询普通用户的全量查询,当前用户所有项目
|
|
|
if(Check.isNull(accountId)){
|
|
@@ -60,7 +55,6 @@ public class ByteDanceGeneralCopywriterServiceImpl extends ServiceImpl<ByteDance
|
|
|
accountIds.add(accountId);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
PageHelper.startPage(pageNum,pageSize);
|
|
|
List<Map<String, Object>> generalCopywriteReportList = byteDanceGeneralCopywriterMapper.selectGeneralCopywriterReport(accountIds, keyWord, status, startTime, endTime);
|
|
|
if(Check.isNull(generalCopywriteReportList)){
|