From 00a59b93c16b24e7be77c6f1ce4866c75a2e0431 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 19 四月 2022 16:32:21 +0800
Subject: [PATCH] 花城E+防疫修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealAssetsDAO.java | 1 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoMemberMapper.xml | 12 +++++++++++-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealAssetsDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealAssetsDAO.java
index d91546c..7a0c4f6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealAssetsDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealAssetsDAO.java
@@ -43,6 +43,7 @@
+ " case t.floor_type when 1 then '高层' when 2 then '中层' when 3 then '低层' else '/' end floorType, "
+ " t.num, " + " t.square, " + " t.address " + "FROM " + " com_mng_real_assets t "
+ " LEFT JOIN com_mng_struct_build_type t2 ON t.build_type_id = t2.id"
+ + " WHERE 1= 1 "
+ "<if test='exportRealAssetsExcelDTO.name != null and exportRealAssetsExcelDTO.name.trim() != ""'>"
+ " and t.name LIKE concat( #{exportRealAssetsExcelDTO.name}, '%' ) " + " </if> "
+ "<if test='exportRealAssetsExcelDTO.communityId != null and exportRealAssetsExcelDTO.communityId != 0'>"
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml
index b1d0a50..205157b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml
@@ -250,7 +250,7 @@
</select>
<select id="selectActivityLine" resultType="integer">
- select count(*) from com_act_activity where type = 3 and publish_at >= DATE_FORMAT( CONCAT(#{year},'-',#{date},'-00'), '%Y-%m-00 00:00:00') and DATE_FORMAT( LAST_DAY(CONCAT(#{year},'-',#{date},'-00')), '%Y-%m-%d 23:59:59') >=publish_at
+ select count(*) from com_act_activity where type = 3 and publish_at >= DATE_FORMAT( CONCAT(#{year},'-',#{date},'-00'), '%Y-%m-00 00:00:00') and DATE_FORMAT( LAST_DAY(CONCAT(#{year},'-',#{date},'-00')), '%Y-%m-%d 23:59:59') >=publish_at and community_id =#{community_id}
</select>
<select id="partyMemberDetail" resultType="com.panzhihua.common.model.vos.community.PartyMemberDetailVO">
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoMemberMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoMemberMapper.xml
index ca3a1ad..f88c665 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoMemberMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoMemberMapper.xml
@@ -12,6 +12,16 @@
</resultMap>
<select id="pageList" resultType="com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoMemberVO">
- select * from com_act_easy_photo_member order by create_time desc
+ select * from com_act_easy_photo_member
+ <where>
+ 1=1
+ <if test="commonPage.name !=null and commonPage.name !=''">
+ and name like concat('%',#{commonPage.name},'%')
+ </if>
+ <if test="commonPage.phone !=null and commonPage.phone !=''">
+ and phone like concat('%',#{commonPage.phone},'%')
+ </if>
+ </where>
+ order by create_time desc
</select>
</mapper>
--
Gitblit v1.7.1