bug

src/main/java/com/huiju/estateagents/entity/TdWxDict.java

@@ -1,11 +1,13 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>

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

@@ -339,8 +339,11 @@ public class StatisticalServiceImpl implements IStatisticalService {
             e.setFromData(fromSum);
             e.setRegisterSum(registerSum);
         });
-
-        responseBean.addSuccess(tdWxDicts);
+        Map<String,Object> map = new HashMap<>();
+        map.put("tdWxDicts",tdWxDicts);
+        List<TsPersonFromStatistic> tableList = tsPersonFromStatisticMapper.selectPersonFromGroupByData(orgId,startDate,endDate);
+        map.put("list",tableList);
+        responseBean.addSuccess(map);
         return responseBean;
     }
 

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

@@ -23,4 +23,6 @@ public interface TsPersonFromStatisticMapper extends BaseMapper<TsPersonFromStat
     List<TsPersonFromStatistic> selectPersonFrom(Integer orgId, LocalDate startDate, LocalDate endDate);
 
     List<TsPersonFromStatistic> selectPersonFromGroupByDay(Integer orgId, LocalDate startDate, LocalDate endDate);
+
+    List<TsPersonFromStatistic> selectPersonFromGroupByData(Integer orgId, LocalDate startDate, LocalDate endDate);
 }

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

@@ -21,6 +21,7 @@
         <if test="startDate == null or endDate == null">
             AND tp.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
+
     </select>
     <select id="selectPersonFromGroupByDay"
             resultType="com.huiju.estateagents.statistic.entity.TsPersonFromStatistic">
@@ -41,4 +42,25 @@
         GROUP BY
             DATE_FORMAT( tp.create_date, '%Y-%m-%d' )
     </select>
+    <select id="selectPersonFromGroupByData"
+            resultType="com.huiju.estateagents.statistic.entity.TsPersonFromStatistic">
+        SELECT
+        sum( tp.from_num ) AS from_num,
+        sum( tp.registered_num ) AS registered_num,
+        DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) AS create_time,
+        tp.scene_type
+        FROM
+        ts_person_from_statistic tp
+        WHERE
+        tp.org_id = #{orgId}
+        <if test="startDate != null or endDate != null">
+            AND  tp.create_date BETWEEN #{startDate} and #{endDate}
+        </if>
+        <if test="startDate == null or endDate == null">
+            AND tp.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
+        </if>
+        GROUP BY
+        DATE_FORMAT( tp.create_date, '%Y-%m-%d' ),
+        tp.scene_type
+    </select>
 </mapper>