活动

src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java

@@ -784,7 +784,7 @@ public class TaRecommendCustomerController extends BaseController {
      * @param request
      * @return
      */
-    @GetMapping("/wx/inventory/customer/{type}")
+    @GetMapping("/wx/inventory/customer/statistics/{type}")
     @ApiOperation(value = "查询我的客户人数统计", notes = "查询我的客户人数统计")
     public ResponseBean getMyCustFollows(@PathVariable(value = "type") String type,
                                          @RequestParam(value = "pageNumber",defaultValue = "0") Integer pageNumber,

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

@@ -158,7 +158,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param userId
      * @return
      */
-	List<Map<String, Object>> getMyCustStatistics(@Param("personId") String personId,@Param("userId") Integer userId,@Param("orgId") Integer orgId);
+	Map<String, Object> getMyCustStatistics(@Param("personId") String personId,@Param("userId") Integer userId,@Param("orgId") Integer orgId);
     
     /**
      * 获取我的跟进客户数据

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

@@ -601,8 +601,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         }
     
         TaPerson taPerson = taPersons.get(0);
-        List<Map<String,Object>> list = taRecommendCustomerMapper.getMyCustStatistics(taPerson.getPersonId(),taPerson.getUserId(),taPerson.getOrgId());
-        return ResponseBean.success(list);
+        Map<String,Object> map = taRecommendCustomerMapper.getMyCustStatistics(taPerson.getPersonId(),taPerson.getUserId(),taPerson.getOrgId());
+        return ResponseBean.success(map);
     }
     
     /**

src/main/resources/mapper/Activity.xml

@@ -3,21 +3,21 @@
 <mapper namespace="com.huiju.estateagents.activity.mapper.ActivityMapper">
 
     <select id="getActivityList" resultType="com.huiju.estateagents.activity.entity.Activity">
-        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
+        SELECT dynamic_id as id,list_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}
         <if test="cityId != null and cityId != ''">
           and city_id = #{cityId}
         </if>
         UNION  all
-        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
+        SELECT group_activity_id as id,list_img as 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}
         <if test="cityId != null and cityId != ''">
             and city_id = #{cityId}
         </if>
         UNION  all
-        SELECT help_activity_id as id,img as main_img,title,start_date,end_date,weight,activity_status,'help' as type
+        SELECT help_activity_id as id,list_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}
         <if test="cityId != null and cityId != ''">
@@ -31,7 +31,7 @@
             t.dynamic_id AS activityId,
             t.create_date AS createDate,
             IF( t.is_checkin = 1, "已签到", "未签到" ) AS `status`,
-            d.img_url AS mainImg,
+            d.list_img_url AS mainImg,
             d.title,
             d.start_date AS startDate,
             d.enlist_end AS endDate,
@@ -59,7 +59,7 @@
         WHEN t.STATUS = 2 THEN
         "失败"
         END `status`,
-            d.main_img AS mainImg,
+            d.list_img AS mainImg,
             d.activity_name AS title,
             d.start_time AS startDate,
             d.end_time AS endDate,
@@ -87,7 +87,7 @@
                         WHEN t.STATUS = 2 THEN
                         "失败"
                     END `status`,
-            d.img AS mainImg,
+            d.list_img AS mainImg,
             d.title,
             d.start_date AS startDate,
             d.end_date AS endDate,

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -613,7 +613,11 @@ FROM
             ta_recommend_customer
         WHERE
             org_id = #{orgId}
-        AND ( realty_consultant = #{personId} OR realty_consultant = #{userId} )
+        AND ( realty_consultant = #{personId}
+        <if test="userId != null and userId != ''">
+            OR realty_consultant = #{userId}
+        </if>
+        )
     </select>
 
     <select id="getMyCustFollowOrClinch" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">