优化

src/main/java/com/huiju/estateagents/job/JudglActivityTimeJob.java

@@ -53,15 +53,17 @@ public class JudglActivityTimeJob extends BaseController {
      */
     @Scheduled(cron = "* 0/5 * * * ?")
     private void configureTasks() {
+        String time = DateUtils.cutSecond(LocalDateTime.now());
 
+        //判断活动是否开始
+        iTaBuildingDynamicService.updateActivityToUnStart(time);
         //未开始活动更新为已开始
-        String time = DateUtils.cutSecond(LocalDateTime.now());
-        Integer count = iTaBuildingDynamicService.updateUnStartActivity(time);
-        System.out.println("count" + count);
-        logger.debug("JudglActivityTimeJob",count);
+        iTaBuildingDynamicService.updateUnStartActivity(time);
         //进行中活动更新为已结束
         iTaBuildingDynamicService.updateProcessingActivity();
 
+        //判断拼团活动是否开始
+        iTaShareActivityService.updateActivityToUnStart();
         //未开始拼团活动更新为已开始
         iTaShareActivityService.updateUnStartGroupActivity();
         //进行中拼团活动更新为已结束
@@ -71,6 +73,8 @@ public class JudglActivityTimeJob extends BaseController {
         iTaShareRecordService.updateActivityProcessToEnd();
         iTaShareChildRecordService.updateActivityProcessToEnd();
 
+        //判断助力活动是否开始
+        iHelpActivityService.updateActivityToUnStart();
         //未开始助力活动更新为已开始
         iHelpActivityService.updateUnStartHelpActivity();
         //进行中助力活动更新为已结束

src/main/java/com/huiju/estateagents/mapper/HelpActivityMapper.java

@@ -33,6 +33,8 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
      */
     IPage<HelpActivity> helpActivityListPage(IPage<HelpActivity> pg, @Param("cityId")Integer cityId, @Param("buildingId")String buildingId, @Param("title")String title, @Param("startDate")String startDate, @Param("endDate") String endDate, @Param("activityStatus")Integer activityStatus, @Param("orgId")Integer orgId);
 
+    void updateActivityToUnStart();
+
     void updateUnStartHelpActivity();
 
     void updateProcessingHelpActivity();

src/main/java/com/huiju/estateagents/mapper/TaBuildingDynamicMapper.java

@@ -72,6 +72,11 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
      */
     Map<String, Object> selectBuildingDynamicEnlistStatistical(@Param("orgId") Integer orgId);
 
+    /**
+     * 更新未开始的活动
+     */
+    Integer updateActivityToUnStart(@Param("curTime") String curTime);
+
     /**
      * 更新未开始的活动
      */

src/main/java/com/huiju/estateagents/mapper/TaShareActivityMapper.java

@@ -20,6 +20,8 @@ import java.util.List;
 public interface TaShareActivityMapper extends BaseMapper<TaShareActivity> {
     TaShareActivity selectTaShareActivityById(@Param("activityId")Integer activityId);
 
+    void updateActivityToUnStart();
+
     void updateUnStartGroupActivity();
 
     void updateProcessGroupActivity();

src/main/java/com/huiju/estateagents/service/IHelpActivityService.java

@@ -115,6 +115,11 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      */
     List<HelpRecordExport> getHelpRecordExportList(int i, Integer pageSize, Integer helpRecordInitiateId);
 
+    /**
+     * 未开始的助力活动
+     */
+    void updateActivityToUnStart();
+
     /**
      * 开始助力活动
      */

src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java

@@ -87,6 +87,11 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
 
     void setExtendInfo(TaBuildingDynamic taBuildingDynamic, TaPerson taPerson);
 
+    /**
+     * 判断活动是否开始
+     */
+    Integer updateActivityToUnStart(String time);
+
     /**
      * 开始未进行的活动
      */

src/main/java/com/huiju/estateagents/service/ITaShareActivityService.java

@@ -19,6 +19,11 @@ public interface ITaShareActivityService extends IService<TaShareActivity> {
 
     ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String status, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId);
 
+    /**
+     * 判断活动是否开始
+     */
+    void updateActivityToUnStart();
+
     /**
      * 活动未开始更新为进行中
      */

src/main/java/com/huiju/estateagents/service/impl/HelpActivityServiceImpl.java

@@ -196,6 +196,11 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
         return lsit;
     }
 
+    @Override
+    public void updateActivityToUnStart() {
+        taHelpActivityMapper.updateActivityToUnStart();
+    }
+
     @Override
     public void updateUnStartHelpActivity() {
         taHelpActivityMapper.updateUnStartHelpActivity();

src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java

@@ -331,6 +331,11 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         timeCondition(taBuildingDynamic);
     }
 
+    @Override
+    public Integer updateActivityToUnStart(String time) {
+        return buildingDynamicMapper.updateActivityToUnStart(time);
+    }
+
     @Override
     public Integer updateUnStartActivity(String curTime) {
         return buildingDynamicMapper.updateUnStartActivity(curTime);

src/main/java/com/huiju/estateagents/service/impl/TaShareActivityServiceImpl.java

@@ -64,6 +64,11 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
         return responseBean;
     }
 
+    @Override
+    public void updateActivityToUnStart() {
+        taShareActivityMapper.updateActivityToUnStart();
+    }
+
     @Override
     public void updateUnStartGroupActivity() {
         taShareActivityMapper.updateUnStartGroupActivity();

src/main/resources/mapper/HelpActivityMapper.xml

@@ -37,6 +37,13 @@
                   ha.start_date asc
     </select>
 
+    <update id="updateActivityToUnStart">
+        update ta_help_activity
+        set activity_status = 1
+        where
+        NOW() &lt;= start_date  and activity_status != 2
+    </update>
+
     <update id="updateUnStartHelpActivity">
         update ta_help_activity t
         set activity_status = 0
@@ -48,8 +55,7 @@
         update ta_help_activity t
         set activity_status = 2
         where
-             t.activity_status != '2'
-                        and NOW() > t.end_date
+        t.activity_status != '2' and NOW() > t.end_date
     </update>
 
     <select id="selectWxhelpActivityAndGroup" resultType="com.huiju.estateagents.entity.HelpActivity">

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -95,18 +95,25 @@
         where dynamic_id = #{dynamicId,jdbcType=VARCHAR}
     </update>
 
+    <update id="updateActivityToUnStart">
+        update ta_building_dynamic
+        set activity_status = 1
+        where
+        #{curTime} &lt;= enlist_start  and activity_status != 2
+    </update>
+
     <update id="updateUnStartActivity">
         update ta_building_dynamic
         set activity_status = 0
         where
-        #{curTime} &gt;= enlist_start and  #{curTime} &lt;= enlist_end and activity_status = 1
+        #{curTime} &gt;= enlist_start and  #{curTime} &lt;= enlist_end and  activity_status != 2
     </update>
 
     <update id="updateProcessingActivity">
         update ta_building_dynamic
         set activity_status = 2
         where
-        activity_status =0 and NOW() >= end_date
+        NOW() > enlist_end and activity_status  != 2
     </update>
 
     <select id="updateTaBuildingDynamic">

src/main/resources/mapper/TaShareActivityMapper.xml

@@ -15,31 +15,25 @@
         from ta_share_activity t where t.group_activity_id = #{activityId}
     </select>
 
+    <update id="updateActivityToUnStart">
+      update ta_share_activity
+      set activity_status = 1
+      where
+      #{curTime} &lt; start_time and activity_status != 2
+    </update>
+
     <update id="updateUnStartGroupActivity">
         update ta_share_activity t
         set activity_status = 0
-        where t.activity_status != '2'
-            and NOW() BETWEEN t.start_time and t.end_time
+        where
+        t.activity_status != '2' and NOW() BETWEEN t.start_time and t.end_time
     </update>
 
     <update id="updateProcessGroupActivity">
         update ta_share_activity
         set activity_status = 2
         where
-	    group_activity_id in (
-            select
-                group_activity_id
-            from
-                (
-                    select
-                        t.group_activity_id
-                    from
-                        ta_share_activity t
-                    where
-                        t.activity_status != '2'
-                    and NOW() > t.end_time
-                ) s
-	    )
+	    NOW() > end_time and activity_status  != 2
     </update>
 
     <select id="calParticipateNum" resultType="java.lang.Integer">