From 02b5015e989fef8878744d50f21a092efa395231 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 16 六月 2021 19:22:26 +0800
Subject: [PATCH] Merge branch 'test_screen' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 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 1e24446..7960391 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
@@ -60,12 +60,12 @@
" AND DATE_FORMAT(ea.CREATE_AT, '%c') = #{pageEldersAuthDTO.month} " +
" </if> " +
"<if test='pageEldersAuthDTO.type == 2 '>" +
- "<if test='pageEldersAuthDTO.createAtStart != null'>" +
- " AND ea.create_at <![CDATA[>=]]> #{pageEldersAuthDTO.createAtStart} " +
- " </if> " +
- "<if test='pageEldersAuthDTO.createAtEnd != null'>" +
- " AND ea.create_at <![CDATA[<=]]> #{pageEldersAuthDTO.createAtEnd} " +
- " </if> " +
+ "<if test='pageEldersAuthDTO.createAtStart != null'>" +
+ " AND ea.create_at <![CDATA[>=]]> #{pageEldersAuthDTO.createAtStart} " +
+ " </if> " +
+ "<if test='pageEldersAuthDTO.createAtEnd != null'>" +
+ " AND ea.create_at <![CDATA[<=]]> #{pageEldersAuthDTO.createAtEnd} " +
+ " </if> " +
" </if> " +
" </where>" +
" ORDER BY ea.${pageEldersAuthDTO.sortBy} ${pageEldersAuthDTO.order} " +
@@ -74,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, ea.type, " +
+ "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.DOMICILE, ea.SUMIT_USER_ID, u.phone as submitUserAccount , ea.VIDEO_URL , ea.FAMILY_USER_ID, " +
- " u.name as submitUserName, ea.age \n" +
+ " u.name as submitUserName, ROUND(DATEDIFF(CURDATE(), ea.BIRTH_DAY)/365.2422) as 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>")
@@ -122,26 +122,26 @@
" </if> " +
"<if test='pageEldersAuthDTO.ids == null or pageEldersAuthDTO.ids.length==0 '>" +
- "<if test='pageEldersAuthDTO.sumitUserId != null'>" +
- " AND ea.SUMIT_USER_ID = #{pageEldersAuthDTO.sumitUserId} " +
- " </if> " +
- "<if test='pageEldersAuthDTO.idCard != null'>" +
- " AND ea.ID_CARD = #{pageEldersAuthDTO.idCard} " +
- " </if> " +
- "<if test='pageEldersAuthDTO.authUserName != null'>" +
- " AND ea.AUTH_USER_NAME like concat('%', #{pageEldersAuthDTO.authUserName}, '%' ) " +
- " </if> " +
- "<if test='pageEldersAuthDTO.type == 1 '>" +
- " AND DATE_FORMAT(ea.CREATE_AT, '%c') = #{pageEldersAuthDTO.month} " +
- " </if> " +
- "<if test='pageEldersAuthDTO.type == 2 '>" +
- "<if test='pageEldersAuthDTO.createAtStart != null'>" +
- " AND ea.create_at <![CDATA[>=]]> #{pageComShopOrderSearchDTO.createAtStart} " +
- " </if> " +
- "<if test='pageEldersAuthDTO.createAtEnd != null'>" +
- " AND ea.create_at <![CDATA[<=]]> #{pageComShopOrderSearchDTO.createAtEnd} " +
- " </if> " +
- " </if> " +
+ "<if test='pageEldersAuthDTO.sumitUserId != null'>" +
+ " AND ea.SUMIT_USER_ID = #{pageEldersAuthDTO.sumitUserId} " +
+ " </if> " +
+ "<if test='pageEldersAuthDTO.idCard != null'>" +
+ " AND ea.ID_CARD = #{pageEldersAuthDTO.idCard} " +
+ " </if> " +
+ "<if test='pageEldersAuthDTO.authUserName != null'>" +
+ " AND ea.AUTH_USER_NAME like concat('%', #{pageEldersAuthDTO.authUserName}, '%' ) " +
+ " </if> " +
+ "<if test='pageEldersAuthDTO.type == 1 '>" +
+ " AND DATE_FORMAT(ea.CREATE_AT, '%c') = #{pageEldersAuthDTO.month} " +
+ " </if> " +
+ "<if test='pageEldersAuthDTO.type == 2 '>" +
+ "<if test='pageEldersAuthDTO.createAtStart != null'>" +
+ " AND ea.create_at <![CDATA[>=]]> #{pageComShopOrderSearchDTO.createAtStart} " +
+ " </if> " +
+ "<if test='pageEldersAuthDTO.createAtEnd != null'>" +
+ " AND ea.create_at <![CDATA[<=]]> #{pageComShopOrderSearchDTO.createAtEnd} " +
+ " </if> " +
+ " </if> " +
" </if> " +
" </where>" +
" ORDER BY ea.${pageEldersAuthDTO.sortBy} ${pageEldersAuthDTO.order} " +
--
Gitblit v1.7.1