Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5

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

@@ -44,7 +44,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param sex
      * @return
      */
-    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @Param("buildingId") String buildingId, @Param("name") String name, @Param("tel") String tel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("consultTel")String consultTel);
+    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("consultTel")String consultTel);
 
     /**
      * 导出数据 获取推荐用户数据

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

@@ -398,6 +398,8 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
                 taBuildingDynamic.setPosters(taPosterService.getPostersForTarget(taBuildingDynamic.getDynamicId(), CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
                 taBuildingDynamic.setShareContents(taShareContentService.getPostersForTarget(taBuildingDynamic.getDynamicId(), CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
 
+                //更改状态为已参与
+                taBuildingDynamic.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
 
             }
             return result;

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

@@ -399,7 +399,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
             // 公客
             IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
-            return taRecommendCustomerMapper.getPublicCustomerList(page, building,name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
+            // 公客就不用 buildingId 进行查询
+            return taRecommendCustomerMapper.getPublicCustomerList(page,name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
         } else {
             // 私客
             IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);

src/main/resources/mapper/HelpActivityMapper.xml

@@ -62,9 +62,13 @@
 			FROM
 				ta_help_activity a
 				WHERE
-                  a.org_id =#{orgId}
+                    a.org_id =#{orgId}
+                <if test="buildingId  == null ">
                   and  a.is_main = 1
-                  and  a.city_id = #{cityID}
+                </if>
+                <if test="cityID != null and cityID != ''">
+                      and  a.city_id = #{cityID}
+                </if>
                 <if test="buildingId != null and buildingId != ''">
                   and a.building_id = #{buildingId}
                 </if>
@@ -79,9 +83,13 @@
 				FROM
 					ta_share_activity s
 					WHERE
-                        s.org_id =#{orgId}
+                    s.org_id =#{orgId}
+                <if test="buildingId  == null ">
                     and  s.sort = 1
+                </if>
+                <if test="cityID != null and cityID != ''">
                     and  s.city_id = #{cityID}
+                </if>
                 <if test="buildingId != null and buildingId != ''">
                     and s.building_id = #{buildingId}
                 </if>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -154,7 +154,7 @@ FROM
         b.tel as consultTel,
         c.nickname as recommendName,
         c.tel as recommendTel,
-        (select tpp.name from ta_share_person_from tspf left join ta_person tpp on  tspf.share_person = tpp.person_id where tspf.building_id = #{building} and tspf.is_first_time = 1 and a.person_id = tspf.person_id) as sharePersonName
+        (select if(ifnull(tpp.name, '') != '',tpp.name, tpp.nickname) from ta_share_person_from tspf left join ta_person tpp on  tspf.share_person = tpp.person_id where tspf.is_first_time = 1 and a.person_id = tspf.person_id) as sharePersonName
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
@@ -207,7 +207,8 @@ FROM
 
     <select id="getPublicCustomerList" resultType="com.huiju.estateagents.entity.TaPerson">
         SELECT
-                b.*
+                b.*,
+                (select if(ifnull(tpp.name, '') != '',tpp.name, tpp.nickname) from ta_share_person_from tspf left join ta_person tpp on  tspf.share_person = tpp.person_id where tspf.is_first_time = 1 and b.person_id = tspf.person_id) as sharePersonName
                 FROM
                 ta_person b
                <where>