From 0fe94ada8ffb65e60372227d4c1c8f5bf98ddb8b Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 20 四月 2021 14:45:26 +0800
Subject: [PATCH] add: 订单详细信息订单日志，商家后台登陆时返回关联店铺信息

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
index 15b6e14..2afa610 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -7,6 +7,7 @@
 import com.panzhihua.common.model.vos.community.ComActMessageVO;
 import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
 import com.panzhihua.common.model.vos.community.PageComActMessageVO;
+import com.panzhihua.common.model.vos.user.ComHouseMemberVo;
 import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
 import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -92,6 +93,9 @@
     @Select("select id,user_id,relationship,`name`,id_card,phone,age,health,job,create_at,update_at from com_mng_family_info where user_id=#{userId}")
     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}")
+    List<ComHouseMemberVo> listHouseMermberByUserId(@Param("comMngPopulationDO") ComMngPopulationDO comMngPopulationDO);
+
     @Select("<script> " +
             "SELECT\n" +
             "cmp.`name`,\n" +
@@ -121,19 +125,22 @@
             "com_mng_population AS cmp " +
             "LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id " +
             "<where>" +
-            "<if test='comMngPopulationVO.name != null and comMngPopulationVO.name.trim() != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.name != null and comMngPopulationVO.name != &quot;&quot;'>" +
             "AND cmp.`name` LIKE concat(#{comMngPopulationVO.name},'%') " +
             " </if> " +
-            "<if test='comMngPopulationVO.road != null and comMngPopulationVO.road.trim() != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.actId != null'>" +
+            " and cmp.act_id = #{comMngPopulationVO.actId} " +
+            " </if> " +
+            "<if test='comMngPopulationVO.road != null and comMngPopulationVO.road != &quot;&quot;'>" +
             "AND cmp.road LIKE concat(#{comMngPopulationVO.road},'%') " +
             " </if> " +
-            "<if test='comMngPopulationVO.doorNo != null and comMngPopulationVO.doorNo.trim() != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.doorNo != null and comMngPopulationVO.doorNo != &quot;&quot;'>" +
             "AND cmp.door_no = #{comMngPopulationVO.doorNo} " +
             " </if> " +
-            "<if test='comMngPopulationVO.alley != null and comMngPopulationVO.alley.trim() != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.alley != null and comMngPopulationVO.alley != &quot;&quot;'>" +
             "AND cmv.alley LIKE concat(#{comMngPopulationVO.alley},'%') " +
             " </if> " +
-            "<if test='comMngPopulationVO.sex != null and comMngPopulationVO.sex.trim() != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.sex != null and comMngPopulationVO.sex != &quot;&quot;'>" +
             "AND cmp.sex = #{comMngPopulationVO.sex} " +
             " </if> " +
             "<if test='comMngPopulationVO.ageStart != null'>" +
@@ -142,19 +149,19 @@
             "<if test='comMngPopulationVO.ageEnd != null'>" +
             "AND cmp.age <![CDATA[ <= ]]> #{comMngPopulationVO.ageEnd} " +
             " </if> " +
-            "<if test='comMngPopulationVO.nativePlace != null and comMngPopulationVO.nativePlace.trim() != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.nativePlace != null and comMngPopulationVO.nativePlace != &quot;&quot;'>" +
             "AND cmp.native_place LIKE concat(#{comMngPopulationVO.nativePlace},'%') " +
             " </if> " +
-            "<if test='comMngPopulationVO.nation != null and comMngPopulationVO.nation.trim() != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.nation != null and comMngPopulationVO.nation != &quot;&quot;'>" +
             "AND cmp.nation = #{comMngPopulationVO.nation} " +
             " </if> " +
-            "<if test='comMngPopulationVO.politicalOutlook != null and comMngPopulationVO.politicalOutlook.trim() != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.politicalOutlook != null and comMngPopulationVO.politicalOutlook != &quot;&quot;'>" +
             "AND cmp.political_outlook = #{comMngPopulationVO.politicalOutlook} " +
             " </if> " +
-            "<if test='comMngPopulationVO.cardNo != null and comMngPopulationVO.cardNo.trim() != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.cardNo != null and comMngPopulationVO.cardNo != &quot;&quot;'>" +
             "AND cmp.card_no = #{comMngPopulationVO.cardNo} " +
             " </if> " +
-            "<if test='comMngPopulationVO.remark != null and comMngPopulationVO.remark.trim() != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.remark != null and comMngPopulationVO.remark != &quot;&quot;'>" +
             "AND cmp.remark = #{comMngPopulationVO.remark} " +
             " </if> " +
             " </where>" +

--
Gitblit v1.7.1