From 7eaa1e1eac1b314afcd09d69ac10b969c62e56ef Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 20 五月 2021 10:51:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java
index cf1f080..cfafff9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java
@@ -47,10 +47,10 @@
" AND ea.ID_CARD = #{pageEldersAuthDTO.idCard} " +
" </if> " +
"<if test='pageEldersAuthDTO.authUserName != null'>" +
- " AND ea.AUTH_USER_NAME = #{pageEldersAuthDTO.authUserName} " +
+ " AND ea.AUTH_USER_NAME like concat('%', #{pageEldersAuthDTO.authUserName}, '%' ) " +
" </if> " +
"<if test='pageEldersAuthDTO.type == 1 '>" +
- " AND ea.AUTH_USER_NAME = #{pageEldersAuthDTO.month} " +
+ " AND DATE_FORMAT(ea.CREATE_AT, '%c') = #{pageEldersAuthDTO.month} " +
" </if> " +
"<if test='pageEldersAuthDTO.type == 2 '>" +
"<if test='pageEldersAuthDTO.createAtStart != null'>" +
@@ -103,7 +103,6 @@
" LEFT JOIN com_act ac ON u.community_id = ac.community_id\n" +
" <where> " +
-
"<if test='pageEldersAuthDTO.ids != null and pageEldersAuthDTO.ids.length>0 '>" +
" AND ea.id in " +
"<foreach collection='pageEldersAuthDTO.ids' item='id' index='index' open='(' close=')' separator=',' >\n" +
@@ -119,10 +118,10 @@
" AND ea.ID_CARD = #{pageEldersAuthDTO.idCard} " +
" </if> " +
"<if test='pageEldersAuthDTO.authUserName != null'>" +
- " AND ea.AUTH_USER_NAME = #{pageEldersAuthDTO.authUserName} " +
+ " AND ea.AUTH_USER_NAME like concat('%', #{pageEldersAuthDTO.authUserName}, '%' ) " +
" </if> " +
"<if test='pageEldersAuthDTO.type == 1 '>" +
- " AND ea.AUTH_USER_NAME = #{pageEldersAuthDTO.month} " +
+ " AND DATE_FORMAT(ea.CREATE_AT, '%c') = #{pageEldersAuthDTO.month} " +
" </if> " +
"<if test='pageEldersAuthDTO.type == 2 '>" +
"<if test='pageEldersAuthDTO.createAtStart != null'>" +
@@ -137,4 +136,12 @@
" ORDER BY ea.${pageEldersAuthDTO.sortBy} ${pageEldersAuthDTO.order} " +
"</script>")
List<ExcelElderAuthDTO> selectByParams( @Param("pageEldersAuthDTO") PageEldersAuthDTO pageEldersAuthDTO);
+
+ @Select("<script> " +
+ "SELECT CONCAT(ap.province_name, ad.district_name) AS domicile\n" +
+ "FROM com_mng_struct_area_province ap LEFT JOIN com_mng_struct_area_city ct ON ap.province_adcode = ct.province_adcode\n" +
+ " LEFT JOIN com_mng_struct_area_district ad ON ct.city_adcode = ad.city_adcode " +
+ " WHERE substring(ad.district_adcode, 1, 6) = substring(#{idCard}, 1, 6) "+
+ "</script>")
+ String selectDomicile(@Param("idCard")String idCard);
}
--
Gitblit v1.7.1