傅行帆 5 anos atrás
pai
commit
5f87a76def

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java Ver arquivo

@@ -259,7 +259,7 @@ public class TaShareActivityController extends BaseController {
259 259
         }
260 260
 
261 261
         QueryWrapper<TaNews> newsQueryWrapper = new QueryWrapper<>();
262
-        newsQueryWrapper.eq("group_acticity_id", taShareActivity.getGroupActivityId());
262
+        newsQueryWrapper.eq("group_activity_id", taShareActivity.getGroupActivityId());
263 263
         if (iTaShareActivityService.updateById(taShareActivity)){
264 264
             responseBean.addSuccess("成功");
265 265
         }else {

+ 1
- 1
src/main/java/com/huiju/estateagents/service/impl/TaShareActivityServiceImpl.java Ver arquivo

@@ -44,7 +44,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
44 44
         queryWrapper.eq(endTime != null, "end_time", endTime);
45 45
         queryWrapper.eq(orgId != null, "org_id", orgId);
46 46
         queryWrapper.eq(cityId != null, "city_id", cityId);
47
-        queryWrapper.orderByDesc("group_acticity_id");
47
+        queryWrapper.orderByDesc("group_activity_id");
48 48
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);
49 49
 
50 50
         responseBean.addSuccess(taNewsIPage);

+ 1
- 1
src/main/resources/mapper/Activity.xml Ver arquivo

@@ -5,7 +5,7 @@
5 5
     <select id="getActivityList" resultType="com.huiju.estateagents.activity.entity.Activity">
6 6
         SELECT dynamic_id as id,img_url as main_img,title,start_date as start_date,enlist_end as end_date,weight,activity_status,'dynamic' as type FROM ta_building_dynamic WHERE org_id = #{orgId}  and `status` = #{status}
7 7
         UNION  all
8
-        SELECT group_acticity_id as id,main_img,activity_name as title,start_time as start_date,end_time as end_date,weight,activity_status,'group' as type from ta_share_activity WHERE org_id = #{orgId} and `status` = #{status}
8
+        SELECT group_activity_id as id,main_img,activity_name as title,start_time as start_date,end_time as end_date,weight,activity_status,'group' as type from ta_share_activity WHERE org_id = #{orgId} and `status` = #{status}
9 9
         UNION  all
10 10
         SELECT help_activity_id as id,img as main_img,title,start_date,end_date,weight,activity_status,'help' as type from ta_help_activity WHERE org_id = #{orgId} and `status` = #{status}
11 11
         ORDER BY weight desc,activity_status,start_date

+ 3
- 3
src/main/resources/mapper/TaShareActivityMapper.xml Ver arquivo

@@ -12,12 +12,12 @@
12 12
         t.share_id,
13 13
         t.poster_id,
14 14
         t.status
15
-        from ta_share_activity t where t.group_acticity_id = #{activityId}
15
+        from ta_share_activity t where t.group_activity_id = #{activityId}
16 16
     </select>
17 17
 
18 18
     <update id="updateUnStartGroupActivity">
19 19
         update ta_share_activity t set t.activity_status = 0
20
-        where t.group_acticity_id in
20
+        where t.group_activity_id in
21 21
         <foreach collection="list" item="item" open="(" close=")" separator=",">
22 22
             #{item}
23 23
         </foreach>
@@ -25,7 +25,7 @@
25 25
 
26 26
     <update id="updateEndGroupActivity">
27 27
         update ta_share_activity t set t.activity_status = 2
28
-        where t.group_acticity_id in
28
+        where t.group_activity_id in
29 29
         <foreach collection="list" item="item" open="(" close=")" separator=",">
30 30
             #{item}
31 31
         </foreach>

+ 2
- 2
src/main/resources/mapper/TaShareRecordMapper.xml Ver arquivo

@@ -62,7 +62,7 @@
62 62
         t.verification_status,
63 63
         t.verification_code
64 64
         from ta_share_record t
65
-        left join ta_share_activity a on t.group_activity_id = a.group_acticity_id
65
+        left join ta_share_activity a on t.group_activity_id = a.group_activity_id
66 66
         where 1=1
67 67
         <if test="status !=null and status != ''">
68 68
             and t.status = #{status}
@@ -121,7 +121,7 @@
121 121
             a.end_time AS end_date
122 122
         FROM
123 123
             ta_share_record t
124
-            LEFT JOIN ta_share_activity a ON t.group_activity_id = a.group_acticity_id
124
+            LEFT JOIN ta_share_activity a ON t.group_activity_id = a.group_activity_id
125 125
         WHERE
126 126
             t.org_id = #{orgId}
127 127
             AND t.person_id = #{personId}