合并

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

@@ -416,6 +416,7 @@ public class TaBuildingDynamicController extends BaseController {
         dynamic.setStatus(1);
         //活动状态，如果不需要报名则直接置为进行中
         dynamic.setActivityStatus(1);
+        dynamic.setIsEnlist(1);
         //3.5.1版本去除是否需要报名
 //        if (dynamic.getIsEnlist() == 0){
 //            dynamic.setActivityStatus(0);

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

@@ -447,6 +447,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             QueryWrapper<TaUser> userQueryWrapper = new QueryWrapper<>();
             userQueryWrapper.in("user_id",idLists);
             userQueryWrapper.eq("is_consultant", true);
+            userQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
             data = taUserService.page(page,userQueryWrapper);
         }
 

src/main/java/com/huiju/estateagents/statistic/controller/TsCustomerStatisticDailyController.java

@@ -170,7 +170,7 @@ public class TsCustomerStatisticDailyController extends BaseController {
         }
         TaPerson person = taPersons.get(0);
         try {
-            List<TsCustomerStatisticDaily> list = iTaCustomerStatisticDailyService.getDailyList(customerType,getOrgId(request),person.getPersonId());
+            List<TsCustomerStatisticDaily> list = iTaCustomerStatisticDailyService.getDailyList(customerType,getOrgId(request),person.getPersonId(),person.getUserId());
             responseBean.addSuccess(list);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/huiju/estateagents/statistic/controller/TsCustomerStatisticMonthlyController.java

@@ -171,7 +171,7 @@ public class TsCustomerStatisticMonthlyController extends BaseController {
         TaPerson person = taPersons.get(0);
         try {
             //查询月客户分析数据
-            List<TsCustomerStatisticMonthly> result = iTaCustomerStatisticMonthlyService.getCustomerMonthlyList(customerType, getOrgId(request),person.getPersonId());
+            List<TsCustomerStatisticMonthly> result = iTaCustomerStatisticMonthlyService.getCustomerMonthlyList(customerType, getOrgId(request),person.getPersonId(),person.getUserId());
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/huiju/estateagents/statistic/mapper/TsCustomerStatisticDailyMapper.java

@@ -49,9 +49,10 @@ public interface TsCustomerStatisticDailyMapper extends BaseMapper<TsCustomerSta
 	 * @param nowDate
 	 * @param beforeDate
 	 * @param personId
+	 * @param userId
 	 * @return
 	 */
-	List<TsCustomerStatisticDaily> getDailyList(@Param("customerType") String customerType, @Param("orgId") Integer orgId, @Param("nowDate") LocalDateTime nowDate, @Param("beforeDate") LocalDateTime beforeDate,@Param("personId") String personId);
+	List<TsCustomerStatisticDaily> getDailyList(@Param("customerType") String customerType, @Param("orgId") Integer orgId, @Param("nowDate") LocalDateTime nowDate, @Param("beforeDate") LocalDateTime beforeDate, @Param("personId") String personId,@Param("userId") Integer userId);
 	
 	int deleteNowDate(@Param("nowDate") LocalDateTime nowDate,@Param("customerType") String customerType);
 }

src/main/java/com/huiju/estateagents/statistic/mapper/TsCustomerStatisticMonthlyMapper.java

@@ -49,7 +49,8 @@ public interface TsCustomerStatisticMonthlyMapper extends BaseMapper<TsCustomerS
 	 * @param nowDate
 	 * @param beforeDate
 	 * @param personId
+	 * @param userId
 	 * @return
 	 */
-	List<TsCustomerStatisticMonthly> getMonthlyList(@Param("customerType") String customerType, @Param("orgId") Integer orgId, @Param("nowDate") LocalDateTime nowDate, @Param("beforeDate") LocalDateTime beforeDate,@Param("personId") String personId);
+	List<TsCustomerStatisticMonthly> getMonthlyList(@Param("customerType") String customerType, @Param("orgId") Integer orgId, @Param("nowDate") LocalDateTime nowDate, @Param("beforeDate") LocalDateTime beforeDate, @Param("personId") String personId,@Param("userId") Integer userId);
 }

src/main/java/com/huiju/estateagents/statistic/service/ITsCustomerStatisticDailyService.java

@@ -39,7 +39,8 @@ public interface ITsCustomerStatisticDailyService extends IService<TsCustomerSta
 	 * @param customerType
 	 * @param orgId
 	 * @param personId
+	 * @param userId
 	 * @return
 	 */
-	List<TsCustomerStatisticDaily> getDailyList(String customerType, Integer orgId, String personId);
+	List<TsCustomerStatisticDaily> getDailyList(String customerType, Integer orgId, String personId, Integer userId);
 }

src/main/java/com/huiju/estateagents/statistic/service/ITsCustomerStatisticMonthlyService.java

@@ -39,7 +39,8 @@ public interface ITsCustomerStatisticMonthlyService extends IService<TsCustomerS
 	 * @param customerType
 	 * @param orgId
 	 * @param personId
+	 * @param userId
 	 * @return
 	 */
-	List<TsCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId, String personId);
+	List<TsCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId, String personId, Integer userId);
 }

src/main/java/com/huiju/estateagents/statistic/service/impl/TsCustomerStatisticDailyServiceImpl.java

@@ -78,18 +78,38 @@ public class TsCustomerStatisticDailyServiceImpl extends ServiceImpl<TsCustomerS
 	 * @param customerType
 	 * @param orgId
 	 * @param personId
+	 * @param userId
 	 * @return
 	 */
 	@Override
-	public List<TsCustomerStatisticDaily> getDailyList(String customerType, Integer orgId, String personId) {
+	public List<TsCustomerStatisticDaily> getDailyList(String customerType, Integer orgId, String personId, Integer userId) {
 		//当前日期
 		LocalDateTime nowDate = LocalDateTime.now();
 		//31天前的日期
 		LocalDateTime beforeDate = nowDate.plusDays(-31);
 		//获取31天的日期数据
-
-		List<TsCustomerStatisticDaily> list = customerStatisticDailyMapper.getDailyList(customerType,orgId,nowDate,beforeDate,personId);
-		return list;
+		List<TsCustomerStatisticDaily> list = customerStatisticDailyMapper.getDailyList(customerType,orgId,nowDate,beforeDate,personId,userId);
+		//构造31天的数据
+		List<TsCustomerStatisticDaily> newList = new ArrayList<>();
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+		for (int i = 0; i < 31;i++){
+			String newDate = nowDate.plusDays(-i).format(formatter);
+			TsCustomerStatisticDaily tsCustomerStatisticDaily = new TsCustomerStatisticDaily();
+			tsCustomerStatisticDaily.setOrgId(orgId);
+			tsCustomerStatisticDaily.setCustomerNum(0);
+			tsCustomerStatisticDaily.setDay(newDate);
+			tsCustomerStatisticDaily.setCustomerType(customerType);
+			tsCustomerStatisticDaily.setRealtyConsultant(personId);
+			newList.add(tsCustomerStatisticDaily);
+			//合并数据
+			list.forEach(l -> {
+				if (newDate.equals(l.getDay())){
+					tsCustomerStatisticDaily.setCustomerNum(l.getCustomerNum());
+				}
+			});
+		}
+		
+		return newList;
 	}
 	
 	/**

src/main/java/com/huiju/estateagents/statistic/service/impl/TsCustomerStatisticMonthlyServiceImpl.java

@@ -77,17 +77,37 @@ public class TsCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TsCustome
 	 * @param customerType
 	 * @param orgId
 	 * @param personId
+	 * @param userId
 	 * @return
 	 */
 	@Override
-	public List<TsCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId, String personId) {
+	public List<TsCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId, String personId, Integer userId) {
 		//当前日期
 		LocalDateTime nowDate = LocalDateTime.now();
 		//12个月前的日期
 		LocalDateTime beforeDate = nowDate.plusMonths(-12);
-		//获取31天的日期数据
-		List<TsCustomerStatisticMonthly> list = customerStatisticMonthlyMapper.getMonthlyList(customerType,orgId,nowDate,beforeDate,personId);
-		return list;
+		//获取12个月数据
+		List<TsCustomerStatisticMonthly> list = customerStatisticMonthlyMapper.getMonthlyList(customerType,orgId,nowDate,beforeDate,personId,userId);
+		//构造12个月的数据
+		List<TsCustomerStatisticMonthly> newList = new ArrayList<>();
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM");
+		for (int i = 0; i < 12;i++){
+			String newDate = nowDate.plusDays(-i).format(formatter);
+			TsCustomerStatisticMonthly tsCustomerStatisticMonthly = new TsCustomerStatisticMonthly();
+			tsCustomerStatisticMonthly.setCustomerType(customerType);
+			tsCustomerStatisticMonthly.setMonth(newDate);
+			tsCustomerStatisticMonthly.setCustomerNum(0);
+			tsCustomerStatisticMonthly.setOrgId(orgId);
+			tsCustomerStatisticMonthly.setRealtyConsultant(personId);
+			newList.add(tsCustomerStatisticMonthly);
+			list.forEach(l -> {
+				if (newDate.equals(l.getMonth())){
+					tsCustomerStatisticMonthly.setCustomerNum(l.getCustomerNum());
+				}
+			});
+		}
+		
+		return newList;
 	}
 	
 	/**

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -607,7 +607,7 @@ FROM
 
     <select id="getMyCustStatistics" resultType="java.util.Map">
         SELECT
-            sum( IF ( STATUS = 4, 1, 0 ) ) AS clinchSum,
+            sum( IF ( STATUS = 4 AND verify_status = 1, 1, 0 ) ) AS clinchSum,
             sum( IF ( STATUS != 4 AND verify_status = 1, 1, 0 ) ) AS followSum
         FROM
             ta_recommend_customer
@@ -668,15 +668,16 @@ FROM
 
     <select id="getCustomerIntentions" resultType="com.huiju.estateagents.entity.PersonIntention">
         SELECT
-            SUM( intention ) AS intention,
-            building_id,
-            building_name
+            SUM( a.intention ) AS intention,
+            a.building_id,
+            b.building_name
         FROM
-            `ta_person_intention_record`
+            ta_person_intention_record a
+            left join ta_building b on a.building_id = b.building_id
         WHERE
-            person_id = #{personId}
+           a.person_id = #{personId}
         GROUP BY
-            building_id
+            a.building_id
         ORDER BY
             intention DESC
     </select>

src/main/resources/mapper/statistic/TsCustomerGenderStatisticMapper.xml

@@ -14,7 +14,7 @@
         FROM
             ta_recommend_customer
         WHERE
-            date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
+            verify_status = 1
             GROUP BY org_id,realty_consultant
     </select>
     <select id="getFollowUpSexCount" resultType="com.huiju.estateagents.statistic.entity.GenderStatistic">
@@ -52,6 +52,7 @@
                     LEFT JOIN ta_recommend_customer c ON t.person_id = c.person_id
                     AND t.building_id = c.building_id
                     AND t.org_id = c.org_id
+                    AND c.verify_status = 1
                 WHERE
                     t.is_checkin = 1
                 GROUP BY

src/main/resources/mapper/statistic/TsCustomerStatisticDailyMapper.xml

@@ -30,6 +30,7 @@
             ta_recommend_customer
         WHERE
              date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
+             AND verify_status = 1
         GROUP BY
             org_id,realty_consultant
     </select>
@@ -43,6 +44,7 @@
             LEFT JOIN ta_recommend_customer c ON t.person_id = c.person_id
             AND t.building_id = c.building_id
             AND t.org_id = c.org_id
+            AND c.verify_status = 1
         WHERE
             t.is_checkin = #{checkin}
             AND date_format( t.create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
@@ -58,7 +60,7 @@
         WHERE
           org_id = #{orgId}
         AND customer_type = #{customerType}
-        AND realty_consultant = #{personId}
+        AND (realty_consultant = #{personId} or realty_consultant = #{userId})
         AND date_format( create_date, '%Y-%m-%d' ) >= date_format( #{beforeDate}, '%Y-%m-%d' )
         AND date_format( create_date, '%Y-%m-%d' ) &lt;= date_format( #{nowDate}, '%Y-%m-%d' )
         order by `day`

src/main/resources/mapper/statistic/TsCustomerStatisticMonthlyMapper.xml

@@ -12,6 +12,7 @@
             ta_recommend_customer
         WHERE
             date_format( create_date, '%Y-%m' ) = date_format( #{nowDate}, '%Y-%m' )
+            AND verify_status = 1
         GROUP BY
             org_id,realty_consultant
     </select>
@@ -40,6 +41,7 @@
             LEFT JOIN ta_recommend_customer c ON t.person_id = c.person_id
             AND t.building_id = c.building_id
             AND t.org_id = c.org_id
+            AND c.verify_status = 1
         WHERE
             t.is_checkin = #{checkin}
             AND date_format( t.create_date, '%Y-%m' ) = date_format( #{nowDate}, '%Y-%m' )
@@ -54,7 +56,7 @@
         WHERE
           org_id = #{orgId}
         AND customer_type = #{customerType}
-        AND realty_consultant = #{personId}
+        AND (realty_consultant = #{personId} or realty_consultant = #{userId})
         AND date_format( create_date, '%Y-%m-%d' ) >= date_format( #{beforeDate}, '%Y-%m-%d' )
         AND date_format( create_date, '%Y-%m-%d' ) &lt;= date_format( #{nowDate}, '%Y-%m-%d' )
          order by `month`