From ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c Mon Sep 17 00:00:00 2001 From: lidongdong <1459917685@qq.com> Date: 星期二, 14 十一月 2023 17:49:20 +0800 Subject: [PATCH] 修改打卡 --- springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java | 98 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 64 insertions(+), 34 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java index 3d4d77f..e467cd8 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java @@ -1,14 +1,17 @@ package com.panzhihua.service_dangjian.dao; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO; -import com.panzhihua.common.model.vos.partybuilding.PartyCommitteeVO; -import com.panzhihua.service_dangjian.model.dos.ComPbMemberRoleDO; +import com.panzhihua.common.model.vos.community.ComActVO; 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 com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.panzhihua.common.model.vos.partybuilding.west.PartyCommitteeVO; +import com.panzhihua.common.model.vos.user.SysUserVO; +import com.panzhihua.service_dangjian.model.dos.ComPbMemberRoleDO; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -18,32 +21,59 @@ **/ @Mapper public interface ComPbMemberRoleDAO extends BaseMapper<ComPbMemberRoleDO> { - @Select("<script> " + - "SELECT\n" + - "mr.id,\n" + - "m.NAME,\n" + - "u.phone,\n" + - "'党员' politicalOutlook,\n"+ - "m.photo_path,\n" + - "TIMESTAMPDIFF(\n" + - "YEAR,\n" + - "m.employment_time,\n" + - "DATE_FORMAT( NOW(), '%Y-%m-%d' )) partyAge,\n" + - "r.role_name ,\n" + - "mr.role_id \n"+ - "FROM\n" + - "com_pb_member_role mr\n" + - "JOIN com_pb_member m ON mr.member_id = m.id\n" + - "JOIN sys_role r ON mr.role_id = r.role_id \n" + - "LEFT JOIN sys_user u ON m.id_card = u.id_card\n" + - "WHERE\n" + - "mr.community_id = #{partyCommitteeVO.communityId} \n" + - "<if test='partyCommitteeVO.name != null and partyCommitteeVO.name.trim() != ""'>" + - "AND m.`name` = #{partyCommitteeVO.name} \n" + - " </if> " + - "<if test='partyCommitteeVO.roleId != null and partyCommitteeVO.roleId != 0'>" + - "AND r.role_id =#{partyCommitteeVO.roleId}" + - " </if> " + - "</script>") - IPage<PartyCommitteeVO> pagePartyOrganization(Page page, @Param("partyCommitteeVO") PartyCommitteeVO partyCommitteeVO); + + /** + * 分页查询党委列表 + * @param page 分页参数 + * @param partyCommitteeVO 请求参数 + * @return 党委列表 + */ + IPage<PartyCommitteeVO> pagePartyOrganization(Page page, + @Param("partyCommitteeVO") PartyCommitteeVO partyCommitteeVO); + + + + IPage<com.panzhihua.common.model.vos.partybuilding.PartyCommitteeVO> pagePartyOrganizations(Page page, + @Param("partyCommitteeVO") com.panzhihua.common.model.vos.partybuilding.PartyCommitteeVO partyCommitteeVO); + + + @Select("select * from sys_user where phone=#{phone} AND app_id = #{appid} and type=1") + SysUserVO getSysUserByPhone(@Param("phone") String phone, @Param("appid") String appid); + + /** + * 根据身份证查询小程序用户id + * @param idCard 身份证 + * @param areaCode + * @return 小程序用户id + */ + Long getUserIdByIdCard(@Param("idCard") String idCard, @Param("areaCode") String areaCode); + + /** + * 根据手机号查询小程序用户id + * @param phone 手机号 + * @param appid + * @return 小程序用户id + */ + Long getSysUserIdByPhone(@Param("phone") String phone, @Param("appid") String appid); + + @Update("update sys_user u set u.phone=#{newphone} where u.phone=#{oldphone}") + void updateUserPhone(@Param("newphone") String newphone, @Param("oldphone") String oldphone); + + @Select("select * from com_pb_member_role where id=#{id}") + PartyCommitteeVO selectPartyCommitteeById(@Param("id") Long id); + + /** + * 根据身份证查询用户数量 + * @param idCard 身份证号码 + * @param areaCode + * @return 用户数量 + */ + Integer getSysUserByIdCardCount(@Param("idCard") String idCard, @Param("areaCode") String areaCode); + + /** + * 获取社区信息 + * @param communityId + * @return + */ + ComActVO selectActById(@Param("communityId") Long communityId); } -- Gitblit v1.7.1