Merge remote-tracking branch 'origin/dev_special_subject' into dev_special_subject

# Conflicts:
#	epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
#	epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -353,6 +353,15 @@ public interface GovOrgOpenFeignClient {
     @GetMapping(value = "/gov/org/customeragency/getareacodeswitch/{customerId}")
     Result<String> getAreaCodeSwitch(@PathVariable("customerId")String customerId);
 
+    /**
+     * @Description  根据网格ID查询pids
+     * @Param gridId
+     * @author zxc
+     * @date 2021/7/16 9:52 上午
+     */
+    @PostMapping(value = "/gov/org/customergrid/pidsbygrid")
+    Result<String> selectPidsByGridId(@RequestParam("gridId") String gridId);
+
     /**
      * 工作人员的个人信息
      * @param fromDTO

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -214,4 +214,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     public Result<MineResultDTO> queryStaffProfile(StaffInfoFromDTO fromDTO) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "mine", fromDTO);
     }
+
+    @Override
+    public Result<String> selectPidsByGridId(String gridId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectPidsByGridId", gridId);
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java

@@ -241,4 +241,15 @@ public class CustomerGridController {
         List<String> resultDTOS = customerGridService.listGridIdsInCommunity(gridId);
         return new Result<List<String>>().ok(resultDTOS);
     }
+
+    /**
+     * @Description  根据网格ID查询pids
+     * @Param gridId
+     * @author zxc
+     * @date 2021/7/16 9:52 上午
+     */
+    @PostMapping("pidsbygrid")
+    public Result<String> selectPidsByGridId(@RequestParam("gridId") String gridId){
+        return new Result<String>().ok(customerGridService.selectPidsByGridId(gridId));
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java

@@ -268,4 +268,12 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @date 2021/4/19 11:56 上午
      */
     CustomerGridDTO getGridBaseInfoById(@Param("gridId") String gridId);
+
+    /**
+     * @Description  根据网格ID查询pids
+     * @Param gridId
+     * @author zxc
+     * @date 2021/7/16 9:52 上午
+     */
+    String selectPidsByGridId(@Param("gridId")String gridId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java

@@ -287,4 +287,12 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      * @date 2021/4/19 11:53 上午
      */
     Result<CustomerGridDTO> getBaseInfo(CustomerGridFormDTO customerGridFormDTO);
+
+    /**
+     * @Description  根据网格ID查询pids
+     * @Param gridId
+     * @author zxc
+     * @date 2021/7/16 9:52 上午
+     */
+    String selectPidsByGridId(String gridId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@@ -707,4 +707,18 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     public Result<CustomerGridDTO> getBaseInfo(CustomerGridFormDTO customerGridFormDTO) {
         return new Result<CustomerGridDTO>().ok(ConvertUtils.sourceToTarget(baseDao.selectById(customerGridFormDTO.getGridId()), CustomerGridDTO.class));
     }
+
+    /**
+     * @Description  根据网格ID查询pids
+     * @Param gridId
+     * @author zxc
+     * @date 2021/7/16 9:52 上午
+     */
+    @Override
+    public String selectPidsByGridId(String gridId) {
+        if (StringUtils.isNotBlank(gridId)){
+            return baseDao.selectPidsByGridId(gridId);
+        }
+        return "";
+    }
 }

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

@@ -576,4 +576,9 @@
             cg.ID = #{gridId}
             AND cg.DEL_FLAG = '0'
     </select>
+
+    <!-- 根据网格ID查询pids -->
+    <select id="selectPidsByGridId" resultType="java.lang.String">
+        SELECT PIDS FROM customer_grid WHERE DEL_FLAG = '0' AND ID = #{gridId}
+    </select>
 </mapper>