合并

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

@@ -220,6 +220,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("phone", taRecommendCustomer.getPhone());
         queryWrapper.eq("building_id",taRecommendCustomer.getBuildingId());
+        queryWrapper.in("verify_status",CommConstant.VERIFY_AGREE,CommConstant.VERIFY_READY);
         List<TaRecommendCustomer> result = taRecommendCustomerMapper.selectList(queryWrapper);
         if (null != result && result.size() > 0) {
             return ResponseBean.error("当前客户已被推荐, 不能再次推荐", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -301,6 +302,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         queryWrapper.eq("name", taRecommendCustomer.getName());
         queryWrapper.eq("phone", taRecommendCustomer.getPhone());
         queryWrapper.eq("building_id",taRecommendCustomer.getBuildingId());
+        queryWrapper.in("verify_status",CommConstant.VERIFY_AGREE,CommConstant.VERIFY_READY);
         List<TaRecommendCustomer> result = taRecommendCustomerMapper.selectList(queryWrapper);
         if (null != result && result.size() > 0) {
             return ResponseBean.error("当前客户已被报备, 不能再次报备", ResponseBean.ERROR_ILLEGAL_PARAMS);

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

@@ -86,6 +86,7 @@ public class TsCustomerStatisticDailyServiceImpl extends ServiceImpl<TsCustomerS
 		//31天前的日期
 		LocalDateTime beforeDate = nowDate.plusDays(-31);
 		//获取31天的日期数据
+
 		List<TsCustomerStatisticDaily> list = customerStatisticDailyMapper.getDailyList(customerType,orgId,nowDate,beforeDate);
 		return list;
 	}

src/main/resources/mapper/TaBuildingMapper.xml

@@ -196,7 +196,7 @@
 
     <select id="getBuildingListById" resultType="com.huiju.estateagents.entity.TaBuilding">
       select * from ta_building t where t.building_id in (
-	    select t.building_id from ta_goods t where t.org_id = #{orgId} and t.city_id = #{cityId} group by t.building_id
+	    select t.building_id from ta_goods t where t.org_id = #{orgId} and t.city_id = #{cityId} and `status`=1 group by t.building_id
       )
     </select>
 

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

@@ -46,7 +46,7 @@
                     t.enlist_id,
                     c.*
                 FROM
-                    ta_activity_dynamic_enlist t
+                    ts_activity_dynamic_enlist t
                     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

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.huiju.estateagents.statistic.mapper.TsCustomerStatisticDailyMapper">
 
     <delete id="deleteNowDate">
-        delete from ta_customer_statistic_daily
+        delete from ts_customer_statistic_daily
         where customer_type = #{customerType}
         AND date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
     </delete>
@@ -13,7 +13,7 @@
             org_id,
             count( DISTINCT ( customer_id ) ) as customer_num
         FROM
-            ta_customer_follow_up_record
+            ts_customer_follow_up_record
         WHERE
             date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
         GROUP BY
@@ -37,7 +37,7 @@
             count( DISTINCT ( c.customer_id ) ) as customer_num,
             c.org_id
         FROM
-            ta_activity_dynamic_enlist t
+            ts_activity_dynamic_enlist t
             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
@@ -52,7 +52,7 @@
         SELECT
           *
         FROM
-          ta_customer_statistic_daily
+          ts_customer_statistic_daily
         WHERE
           org_id = #{orgId}
         AND customer_type = #{customerType}

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

@@ -22,7 +22,7 @@
             org_id,
             count( DISTINCT ( customer_id ) ) as customer_num
         FROM
-            ta_customer_follow_up_record
+            ts_customer_follow_up_record
         WHERE
             date_format( create_date, '%Y-%m' ) = date_format( #{nowDate}, '%Y-%m' )
         GROUP BY
@@ -34,7 +34,7 @@
             count( DISTINCT ( c.customer_id ) ) as customer_num,
             c.org_id
         FROM
-            ta_activity_dynamic_enlist t
+            ts_activity_dynamic_enlist t
             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
@@ -48,7 +48,7 @@
         SELECT
           *
         FROM
-          ta_customer_statistic_monthly
+          ts_customer_statistic_monthly
         WHERE
           org_id = #{orgId}
         AND customer_type = #{customerType}