Merge remote-tracking branch 'origin/dev_guidance' into develop

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java

@@ -95,4 +95,14 @@ public interface ResiPartyMemberOpenFeignClient {
      **/
     @PostMapping(value = "/resi/partymember/partymemberinfo/getPartymemberInfoByGridId", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
     Result<List<PartymemberInfoDTO>> getPartymemberInfoByGridId(@RequestBody List<String> gridIdList);
+
+    /**
+     * @Description  根据客户ID查询党员
+     * @Param customerId
+     * @author zxc
+     * @date 2021/9/6 3:54 下午
+     */
+    @PostMapping(value = "/resi/partymember/partymemberinfo/getpartymemberinfobycustomerid")
+    Result<List<PartymemberInfoDTO>> getPartyMemberInfoByCustomerId(@RequestParam("customerId")String customerId);
+
 }

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java

@@ -64,4 +64,9 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp
     public Result<List<PartymemberInfoDTO>> getPartymemberInfoByGridId(List<String> gridIdList) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "getPartymemberInfoByGridId", gridIdList);
     }
+
+    @Override
+    public Result<List<PartymemberInfoDTO>> getPartyMemberInfoByCustomerId(String customerId) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "getPartyMemberInfoByCustomerId", customerId);
+    }
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java

@@ -157,4 +157,15 @@ public class PartymemberInfoController {
         List<PartymemberInfoDTO> list = partymemberInfoService.listPartymemberInfoByGridId(gridIdList);
         return new Result<List<PartymemberInfoDTO>>().ok(list);
     }
+
+    /**
+     * @Description  根据客户ID查询党员
+     * @Param customerId
+     * @author zxc
+     * @date 2021/9/6 3:54 下午
+     */
+    @PostMapping("getpartymemberinfobycustomerid")
+    public Result<List<PartymemberInfoDTO>> getPartyMemberInfoByCustomerId(@RequestParam("customerId")String customerId){
+        return new Result<List<PartymemberInfoDTO>>().ok(partymemberInfoService.getPartyMemberInfoByCustomerId(customerId));
+    }
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberInfoDao.java

@@ -95,4 +95,12 @@ public interface PartymemberInfoDao extends BaseDao<PartymemberInfoEntity> {
 	 * @Date 2020/7/22 12:14
 	 **/
 	List<PartymemberInfoDTO> selectListPartymemberInfoByGridId(@Param("gridIdList") List<String> gridIdList);
+
+	/**
+	 * @Description  根据客户ID查询党员
+	 * @Param customerId
+	 * @author zxc
+	 * @date 2021/9/6 3:54 下午
+	 */
+	List<PartymemberInfoDTO> selectListPartyMemberInfoByCustomerId(@Param("customerId") String customerId);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java

@@ -170,4 +170,12 @@ public interface PartymemberInfoService extends BaseService<PartymemberInfoEntit
      * @return
      */
     PartymemberInfoDTO getPartyMemberInfoByUser(String customerId, String userId);
+
+    /**
+     * @Description  根据客户ID查询党员
+     * @Param customerId
+     * @author zxc
+     * @date 2021/9/6 3:54 下午
+     */
+    List<PartymemberInfoDTO> getPartyMemberInfoByCustomerId(String customerId);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java

@@ -248,4 +248,15 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
 		PartymemberInfoEntity entity = baseDao.selectOne(wrapper);
 		return ConvertUtils.sourceToTarget(entity, PartymemberInfoDTO.class);
 	}
+
+	/**
+	 * @Description  根据客户ID查询党员
+	 * @Param customerId
+	 * @author zxc
+	 * @date 2021/9/6 3:54 下午
+	 */
+	@Override
+	public List<PartymemberInfoDTO> getPartyMemberInfoByCustomerId(String customerId) {
+		return baseDao.selectListPartyMemberInfoByCustomerId(customerId);
+	}
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml

@@ -169,4 +169,15 @@
                 </foreach>
             </if>
     </select>
+
+    <!-- 根据客户ID查询党员 -->
+    <select id="selectListPartyMemberInfoByCustomerId" resultType="com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO">
+        SELECT
+            *
+        FROM partymember_info
+        WHERE
+            DEL_FLAG = 0
+          AND ( CONFIRM_RESULT = 'auto_confirm_success' OR CONFIRM_RESULT = 'approved' )
+          AND CUSTOMER_ID = #{customerId}
+    </select>
 </mapper>