yumeng 3 vuotta sitten
vanhempi
commit
851e4a26b5

+ 7 - 4
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouReportDailyMaterialMapper.xml

@@ -927,11 +927,10 @@
         GROUP BY
 	    t1.photo_id;
     </select>
-    <select id="getBatchV2VideoList"
-            resultType="cn.com.ctop.kuaishou.modules.batch.entity.vo.KuaiShouVideoGetVo">
+    <select id="getBatchV2VideoList" resultType="cn.com.ctop.kuaishou.modules.batch.entity.vo.KuaiShouVideoGetVo">
         SELECT
         t1.photo_id AS 'photoId',
-        t1.photo_url AS 'url',
+        t1.url AS 'url',
         t1.cover_url AS 'coverUrl',
         t1.signature AS 'signature',
         t1.stat_date as 'statDate',
@@ -940,6 +939,7 @@
         FROM
         ctop_kuaishou_video_get t1
         where t1.account_id = #{accountId}
+        and t1.status = 0
         <if test="photoId != null and photoId != '' ">
             AND t1.photo_id = #{photoId}
         </if>
@@ -962,6 +962,9 @@
         </if>
         order by t1.stat_date desc
     </select>
+
+
+
     <select id="getYesterdayVideo"
             resultType="cn.com.ctop.kuaishou.modules.batch.entity.vo.KuaiShouVideoGetVo">
 
@@ -974,7 +977,7 @@
         t1.channel_type AS 'channelType',
         t1.video_name AS 'photoName'
         FROM
-        `application`.kuaishou_material_video_report_daily_dw t1 t1
+        `application`.kuaishou_material_video_report_daily_dw t1
         WHERE
         t1.account_id = #{accountId}
         AND t1.stat_date = #{date}

+ 6 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/hosting/controller/KuaishouHostingTemplateController.java

@@ -125,7 +125,13 @@ public class KuaishouHostingTemplateController {
         if ("admin".equals(roleCode)) {
             kuaishouHostingTemplate.setUserId(null);
         }
+        String name = kuaishouHostingTemplate.getName();
+        kuaishouHostingTemplate.setName(null);
+
         QueryWrapper<KuaishouHostingTemplate> queryWrapper = QueryGenerator.initQueryWrapper(kuaishouHostingTemplate, req.getParameterMap());
+        if (!Check.isNull(name)) {
+            queryWrapper.like("name", name);
+        }
         queryWrapper.orderByDesc("create_time");
         Page<KuaishouHostingTemplate> page = new Page<KuaishouHostingTemplate>(pageNo, pageSize);
         IPage<KuaishouHostingTemplate> pageList = kuaishouHostingTemplateService.page(page, queryWrapper);