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

Feature/xgh/202507迭代

See merge request !3086

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/chat/GroupChatPlanMapper.java

@@ -41,4 +41,6 @@ public interface GroupChatPlanMapper {
     public void updateRemark(GroupChatPlanDTO dto);
 
     public void updateStaffCount(@Param("planId") Long planId,@Param("staffCount") int staffCount) ;
+
+    void updateCancelFlag(@Param("planIdList") List<Long> planIdList);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatPlanServiceImpl.java

@@ -837,6 +837,8 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
         Date end = new Date() ;
         List<GroupChatPlanOwnerLogDTO> sendList = this.groupChatPlanOwnerLogMapper.cancelTimeOutTimer(end) ;
         if(CollectionUtils.isNotEmpty(sendList)) {
+            List<Long> planIdList = sendList.stream().map(dto -> dto.getPlanId()).distinct().collect(Collectors.toList());
+            this.groupChatPlanMapper.updateCancelFlag(planIdList) ;
             for(GroupChatPlanOwnerLogDTO dto : sendList) {
                 this.cancelSend(dto);
             }

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanMapper.xml

@@ -215,4 +215,11 @@
 	<update id="updateStaffCount">
 		update tab_haoban_group_chat_plan set staff_count = #{staffCount} ,  update_time =now()  where plan_id = #{planId}
 	</update>
-</mapper> 
\ No newline at end of file
+
+	<update id="updateCancelFlag">
+		update tab_haoban_group_chat_plan set cancel_time_flag = 1 ,  update_time =now()  where plan_id in
+		<foreach item="item"  collection="planIdList" close=")" index="index" open="(" separator=",">
+			#{item}
+		</foreach>
+	</update>
+</mapper>
\ No newline at end of file

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

@@ -319,7 +319,7 @@
     </update>
 
     <update id="updateCancelFlag">
-        update tab_haoban_qw_moment_plan set cancel_time_flag = 1 where plan_id in
+        update tab_haoban_qw_moment_plan set cancel_time_flag = 1  ,  update_time =now() where plan_id in
         <foreach collection="planIdList" item="item" separator="," open="(" close=")" index="index">
             #{item}
         </foreach>