城市调整

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

@@ -179,6 +179,16 @@ public class StatisticalController extends BaseController {
         return iStatisticalService.selectCityUser(orgId);
     }
 
+    /**
+     * 人员分布城市比例
+     * @return
+     */
+    @GetMapping(value = "/admin/selectCityPerson")
+    public ResponseBean selectCityPerson(HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
+        return iStatisticalService.selectCityPerson(orgId);
+    }
+
     /**
      * 意向用户  首页
      * @return

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

@@ -254,4 +254,6 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @return
      */
     Integer selectTodayRecentlyCount(@Param("orgId") Integer orgId, @Param("nowDate") LocalDateTime nowDate);
+
+    List<Map<String, Object>> selectCityPerson(@Param("orgId") Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/IStatisticalService.java

@@ -215,4 +215,11 @@ public interface IStatisticalService {
      * @return
      */
     ResponseBean changeNewsUserCount(Integer orgId, LocalDate startDate, LocalDate endDate);
+
+    /**
+     * 人员城市分布
+     * @param orgId
+     * @return
+     */
+    ResponseBean selectCityPerson(Integer orgId);
 }

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

@@ -579,6 +579,24 @@ public class StatisticalServiceImpl implements IStatisticalService {
         return ResponseBean.success(tableList);
     }
 
+    /**
+     * 人员城市分布
+     *
+     * @param orgId
+     * @return
+     */
+    @Override
+    public ResponseBean selectCityPerson(Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 城市比例
+        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityPerson(orgId);
+        Map<String, Object> map = new HashMap<>();
+        map.put("selectCityUser", selectCityUser);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
     /**
      * 项目公客排行折线图获取
      * @param orgId

src/main/resources/mapper/TaPersonMapper.xml

@@ -615,6 +615,32 @@ FROM
         AND DATE_FORMAT(tp.create_date,'%Y-%m-%d') = DATE_FORMAT(#{nowDate},'%Y-%m-%d')
     </select>
 
+    <select id="selectCityPerson" resultType="java.util.Map">
+        SELECT
+            d.*,
+            count( d.person_id ) AS cityCount
+        FROM
+        (
+            SELECT
+                t.city AS city,
+                b.shortname AS NAME,
+                b.lng,
+                b.lat,
+                t.person_id
+            FROM
+            ( SELECT * FROM ta_person_position ORDER BY create_time DESC ) t
+                LEFT JOIN ta_person a ON t.person_id = a.person_id
+                INNER JOIN td_city b ON t.citycode = b.citycode
+            WHERE
+                a.org_id = #{orgId}
+                AND a.person_type IN ( 'customer', 'drift', 'estate agent' )
+            GROUP BY
+                t.person_id
+        ) d
+        GROUP BY
+        d.city
+    </select>
+
     <insert id="savePersonPosition" parameterType="com.huiju.estateagents.entity.TaPersonPositon">
         insert into ta_person_position
         <trim prefix="(" suffix=")" suffixOverrides=",">