Merge branch 'feature/xgh/202506迭代' into 'developer'

朋友圈数据

See merge request !3014

haoban-manage3-service/src/main/resources/mapper/moment/qwMomentPlanMapper.xml

@@ -33,6 +33,8 @@
         <result column="task_clerk_num" property="taskClerkNum" />
         <result column="moment_id" property="momentId" />
         <result column="media_link_flag" property="mediaLinkFlag" />
+        <result column="analyse_flag" property="analyseFlag" />
+        <result column="analyse_day" property="analyseDay" />
     </resultMap>
     <sql id="Base_Column_List">
         plan_id,
@@ -62,7 +64,7 @@
 	  total_like_count,
 	  total_comment_count,
 	  qw_jobid,
-	  exec_rate , task_clerk_num , moment_id , media_link_flag
+	  exec_rate , task_clerk_num , moment_id , media_link_flag , analyse_flag , analyse_day
     </sql>
     <!-- ===================== 新增 ======================== -->
     <insert id="insert">
@@ -91,7 +93,7 @@
             total_like_count,
             total_comment_count,
             qw_jobid,
-            exec_rate , media_link_flag
+            exec_rate , media_link_flag , analyse_flag , analyse_day
         )VALUES(
                    #{planId,jdbcType=BIGINT},
                    #{title,jdbcType=VARCHAR},
@@ -117,7 +119,7 @@
                    #{totalLikeCount,jdbcType=INTEGER},
                    #{totalCommentCount,jdbcType=INTEGER},
                    #{qwJobid,jdbcType=VARCHAR},
-                   #{execRate,jdbcType=INTEGER} , #{mediaLinkFlag}
+                   #{execRate,jdbcType=INTEGER} , #{mediaLinkFlag} , #{analyseFlag} , #{analyseDay}
                )
   </insert>
 
@@ -166,6 +168,12 @@
             <if test="null != mediaLinkFlag">
                 media_link_flag=#{mediaLinkFlag},
                 </if>
+            <if test="null != analyseFlag">
+                analyse_flag= #{analyseFlag},
+            </if>
+            <if test="null != analyseDay">
+                analyse_day= #{analyseDay},
+            </if>
     </set>
         where plan_id =#{planId}
   </update>

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/moment/QwMomentDataController.java

@@ -161,7 +161,8 @@ public class QwMomentDataController {
         task.setFileName(fileName);
         task.setChannelName(TaskTypeEnum.QYWX_MOMENT.getName());
         task.setBucketName(BucketNameEnum.REPORT_50000.getName());
-        task.setSearchDataParams(JSON.toJSONStringWithDateFormat(qo, DatePattern.NORM_DATETIME_PATTERN));
+        json.put("pageSize",1000) ;
+        task.setSearchDataParams(json.toJSONString());
         task.setHandler(momentDataMemberExcelHandler);
         JSONResponse jsonResponse = DownloadTaskUtil.createDownloadTask(task);
         final String reportId;
@@ -245,7 +246,8 @@ public class QwMomentDataController {
         task.setFileName(fileName);
         task.setChannelName(TaskTypeEnum.QYWX_MOMENT.getName());
         task.setBucketName(BucketNameEnum.REPORT_50000.getName());
-        task.setSearchDataParams(JSON.toJSONStringWithDateFormat(qo, DatePattern.NORM_DATETIME_PATTERN));
+        json.put("pageSize",1000) ;
+        task.setSearchDataParams(json.toJSONString());
         task.setHandler(momentDataOrderExcelHandler);
         JSONResponse jsonResponse = DownloadTaskUtil.createDownloadTask(task);
         final String reportId;
@@ -333,7 +335,8 @@ public class QwMomentDataController {
         task.setFileName(fileName);
         task.setChannelName(TaskTypeEnum.QYWX_MOMENT.getName());
         task.setBucketName(BucketNameEnum.REPORT_50000.getName());
-        task.setSearchDataParams(JSON.toJSONStringWithDateFormat(qo, DatePattern.NORM_DATETIME_PATTERN));
+        json.put("pageSize",1000) ;
+        task.setSearchDataParams(json.toJSONString());
         task.setHandler(momentDataClickExcelHandler);
         JSONResponse jsonResponse = DownloadTaskUtil.createDownloadTask(task);
         final String reportId;