添加备注

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

@@ -1157,9 +1157,9 @@ public class IcResiUserController implements ResultDataResolver {
      * @date 2022/6/22 16:29
      */
     @PostMapping("/bindHome")
-    public Result bindHome(@RequestBody BindHomeFormDTO form){
+    public Result bindHome(@RequestBody BindHomeFormDTO form,@LoginUser TokenDto tokenDto){
         ValidatorUtils.validateEntity(form);
-        form.setCustomerId("45687aa479955f9d06204d415238f7cc");
+        form.setCustomerId(tokenDto.getCustomerId());
         icResiUserService.bindHome(form);
         return new Result();
     }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -65,7 +65,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                                 @Param("staffOrgPath") String staffOrgPath,
                                                 @Param("resultTableName") String resultTableName,
                                                 @Param("keyword") String keyword,
-                                                @Param("groupByTables")Set<String> groupByTables);
+                                                @Param("groupByTables") Set<String> groupByTables);
 
     /**
      * 查询主表
@@ -131,10 +131,10 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      */
     List<SearchByNameResultDTO> searchByName(@Param("name") String name,
                                              @Param("columnName") String columnName,
-                                             @Param("level")String level,
-                                             @Param("id")String id,
+                                             @Param("level") String level,
+                                             @Param("id") String id,
                                              @Param("agencyId") String agencyId,
-                                             @Param("pageNo") Integer pageNo,@Param("customerId") String customerId);
+                                             @Param("pageNo") Integer pageNo, @Param("customerId") String customerId);
 
     Set<String> selectUserDemandCode(String icResiUserId);
 
@@ -162,11 +162,12 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
 
     /**
      * desc:根据身份证号获取居民信息
+     *
      * @param idCard
      * @param customerId
      * @return
      */
-    IcResiUserDTO getResiUserByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId);
+    IcResiUserDTO getResiUserByIdCard(@Param("idCard") String idCard, @Param("customerId") String customerId);
 
     /**
      * @param agencyId
@@ -273,7 +274,8 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      */
     Map<String, BigDecimal> getDataAnalyseCount(@Param("customerId") String customerId, @Param("tableName") String tableName,
                                                 @Param("columnList") List<String> columnList, @Param("id") String id, @Param("level") String level);
-    List<Map<String, String>> getIcUserList(@Param("customerId") String customerId, @Param("columns")List<String> columns);
+
+    List<Map<String, String>> getIcUserList(@Param("customerId") String customerId, @Param("columns") List<String> columns);
 
     /**
      * Desc: 根据房屋IDs查询房屋下是否有存在居民的
@@ -304,6 +306,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
 
     /**
      * desc:根据维度获取居民信息表的数据[正常状态的居民]
+     *
      * @param formDTO
      * @return
      */
@@ -318,10 +321,11 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      */
     List<String> listUserIds(@Param("customerId") String customerId, @Param("gridId") String gridId);
 
-    List<String> getAllUserIds(@Param("idCard") String idCard, @Param("customerId")String customerId);
+    List<String> getAllUserIds(@Param("idCard") String idCard, @Param("customerId") String customerId);
 
     /**
      * 获取客户下志愿者信息
+     *
      * @Param customerId
      * @Return {@link List< IcVolunteerPolyDTO>}
      * @Author zhaoqifeng
@@ -329,12 +333,35 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      */
     List<IcVolunteerPolyDTO> getVolunteerList(@Param("customerId") String customerId, @Param("userId") String userId);
 
-    int selectCountByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId);
-
+    /**
+     * 统计数据
+     *
+     * @param idCard
+     * @param customerId
+     * @return int
+     * @author LZN
+     * @date 2022/6/23 9:47
+     */
+    int selectCountByIdCard(@Param("idCard") String idCard, @Param("customerId") String customerId);
 
+    /**
+     * 根据身份证号修改数据
+     *
+     * @param entity
+     * @return void
+     * @author LZN
+     * @date 2022/6/23 9:47
+     */
     void updateIcResiUserByIdCard(@Param("entity") IcResiUserEntity entity);
 
-    String seletIdByIdCard(@Param("customerId") String customerId,@Param("idCard") String idCard);
+    /**
+     * 根据身份证号查询id
+     *
+     * @param customerId
+     * @param idCard
+     * @return
+     */
+    String seletIdByIdCard(@Param("customerId") String customerId, @Param("idCard") String idCard);
 
 
 }