傅行帆 5 年前
父节点
当前提交
ebf5ac0832

+ 2
- 0
src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java 查看文件

398
                 taBuildingDynamic.setPosters(taPosterService.getPostersForTarget(taBuildingDynamic.getDynamicId(), CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
398
                 taBuildingDynamic.setPosters(taPosterService.getPostersForTarget(taBuildingDynamic.getDynamicId(), CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
399
                 taBuildingDynamic.setShareContents(taShareContentService.getPostersForTarget(taBuildingDynamic.getDynamicId(), CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
399
                 taBuildingDynamic.setShareContents(taShareContentService.getPostersForTarget(taBuildingDynamic.getDynamicId(), CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
400
 
400
 
401
+                //更改状态为已参与
402
+                taBuildingDynamic.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
401
 
403
 
402
             }
404
             }
403
             return result;
405
             return result;

+ 11
- 3
src/main/resources/mapper/HelpActivityMapper.xml 查看文件

62
 			FROM
62
 			FROM
63
 				ta_help_activity a
63
 				ta_help_activity a
64
 				WHERE
64
 				WHERE
65
-                  a.org_id =#{orgId}
65
+                    a.org_id =#{orgId}
66
+                <if test="buildingId  == null ">
66
                   and  a.is_main = 1
67
                   and  a.is_main = 1
67
-                  and  a.city_id = #{cityID}
68
+                </if>
69
+                <if test="cityID != null and cityID != ''">
70
+                      and  a.city_id = #{cityID}
71
+                </if>
68
                 <if test="buildingId != null and buildingId != ''">
72
                 <if test="buildingId != null and buildingId != ''">
69
                   and a.building_id = #{buildingId}
73
                   and a.building_id = #{buildingId}
70
                 </if>
74
                 </if>
79
 				FROM
83
 				FROM
80
 					ta_share_activity s
84
 					ta_share_activity s
81
 					WHERE
85
 					WHERE
82
-                        s.org_id =#{orgId}
86
+                    s.org_id =#{orgId}
87
+                <if test="buildingId  == null ">
83
                     and  s.sort = 1
88
                     and  s.sort = 1
89
+                </if>
90
+                <if test="cityID != null and cityID != ''">
84
                     and  s.city_id = #{cityID}
91
                     and  s.city_id = #{cityID}
92
+                </if>
85
                 <if test="buildingId != null and buildingId != ''">
93
                 <if test="buildingId != null and buildingId != ''">
86
                     and s.building_id = #{buildingId}
94
                     and s.building_id = #{buildingId}
87
                 </if>
95
                 </if>