Merge branch '20250522-wyp-qwPlanSubChannel' of Server/growth-manager into master

api-module/src/main/java/com/tzld/piaoquan/api/dao/mapper/contentplatform/ext/ContentPlatformDataStatMapperExt.java

@@ -60,7 +60,7 @@ public interface ContentPlatformDataStatMapperExt {
 
     Integer getQwSubChannelDatastatCount(@Param("param") QwDatastatListParam param, @Param("createAccountId") Long createAccountId);
 
-    List<ContentPlatformQwDataStatReplyTotal> getQwSubChannelDatastatList(@Param("param") QwDatastatListParam param,
+    List<ContentPlatformQwDataStatSubChannel> getQwSubChannelDatastatList(@Param("param") QwDatastatListParam param,
                                                                           @Param("createAccountId") Long createAccountId,
                                                                           @Param("offset") int offset,
                                                                           @Param("pageSize") Integer pageSize);

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/impl/ContentPlatformDatastatServiceImpl.java

@@ -237,11 +237,12 @@ public class ContentPlatformDatastatServiceImpl implements ContentPlatformDatast
         if (count == 0) {
             return result;
         }
-        List<ContentPlatformQwDataStatReplyTotal> datastatList = dataStatMapperExt.getQwSubChannelDatastatList(param,
+        List<ContentPlatformQwDataStatSubChannel> datastatList = dataStatMapperExt.getQwSubChannelDatastatList(param,
                 user.getId(), offset, param.getPageSize());
         List<QwDatastatItemVO> list = datastatList.stream().map(datastat -> {
             QwDatastatItemVO vo = new QwDatastatItemVO();
             vo.setDateStr(datastat.getDateStr());
+            vo.setSubChannel(datastat.getSubChannel());
             vo.setFirstLevel(datastat.getFirstLevelCount());
             vo.setScore(datastat.getScore());
             return vo;

api-module/src/main/resources/mapper/contentplatform/ext/ContentPlatformDataStatMapperExt.xml

@@ -136,8 +136,8 @@
     </select>
 
     <select id="getQwSubChannelDatastatList"
-            resultType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformQwDataStatReplyTotal">
-        select date_str, sub_channel as channel, first_level_count, score
+            resultType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformQwDataStatSubChannel">
+        select date_str, sub_channel, first_level_count, score
         from content_platform_qw_datastat_sub_channel
         where create_account_id = #{createAccountId}
         order by date_str desc