From 31eb44e38f79f3011ce19eb5bc657a08ab22cc3b Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期四, 05 八月 2021 14:06:42 +0800 Subject: [PATCH] 实名认证接口修改 --- springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 122 +++++++++++++++++++++++++++++++++++----- 1 files changed, 107 insertions(+), 15 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java index 2c0ffde..c5b6c75 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java @@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.PageDTO; import com.panzhihua.common.model.dtos.community.ExportUserDTO; +import com.panzhihua.common.model.dtos.grid.EventGridMemberEditStatusDTO; +import com.panzhihua.common.model.dtos.grid.EventGridMemberPassResetDTO; +import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO; import com.panzhihua.common.model.dtos.user.EexcelUserDTO; import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.vos.IndexDataKanbanVO; @@ -13,18 +16,20 @@ import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO; +import com.panzhihua.common.model.vos.community.screen.event.EventGridMemberVO; +import com.panzhihua.common.model.vos.grid.GridMemberVO; import com.panzhihua.common.model.vos.user.AdministratorsUserVO; import com.panzhihua.common.model.vos.user.SysUserNoticeVO; import com.panzhihua.common.model.vos.user.SysUserVO; +import com.panzhihua.common.model.vos.user.UpdateUserArchivesVO; import com.panzhihua.service_user.model.dos.SysUserDO; import com.panzhihua.service_user.model.dtos.DataKanbanDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; -import org.apache.ibatis.annotations.Update; +import org.apache.ibatis.annotations.*; +import org.springframework.web.bind.annotation.RequestParam; import java.util.Date; import java.util.List; +import java.util.Map; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -107,6 +112,7 @@ "<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != ""'>" + "AND u.phone like concat(#{loginUserInfoVO.phone},'%') " + " </if> " + + " order by u.user_id desc " + "</script>") IPage<LoginUserInfoVO> pageUser(Page page, @Param("loginUserInfoVO") LoginUserInfoVO loginUserInfoVO); @@ -159,7 +165,7 @@ "from sys_user u\n" + "left join com_act a on u.community_id=a.community_id\n" + " where\n" + - "u.type=1\n" + + "u.type=1 and u.community_id is not null \n" + "<if test='pageUserAppletsBackstageDTO.phone != null and pageUserAppletsBackstageDTO.phone.trim() != ""'>" + "and u.phone=#{pageUserAppletsBackstageDTO.phone}\n" + " </if> " + @@ -227,7 +233,7 @@ @Select("SELECT \n" + "COUNT(DISTINCT u.user_id)allUser,\n" + "(select COUNT(m.id) from com_mng_volunteer_mng m where m.community_id=#{communityId} and m.`state`=2)volunteerUser,\n" + - "COUNT(DISTINCT case when u.is_partymember=1 then u.user_id else null end )partymemberUser,\n" + + " (select count(id) from com_pb_member cpm where cpm.audit_result = 1 and cpm.community_id = #{communityId}) partymemberUser,\n" + "COUNT(h.id)house\n" + "FROM\n" + "sys_user u\n" + @@ -244,7 +250,8 @@ "u.continuous_landing_days + 1,\n" + "0)") int timedTaskContinuousLandingDays(); - @Select("select state from com_mng_volunteer_mng where phone=#{phone} order by create_at desc limit 1") + @Select("select id,create_at,state,name,phone,photo_path,political_face,reject_reson,apply_reson,address,age,job,integral,community_id,submit_user_id " + + " from com_mng_volunteer_mng where phone=#{phone} order by create_at desc limit 1") ComMngVolunteerMngVO selectVolunteerMngByPhone(String phone); @Update("update sys_user set face_state=null where user_id=#{userId}") int updateFaceState(Long userId); @@ -315,16 +322,16 @@ "FROM\n" + "\t com_pb_member_role a \n" + "WHERE\n" + - "\t a.phone = #{phone}") - Integer selectCountMemberRole(@Param("phone")String phone); + "\t a.phone = #{phone} and community_id=#{userCommunityId} ") + Integer selectCountMemberRole(@Param("phone")String phone, @Param("userCommunityId")Long userCommunityId); @Select("SELECT\n" + "\t COUNT(a.id)\n" + "FROM\n" + "\t com_pb_service_team a \n" + "WHERE\n" + - "\t a.phone = #{phone}") - Integer selectCountTeam(@Param("phone")String phone); + "\t a.phone = #{phone} and community_id=#{userCommunityId} ") + Integer selectCountTeam(@Param("phone")String phone, @Param("userCommunityId")Long userCommunityId); @Update("update com_pb_member_role u set u.phone=#{newphone},is_reg=1 where u.phone=#{oldphone}") @@ -333,11 +340,96 @@ void updateServiceTeam(@Param("newphone")String newphone,@Param("oldphone")String oldphone); @Select("SELECT\n" + - "\t COUNT(a.id)\n" + + "\t COUNT(ur.role_id) \n" + "FROM\n" + "\t sys_user u LEFT JOIN sys_user_role ur ON u.user_id = ur.user_id \n" + "\t LEFT JOIN sys_role r ON ur.role_id = r.role_id \n" + - "WHERE ur.role_id IS NOT NULL AND \n" + - "\t u.phone = #{phone}") - Integer selectCountSysUser(@Param("phone")String phone); + "WHERE ur.role_id IS NOT NULL AND u.phone = #{phone} and r.community_id=#{userCommunityId} ") + Integer selectCountSysUser(@Param("phone")String phone, @Param("userCommunityId")Long userCommunityId); + + @Select("update com_shop_store set sys_user_id = #{sysUserId} where phone = #{phone}") + void updateStoreByPhone(@Param("phone")String phone, @Param("sysUserId")Long sysUserId); + + @Select("delete from com_shop_store where delete_status = 1 and phone = #{phone}") + void deleteStoreByPhoneAndStatus(@RequestParam("phone") String phone); + + @Select("update sys_user set" + + " card_photo_front = #{userArchivesVO.cardPhotoFront} \n" + + ", card_photo_back = #{userArchivesVO.cardPhotoBack} \n" + + ",family_book = #{userArchivesVO.familyBook} \n" + + ",job = #{userArchivesVO.job} \n" + + " where user_id = #{userArchivesVO.userId}") + void updateUserArchives(@Param("userArchivesVO") UpdateUserArchivesVO userArchivesVO); + + @Select("update com_pb_member set user_id = #{userId} where audit_result = 1 and id_card = #{idCard}") + void updateComPbMemberUserId(@Param("idCard")String idCard, @Param("userId")Long userId); + + @Select("select id from com_pb_member where audit_result = 1 and id_card = #{idCard}") + Long getPartyBuildingByIdCard(@Param("idCard")String idCard); + + @Select("<script>" + + "select su.user_id,su.image_url,su.nick_name,su.account,su.phone,su.work_status,su.`status`" + + ",ca.name as communityName,su.work_start_time,su.work_end_time from sys_user su" + + " left join com_act as ca on ca.community_id = su.community_id" + + " where su.type = 6 " + + "<if test='memberRelationDTO.status != null'>" + + "AND su.status = #{memberRelationDTO.status} " + + " </if> " + + "<if test='memberRelationDTO.gridCommunityId != null'>" + + "AND ca.community_id = #{memberRelationDTO.gridCommunityId} " + + " </if> " + + "<if test='memberRelationDTO.gridStreetId != null'>" + + "AND ca.street_id = #{memberRelationDTO.gridStreetId} " + + " </if> " + + "<if test='memberRelationDTO.workStatus != null'>" + + "AND su.work_status = #{memberRelationDTO.workStatus} " + + " </if> " + + "<if test='memberRelationDTO.keyWord != null and memberRelationDTO.keyWord != ""'>" + + "and (su.nick_name like concat(#{memberRelationDTO.keyWord},'%') OR su.user_id = #{memberRelationDTO.keyWord} OR su.account like concat(#{memberRelationDTO.keyWord},'%') OR su.phone like concat(#{memberRelationDTO.keyWord},'%'))" + + " </if> " + + " order by su.create_at desc" + + "</script>") + IPage<GridMemberVO> getGridMemberList(Page page, @Param("memberRelationDTO") PageEventGridMemberRelationDTO memberRelationDTO); + + @Select("<script>" + + "update sys_user" + + " set status = #{gridMemberEditDTO.status}" + + " where user_id in " + + "<foreach item=\"item\" collection=\"gridMemberEditDTO.ids\" separator=\",\" open=\"(\" close=\")\" index=\"\"> \n" + + "#{item}\n" + + "</foreach>\n" + + "</script>") + void gridMemberEditStatus(@Param("gridMemberEditDTO") EventGridMemberEditStatusDTO gridMemberEditDTO); + + @Select("<script>" + + "update sys_user" + + " set password = #{gridMemberDTO.password}" + + " where user_id in " + + "<foreach item=\"item\" collection=\"gridMemberDTO.ids\" separator=\",\" open=\"(\" close=\")\" index=\"\"> \n" + + "#{item}\n" + + "</foreach>\n" + + "</script>") + void passResetUser(@Param("gridMemberDTO") EventGridMemberPassResetDTO gridMemberDTO); + + @Update("update lc_compare_code_member set local_grid_member_id = #{userId},grid_member_name = #{userName} where id = #{lcMemberId}") + void addLcMember(@Param("lcMemberId") Long lcMemberId,@Param("userId") Long userId,@Param("userName") String userName); + + @Delete("delete from lc_compare_code_member where local_grid_member_id = #{gridMemberId}") + void delLcMember(@Param("gridMemberId") Long gridMemberId); + + @Select("select id,village_id,act_id from com_mng_building where id = #{buildingId}") + Map<String,Long> getBuilding(@Param("buildingId") Long buildingId); + + @Delete("delete from event_grid_member_building_relation where grid_member_id = #{gridMemberId}") + void delGridMemberRelation(@Param("gridMemberId") Long gridMemberId); + + @Select("select lc_grid_member_id,lc_grid_member_name,lc_bind_user_id from lc_compare_code_member where local_grid_member_id = #{gridMemberId}") + Map<String,String> getLcMemberId(@Param("gridMemberId") Long gridMemberId); + + @Select("select count(id) from event_grid_member_relation where grid_member_id = #{userId}") + Integer getGridIsOk(@Param("userId") Long userId); + + @Select("select user_id,nick_name,phone from sys_user where type = 6 and community_id = #{communityId} limit 3") + List<EventGridMemberVO> getGridsMemberList(@Param("communityId") Long communityId); + } -- Gitblit v1.7.1