change:随手拍、一起议、微心愿 添加昵称字段

CeDo

2021-05-24 2dbd65c087d193db8f084be2dabe5e91f54ad7a1

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

@@ -89,11 +89,12 @@
            "AND cmp.remark = #{comMngPopulationVO.remark} " +
            " </if> " +
            " </where>" +
            " order by cmp.create_at desc " +
            "</script>")
    List<ComMngPopulationVO> listPopulation(ComMngPopulationDTO populationVO);


    @Select("select id,user_id,relationship,`name`,id_card,phone,age,health,job,create_at,update_at,card_photo_front,card_photo_back,family_book from com_mng_family_info where user_id=#{userId}")
    @Select("select id,user_id,relationship,`name`,id_card,phone,age,health,job,create_at,update_at,card_photo_front,card_photo_back,family_book from com_mng_family_info where user_id=#{userId} order by create_at desc ")
    List<ComMngFamilyInfoVO> listFamilyByUserId(Long userId);

    @Select("select id,`name`,phone,relation from com_mng_population where road = #{comMngPopulationDO.road} and door_no = #{comMngPopulationDO.doorNo} and floor = #{comMngPopulationDO.floor} and unit_no = #{comMngPopulationDO.unitNo} and house_no = #{comMngPopulationDO.houseNo} and id != #{comMngPopulationDO.id}")
@@ -152,10 +153,10 @@
            "<if test='comMngPopulationVO.sex != null and comMngPopulationVO.sex != &quot;&quot;'>" +
            "AND cmp.sex = #{comMngPopulationVO.sex} " +
            " </if> " +
            "<if test='comMngPopulationVO.ageStart != null'>" +
            "<if test='comMngPopulationVO.ageStart != null and comMngPopulationVO.ageStart != &quot;&quot;'>" +
            "AND cmp.age <![CDATA[ >= ]]> #{comMngPopulationVO.ageStart} " +
            " </if> " +
            "<if test='comMngPopulationVO.ageEnd != null'>" +
            "<if test='comMngPopulationVO.ageEnd != null and comMngPopulationVO.ageEnd != &quot;&quot;'>" +
            "AND cmp.age <![CDATA[ <= ]]> #{comMngPopulationVO.ageEnd} " +
            " </if> " +
            "<if test='comMngPopulationVO.nativePlace != null and comMngPopulationVO.nativePlace != &quot;&quot;'>" +