Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java

@@ -1,19 +1,16 @@
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.common.model.vos.user.SysUserVO;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberRoleDO;
import com.panzhihua.service_dangjian.model.dos.ComPbServiceTeamDO;

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.PartyCommitteeVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberRoleDO;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -23,36 +20,28 @@
 **/
@Mapper
public interface ComPbMemberRoleDAO extends BaseMapper<ComPbMemberRoleDO> {
    //    @Select("<script> " +
//            " <where>" +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            " </where>" +
//            "</script>")
    @Select("<script> " +
            "SELECT\n" +
            "*,\n" +            
            "TIMESTAMPDIFF(\n" +
            "YEAR,\n" +
            "t.birth_time,\n" +
            "DATE_FORMAT( NOW(), '%Y-%m-%d' )) age\n" +            
            "FROM\n" +
            "com_pb_member_role t\n" +
            "WHERE\n" +
            "t.community_id = #{partyCommitteeVO.communityId} \n" +
            "</script>")
    IPage<PartyCommitteeVO> pagePartyOrganization(Page page, @Param("partyCommitteeVO") PartyCommitteeVO partyCommitteeVO);
    
    // @Select("<script> " +
    // " <where>" +
    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
    // " </if> " +
    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
    // " </if> " +
    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
    // " </if> " +
    // " </where>" +
    // "</script>")
    @Select("<script> " + "SELECT\n" + "*,\n" + "TIMESTAMPDIFF(\n" + "YEAR,\n" + "t.birth_time,\n"
        + "DATE_FORMAT( NOW(), '%Y-%m-%d' )) age\n" + "FROM\n" + "com_pb_member_role t\n" + "WHERE\n"
        + "t.community_id = #{partyCommitteeVO.communityId} \n" + "</script>")
    IPage<PartyCommitteeVO> pagePartyOrganization(Page page,
        @Param("partyCommitteeVO") PartyCommitteeVO partyCommitteeVO);

    @Select("select * from sys_user where phone=#{phone} and type=1")
    SysUserVO getSysUserByPhone(@Param("phone")String phone);
    
    SysUserVO getSysUserByPhone(@Param("phone") String phone);

    @Update("update sys_user u set u.phone=#{newphone} where u.phone=#{oldphone}")
    void updateUserPhone(@Param("newphone")String newphone,@Param("oldphone")String 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);
    PartyCommitteeVO selectPartyCommitteeById(@Param("id") Long id);
}