message:

为党员中心户坐标集合添加注解
为党员中心户数和党群服务站数添加查询条件

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java

@@ -14,6 +14,7 @@ import com.epmet.plugin.power.modules.axis.service.PowerServiceStationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /***
@@ -129,7 +130,7 @@ public class PowerAxisDataVisualController {
      * @date 2022/4/23 10:20
      */
     @PostMapping("kernelHousehold/listPosition")
-    public Result<List<PowerKernelListPostitionResultDTO>> getListPosition(@RequestBody PowerKernelListPostitionFormDTO form, @LoginUser TokenDto tokenDto) {
+    public Result<List<PowerKernelListPostitionResultDTO>> getListPosition(@Valid @RequestBody PowerKernelListPostitionFormDTO form, @LoginUser TokenDto tokenDto) {
         ValidatorUtils.validateEntity(form);
         form.setCustomerId(tokenDto.getCustomerId());
         return new Result().ok(powerKernelHouseholdService.getListPosition(form));

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java

@@ -79,9 +79,9 @@ public interface PowerAxisStructDao extends BaseDao<PowerAxisStructEntity> {
 
     int queryGroupParty(@Param("agencyId") String agencyId, @Param("customerId") String customerId, @Param("groupCateGoryCode") String groupCateGoryCode);
 
-    int getKernelHouseHold(PowerAxisStructViewFormDTO form);
+    int getKernelHouseHold(@Param("agencyId") String agencyId, @Param("customerId") String customerId);
 
-    int getServiceStation(PowerAxisStructViewFormDTO form);
+    int getServiceStation(@Param("agencyId") String agencyId,@Param("customerId") String customerId);
 
     List<PowerAxisStructTreeResultDTO> getStructTree(PowerAxisStructStructTreeFormDTO form);
 

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java

@@ -237,9 +237,9 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
         String groupCateGoryCode = baseDao.getCateGoryCode(form.getCustomerId(), PowerTagLevelEnum.CHILD_SECOND.level(), PowerTagCategoryEnum.STRUCT.category());
         int groupParty = baseDao.queryGroupParty(form.getAgencyId(), form.getCustomerId(), groupCateGoryCode);
         // 查询党员中心户数
-        int kernelHouseHold = baseDao.getKernelHouseHold(form);
+        int kernelHouseHold = baseDao.getKernelHouseHold(form.getAgencyId(), form.getCustomerId());
         // 查询服务站数
-        int serviceStation = baseDao.getServiceStation(form);
+        int serviceStation = baseDao.getServiceStation(form.getAgencyId(),form.getCustomerId());
 
         PowerAxisStructViewResultDTO result = new PowerAxisStructViewResultDTO();
         result.setGridNum(gridParty);

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml

@@ -144,16 +144,18 @@
 	    AND
 	        customer_id = #{customerId}
     </select>
-    <select id="getKernelHouseHold" resultType="java.lang.Integer">
+
+    <select id="getServiceStation" resultType="java.lang.Integer">
         SELECT
-            count( DISTINCT HOUSE_ID )
+            count(*)
         FROM
-            pli_power_kernel_household
+            pli_power_service_station
         WHERE
             del_flag = '0'
-    </select>
-    <select id="getServiceStation" resultType="java.lang.Integer">
-        select count(*) from pli_power_service_station where del_flag = '0'
+        AND
+            AGENCY_ID = #{customerId}
+        AND
+            CUSTOMER_ID = #{customerId}
     </select>
     <select id="getStructTree"
             resultType="com.epmet.plugin.power.dto.axis.result.PowerAxisStructTreeResultDTO">
@@ -228,6 +230,18 @@
         AND
             STRUCT_LEVEL = #{level}
     </select>
+    <select id="getKernelHouseHold" resultType="java.lang.Integer">
+        SELECT
+            count( DISTINCT HOUSE_ID )
+        FROM
+            pli_power_kernel_household
+        WHERE
+            del_flag = '0'
+        AND
+            AGENCY_ID = #{agencyId}
+        AND
+            CUSTOMER_ID = #{customerId}
+    </select>
 
 
 </mapper>