bug fix

src/main/java/com/huiju/estateagents/entity/HelpActivity.java

@@ -154,7 +154,7 @@ public class HelpActivity implements Serializable {
      * activityId
      */
     @TableField(exist = false)
-    private Integer activityId;
+    private String activityId;
 
     /**
      * 助力拼团2表和1

src/main/resources/mapper/HelpActivityMapper.xml

@@ -66,11 +66,12 @@
 			SELECT
                 a.city_id as cityId,
 				a.help_activity_id as activityId,
-				a.img as img,
+				a.list_img as img,
                 a.banner_list_img as bannerListImg,
                 a.title as title,
                 a.end_date as endDate,
                 a.`status` as status,
+                a.activity_status as activityStatus,
 				"help" AS type
 			FROM
 				ta_help_activity a
@@ -91,11 +92,12 @@
 				SELECT
                     s.city_id as cityId,
 					s.group_activity_id as activityId,
-					s.main_img as img,
+					s.list_img as img,
                     s.banner_list_img as bannerListImg,
                     s.activity_name as title,
                     s.end_time as endDate,
                     s.status as status,
+                    s.activity_status as activityStatus,
 					"group" AS type
 				FROM
 					ta_share_activity s
@@ -116,11 +118,12 @@
                 SELECT
                 t.city_id as cityId,
                 t.dynamic_id as activityId,
-                t.img_url as img,
+                t.list_img_url as img,
                 t.banner_list_img as bannerListImg,
                 t.title as title,
                 t.end_date as endDate,
                 t.status as status,
+                t.activity_status as activityStatus,
                 "activity" AS type
                 FROM
                 ta_building_dynamic t

src/main/resources/mapper/TaDrainageMapper.xml

@@ -4,6 +4,6 @@
     <update id="updateDrainageToEnd">
         update ta_drainage
         set status = 0
-        where NOW() > end_date
+        where NOW() > end_date and t.status != -1
     </update>
 </mapper>