【双实录入】统计相关接口实现

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml

@@ -435,7 +435,7 @@
             (
             SELECT
                 a.GRID_ID,
-                a.GRID_NAME,
+                d.GRID_NAME,
                 IFNULL( a.REAL_BUILDING, 0 ) AS buildingRealCount,
                 SUM( IFNULL( b.TOTAL_HOUSE_NUM, 0 ) ) AS houseRealCount,
                 SUM( IFNULL( b.REAL_PERSON, 0 ) ) AS personRealCount,
@@ -456,6 +456,7 @@
                     GROUP BY
                         NEIGHBOR_HOOD_ID
                 ) c ON a.ID = c.NEIGHBOR_HOOD_ID
+                INNER JOIN customer_grid d ON a.GRID_ID = d.ID
             WHERE
                 a.DEL_FLAG = '0'
                 AND a.GRID_ID = #{gridId}

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -826,5 +826,5 @@ public interface EpmetUserOpenFeignClient {
      * @Date 2022/6/30 9:35
      */
     @PostMapping("/epmetuser/icresiuser/getIcUserCount")
-    Result<Map<String, Integer>> getIcUserCount(IcUserCountFormDTO formDTO);
+    Result<Map<String, Integer>> getIcUserCount(@RequestBody IcUserCountFormDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -1198,7 +1198,7 @@ public class IcResiUserController implements ResultDataResolver {
      * @Date 2022/6/30 9:35
      */
     @PostMapping("getIcUserCount")
-    public Result<Map<String, Integer>> getIcUserCount(IcUserCountFormDTO formDTO) {
+    public Result<Map<String, Integer>> getIcUserCount(@RequestBody IcUserCountFormDTO formDTO) {
         return new Result<Map<String, Integer>>().ok(icResiUserService.getIcUserCount(formDTO));
     }
 }