Procházet zdrojové kódy

【快手视频报表】素材分内外部、增加筛选条件,调试

zhaoxian před 4 roky
rodič
revize
96476125ff

+ 5 - 5
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KsVideoReportCtrl.java

@@ -108,8 +108,8 @@ public class KsVideoReportCtrl {
             if (!Check.isNull(requestBody.getString("order"))) {
                 requestMap.put("order", requestBody.getString("order"));
             }
-            if (!Check.isNull(requestBody.getString("channelName"))) {
-                requestMap.put("channelName", requestBody.getString("channelName"));
+            if (!Check.isNull(requestBody.getInteger("channelType"))) {
+                requestMap.put("channelType", requestBody.getInteger("channelType"));
             }
             PageInfo<JSONObject> listData = ksVideoReportService.getKuaiShouVideoPageReportByMap(requestMap, pageSize, pageNo);
             if (Check.isNull(listData)) {
@@ -244,7 +244,7 @@ public class KsVideoReportCtrl {
                         HttpServletRequest request,
                         HttpServletResponse response) {
         Result<PageInfo<JSONObject>> result = new Result<>();
-    try {
+        try {
 
 
             if (Check.isNull(requestBody)) {
@@ -293,8 +293,8 @@ public class KsVideoReportCtrl {
             if (!Check.isNull(requestBody.getString("order"))) {
                 requestMap.put("order", requestBody.getString("order"));
             }
-            if (!Check.isNull(requestBody.getString("channelName"))) {
-                requestMap.put("channelName", requestBody.getString("channelName"));
+            if (!Check.isNull(requestBody.getInteger("channelType"))) {
+                requestMap.put("channelType", requestBody.getInteger("channelType"));
             }
 
             JSONArray columns2 = new JSONArray();

+ 2 - 5
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KsVideoReportMapper.xml

@@ -40,11 +40,8 @@
         <if test="leaderId !=null and leaderId != ''">
             AND t2.design_team_leader_id = #{leaderId}
         </if>
-        <if test="channelName =='内部'">
-            AND (t2.channel_name = #{channelName} or t2.channel_name = '自产')
-        </if>
-        <if test="channelName =='素造'">
-            AND t2.channel_name = #{channelName}
+        <if test="channelType != null">
+            AND t2.channel_type = #{channelType}
         </if>
         <if test="clipId !=null and clipId != ''">
             AND t2.clip_id = #{clipId}