Merge branch 'test_elder_cedoo' into 'test'

罗元桥

2021-06-10 e16b3c00a6b92873ffecb386393dc264ce475cec

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java

@@ -7,10 +7,8 @@
import com.panzhihua.common.model.dtos.community.ExcelElderAuthDTO;
import com.panzhihua.common.model.dtos.community.PageComEldersRecordsDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO;
import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyDetailsVO;
import com.panzhihua.common.model.vos.community.ComEldersAuthRecordVO;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthVO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthRecordDTO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.service_community.model.dos.EldersAuthDO;
import org.apache.ibatis.annotations.Mapper;
@@ -76,10 +74,10 @@


    @Select("<script> " +
            "SELECT ea.id, ea.create_at, ea.create_by, ea.update_by, ea.update_at," +
            " ea.AUTH_USER_NAME , ea.ID_CARD, ea.BIRTH_DAY, ea.FAMILY_USER_ID, " +
            "SELECT ea.id, ea.create_at, ea.create_by, ea.update_by, ea.update_at, " +
            " ea.AUTH_USER_NAME , ea.ID_CARD, ea.BIRTH_DAY, ea.FAMILY_USER_ID, ea.type,  " +
            " ea.DOMICILE, ea.SUMIT_USER_ID,  u.phone as submitUserAccount  , ea.VIDEO_URL , ea.FAMILY_USER_ID, " +
            " u.name as submitUserName, ROUND(DATEDIFF(CURDATE(), ea.BIRTH_DAY)/365.2422) as age \n" +
            " u.name as submitUserName, ea.age \n" +
            "FROM  com_elders_auth ea LEFT JOIN sys_user  u ON ea.SUMIT_USER_ID = u.user_id\n" +
            " where ea.id = #{id}"  +
            "</script>")
@@ -189,4 +187,36 @@

    @Select("select user_id,id_card,name from sys_user where user_id = #{userId}")
    SysUserVO getSysUserByUserId(@Param("userId")Long userId);


    @Select("<script> " +
            " SELECT e.ID,e.CREATE_BY,e.CREATE_AT, e.UPDATE_BY, e.UPDATE_AT, e.ID_CARD, e.AUTH_USER_NAME, e.VIDEO_URL," +
            " e.SUMIT_USER_ID, e.DOMICILE, e.STATUS, e.BIRTH_DAY, e.type, e.age, e.verification_result, u.name as sumitUserName, u.phone as sumitUserAccount  " +
            " FROM ( " +
            "       SELECT MAX(id) AS id , DATE_FORMAT(create_at, '%Y-%m') AS yearMonth " +
            "        FROM com_elders_auth " +
            "        GROUP BY id_card, yearMonth " +
            "       ) t " +
            " left join com_elders_auth e on t.id = e.id " +
            " LEFT JOIN sys_user u ON e.SUMIT_USER_ID = u.user_id  " +
            "<where>" +
            " <if test='pageEldersAuthRecordDTO.name!=null'>\n" +
            " AND e.AUTH_USER_NAME like concat('%', #{pageEldersAuthRecordDTO.name}, '%')" +
            "</if>" +
            " <if test='pageEldersAuthRecordDTO.idCard!=null'>\n" +
            " AND e.ID_CARD  like concat('%',  #{pageEldersAuthRecordDTO.idCard}, '%')\n" +
            "</if>" +
            " <if test='pageEldersAuthRecordDTO.type!=null'>\n" +
            " AND e.type = #{pageEldersAuthRecordDTO.type}\n" +
            "</if>" +
            " <if test='pageEldersAuthRecordDTO.month!=null'>\n" +
            " AND month(e.CREATE_BY) = #{pageEldersAuthRecordDTO.month}\n" +
            "</if>\n" +
            "</where>\n" +
            "<if test='pageEldersAuthRecordDTO.sortColumns!=null'>\n" +
            "ORDER BY e.${pageEldersAuthRecordDTO.sortColumns} ${pageEldersAuthRecordDTO.sortType}\n" +
            "</if> " +
            "</script>")
    List<ComEldersAuthRecordForCommunityVO> selectCommunityEldersRecordByPage(Page page, @Param("pageEldersAuthRecordDTO") PageEldersAuthRecordDTO pageEldersAuthRecordDTO);

}