diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index c9d98ae009..c1f669535e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/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(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index 76e5aca439..fcb114c437 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -65,7 +65,7 @@ public interface IcResiUserDao extends BaseDao { @Param("staffOrgPath") String staffOrgPath, @Param("resultTableName") String resultTableName, @Param("keyword") String keyword, - @Param("groupByTables")Set groupByTables); + @Param("groupByTables") Set groupByTables); /** * 查询主表 @@ -131,10 +131,10 @@ public interface IcResiUserDao extends BaseDao { */ List 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 selectUserDemandCode(String icResiUserId); @@ -162,11 +162,12 @@ public interface IcResiUserDao extends BaseDao { /** * 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 { */ Map getDataAnalyseCount(@Param("customerId") String customerId, @Param("tableName") String tableName, @Param("columnList") List columnList, @Param("id") String id, @Param("level") String level); - List> getIcUserList(@Param("customerId") String customerId, @Param("columns")List columns); + + List> getIcUserList(@Param("customerId") String customerId, @Param("columns") List columns); /** * Desc: 根据房屋IDs查询房屋下是否有存在居民的 @@ -304,6 +306,7 @@ public interface IcResiUserDao extends BaseDao { /** * desc:根据维度获取居民信息表的数据[正常状态的居民] + * * @param formDTO * @return */ @@ -318,10 +321,11 @@ public interface IcResiUserDao extends BaseDao { */ List listUserIds(@Param("customerId") String customerId, @Param("gridId") String gridId); - List getAllUserIds(@Param("idCard") String idCard, @Param("customerId")String customerId); + List 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 { */ List 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); }