浏览代码

定向包~查询历史记录添加状态筛选条件

zhaoxian 4 年之前
父节点
当前提交
9cc0caa409

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/controller/KuaishouDirectionalPackageController.java

@@ -137,7 +137,7 @@ public class KuaishouDirectionalPackageController {
     }
 
     /**
-     * 查询定向包推送历史
+     * 编辑定向包
      *
      * @param projectId 账户ID
      * @return org.jeecg.common.api.vo.Result<java.lang.Object>
@@ -290,7 +290,7 @@ public class KuaishouDirectionalPackageController {
                 pageSize = 10;
             }
             PageHelper.startPage(pageNo, pageSize);
-            return kuaishouDirectionalPackageService.queryPushResults(id, accountIds);
+            return kuaishouDirectionalPackageService.queryPushResults(id, accountIds,requestJson.getString("status"));
         } catch (Exception e) {
             log.error("查询推送结果异常", e);
         }

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/mapper/KuaishouDirectionalPckageRelMapper.java

@@ -19,7 +19,7 @@ public interface KuaishouDirectionalPckageRelMapper extends BaseMapper<KuaishouD
 
     void replace(KuaishouDirectionalaPckageRel rel);
 
-    List<JSONObject> queryPushResults(@Param("id") String id, @Param("accountIds") JSONArray accountIds);
+    List<JSONObject> queryPushResults(@Param("id") String id, @Param("accountIds") JSONArray accountIds,@Param("status") String status);
 
     List<JSONObject> getAccountByProjectId(@Param("projectId") Long projectId, @Param("id") String id);
 

+ 3 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/mapper/xml/KuaishouDirectionalPckageRelMapper.xml

@@ -52,6 +52,9 @@
         LEFT JOIN ctop_user_allocation t2 ON t1.rel_id = t2.account_id
         where dir_id = #{id}
         AND rel_type = 'account'
+        <if test=" status!=null">
+            t1.data_status = #{status}
+        </if>
         <if test="accountIds!=null">
             AND rel_id IN
             <foreach item="item" index="index" collection="accountIds"

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/IKuaishouDirectionalPackageService.java

@@ -24,7 +24,7 @@ public interface IKuaishouDirectionalPackageService extends IService<KuaishouDir
 
     Result<Object> pushDirectionalPackage(String id, JSONArray datas);
 
-    Result<Object> queryPushResults(String id, JSONArray accountIds);
+    Result<Object> queryPushResults(String id, JSONArray accountIds,String status);
 
     Result<Object> editPopulation(JSONObject requestJson);
 

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/KuaishouDirectionalPackageServiceImpl.java

@@ -535,8 +535,8 @@ public class KuaishouDirectionalPackageServiceImpl extends ServiceImpl<KuaishouD
     }
 
     @Override
-    public Result<Object> queryPushResults(String id, JSONArray accountIds) {
-        List<JSONObject> list = relMapper.queryPushResults(id, accountIds);
+    public Result<Object> queryPushResults(String id, JSONArray accountIds,String status) {
+        List<JSONObject> list = relMapper.queryPushResults(id, accountIds,status);
         return Result.ok(new PageInfo<>(list));
     }