Pārlūkot izejas kodu

通用文案修改

yangzian 3 gadi atpakaļ
vecāks
revīzija
315fa39d30

+ 3 - 15
jeecg-boot-bytedance/src/main/java/org/jeecg/modules/bytedance/advertise/mapper/xml/ByteDanceGeneralCopywriterMapper.xml

@@ -2,31 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.bytedance.advertise.mapper.ByteDanceGeneralCopywriterMapper">
     <select id="selectGeneralCopywriterReport" resultType="java.util.HashMap">
-
-
-
-
         SELECT
             a.id,
             a.status,
             a.account_id as accountId,
-            d.creative_id as creativeId,
-            a.text_copywriter AS textCopywriter,
-            count(*) AS creativeCount,
-            sum(d.cost) AS sumCost,
-            sum(d.show_num) AS sumShowMaterial,
-            sum(d.click) AS sumClick,
-            sum(d.show_num) AS sumConvertMaterial
+            a.text_copywriter AS textCopywriter
         FROM
             ctop_bytedance_general_copywriter a
-        LEFT JOIN ctop_bytedance_creative b ON a.text_copywriter = b.title and a.account_id = b.account_id
-        LEFT JOIN ctop_bytedance_report_creative_daily d ON b.id = d.creative_id
         WHERE
             1 = 1
             <if test="status!=null">and a.`status` = #{status}</if>
             <if test="keyWord!=null and keyWord!=''">and a.text_copywriter like concat('%',#{keyWord},'%')</if>
-            <if test="startTime!=null and startTime!=''">and STR_TO_DATE(d.stat_datetime,'%Y-%m-%d') &gt;= STR_TO_DATE(#{startTime},'%Y-%m-%d')</if>
-            <if test="endTime!=null and endTime!=''">and STR_TO_DATE(d.stat_datetime,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')</if>
+            <if test="startTime!=null and startTime!=''">and STR_TO_DATE(a.create_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{startTime},'%Y-%m-%d')</if>
+            <if test="endTime!=null and endTime!=''">and STR_TO_DATE(a.create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')</if>
         <if test="accountIds!=null and accountIds!=''">
             AND a.account_id IN
             <foreach item="item" index="index" collection="accountIds"

+ 1 - 7
jeecg-boot-bytedance/src/main/java/org/jeecg/modules/bytedance/advertise/service/impl/ByteDanceGeneralCopywriterServiceImpl.java

@@ -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)){

+ 1 - 8
jeecg-boot-module-system/src/main/java/org/jeecg/modules/bytedance/advertise/controller/BytedanceGeneralCopywriterController.java

@@ -8,10 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.bytedance.advertise.entity.ByteDanceCreativeWordPackage;
 import org.jeecg.modules.bytedance.advertise.entity.ByteDanceGeneralCopywriter;
@@ -35,9 +33,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
 import java.net.URLDecoder;
-import java.text.DecimalFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -148,11 +144,8 @@ public class BytedanceGeneralCopywriterController {
                                       @RequestParam(value = "endTime",defaultValue = "") String endTime,
                                       @RequestParam(value = "pageNo", defaultValue="1") Integer pageNo,
                                       @RequestParam(value = "pageSize", defaultValue="10") Integer pageSize,
-                                      @RequestParam(value = "status",required = false)  Integer status
-
-    ) {
+                                      @RequestParam(value = "status",required = false)  Integer status) {
         try {
-
             String roleCode = sysRoleService.getRoleCodeByUserId(userId);
             if (Check.isNull(roleCode)){
                 return Result.errorMsg("请输入正确的用户id。");