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

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

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.statistic.entity.GenderStatistic;
 import com.huiju.estateagents.statistic.entity.TsCustomerGenderStatistic;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -21,8 +23,9 @@ public interface TsCustomerGenderStatisticMapper extends BaseMapper<TsCustomerGe
 	/**
 	 * 获取新增客户的男女性别比
 	 * @return
+	 * @param nowDate
 	 */
-	List<GenderStatistic> getNewCustomerSexCount();
+	List<GenderStatistic> getNewCustomerSexCount(@Param("nowDate") LocalDateTime nowDate);
 	
 	/**
 	 * 获取跟进客户的男女性别比

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

@@ -36,7 +36,7 @@ public class TsCustomerGenderStatisticServiceImpl extends ServiceImpl<TsCustomer
 	@Override
 	public void newCustomerSexStatisticDaily(LocalDateTime nowDate) {
 		//获取新增客户的男女性别比和性别数
-		List<GenderStatistic> newCustomerSexList = customerGenderStatisticMapper.getNewCustomerSexCount();
+		List<GenderStatistic> newCustomerSexList = customerGenderStatisticMapper.getNewCustomerSexCount(nowDate);
 		//批量保存
 		saveBatchCustomerSexData(newCustomerSexList,nowDate,CommConstant.CUSTOMER_TYPE_NEW);
 	}

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -608,7 +608,7 @@ FROM
     <select id="getMyCustStatistics" resultType="java.util.Map">
         SELECT
             sum( IF ( STATUS = 4, 1, 0 ) ) AS clinchSum,
-            sum( IF ( STATUS != 4 AND STATUS != 4, 1, 0 ) ) AS followSum
+            sum( IF ( STATUS != 4 AND verify_status = 1, 1, 0 ) ) AS followSum
         FROM
             ta_recommend_customer
         WHERE
@@ -630,6 +630,7 @@ FROM
         AND ( realty_consultant = #{personId} OR realty_consultant = #{userId} )
         <if test="type == 'follow'">
           AND STATUS != 4
+          AND verify_status = 1
             <if test="name != null and name !=''">
                 and (`name` like CONCAT('%',#{name}, '%') or phone like CONCAT('%',#{name}, '%'))
             </if>

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

@@ -14,7 +14,7 @@
         FROM
             ta_recommend_customer
         WHERE
-            `STATUS` = 1
+            date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
             GROUP BY org_id,realty_consultant
     </select>
     <select id="getFollowUpSexCount" resultType="com.huiju.estateagents.statistic.entity.GenderStatistic">

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

@@ -29,8 +29,7 @@
         FROM
             ta_recommend_customer
         WHERE
-            `STATUS` = #{status}
-            AND date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
+             date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
         GROUP BY
             org_id,realty_consultant
     </select>

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

@@ -11,8 +11,7 @@
         FROM
             ta_recommend_customer
         WHERE
-            `STATUS` = #{status}
-            AND date_format( create_date, '%Y-%m' ) = date_format( #{nowDate}, '%Y-%m' )
+            date_format( create_date, '%Y-%m' ) = date_format( #{nowDate}, '%Y-%m' )
         GROUP BY
             org_id,realty_consultant
     </select>