From 54c374edf023672ff022044e67f86186a0084a21 Mon Sep 17 00:00:00 2001
From: chenwei <timeless646@163.com>
Date: Thu, 11 Jul 2024 15:47:00 +0800
Subject: [PATCH] 修复查询拜访中手动新增的用户

---
 zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitUserController.java    |  3 ++-
 zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McVisitUserMapper.java            | 22 +++++++++++++---------
 zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitUserService.java         | 23 ++++++++++++++---------
 zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitUserServiceImpl.java | 31 +++++++++++++++++++------------
 zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitUserMapper.xml                                   | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 97 insertions(+), 31 deletions(-)

diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitUserController.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitUserController.java
index 775f463..8e10781 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitUserController.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitUserController.java
@@ -34,7 +34,8 @@ public class McVisitUserController extends BaseController
     public TableDataInfo list(McVisitUser mcVisitUser)
     {
         startPage();
-        List<McVisitUser> list = mcVisitUserService.selectMcVisitUserList(mcVisitUser);
+        List<McVisitUser> list = mcVisitUserService.selectMcVisitUserByVlgOrCmtys
+                (mcVisitUser);
         return getDataTable(list);
     }
 }
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McVisitUserMapper.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McVisitUserMapper.java
index 65362ef..c4b7a5a 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McVisitUserMapper.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McVisitUserMapper.java
@@ -1,19 +1,20 @@
 package com.chinagas.modules.schsf.mapper;
 
-import java.util.List;
 import com.chinagas.modules.schsf.domain.McVisitUser;
 
+import java.util.List;
+
 /**
  * 百万用户信息（被拜访的用户）Mapper接口
- * 
+ *
  * @author cw
  * @date 2024-05-30
  */
-public interface McVisitUserMapper 
+public interface McVisitUserMapper
 {
     /**
      * 查询百万用户信息（被拜访的用户）
-     * 
+     *
      * @param id 百万用户信息（被拜访的用户）主键
      * @return 百万用户信息（被拜访的用户）
      */
@@ -21,7 +22,7 @@ public interface McVisitUserMapper
 
     /**
      * 查询百万用户信息（被拜访的用户）列表
-     * 
+     *
      * @param mcVisitUser 百万用户信息（被拜访的用户）
      * @return 百万用户信息（被拜访的用户）集合
      */
@@ -29,7 +30,7 @@ public interface McVisitUserMapper
 
     /**
      * 新增百万用户信息（被拜访的用户）
-     * 
+     *
      * @param mcVisitUser 百万用户信息（被拜访的用户）
      * @return 结果
      */
@@ -37,7 +38,7 @@ public interface McVisitUserMapper
 
     /**
      * 修改百万用户信息（被拜访的用户）
-     * 
+     *
      * @param mcVisitUser 百万用户信息（被拜访的用户）
      * @return 结果
      */
@@ -45,7 +46,7 @@ public interface McVisitUserMapper
 
     /**
      * 删除百万用户信息（被拜访的用户）
-     * 
+     *
      * @param id 百万用户信息（被拜访的用户）主键
      * @return 结果
      */
@@ -53,9 +54,12 @@ public interface McVisitUserMapper
 
     /**
      * 批量删除百万用户信息（被拜访的用户）
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteMcVisitUserByIds(Long[] ids);
+
+    List<McVisitUser> selectMcVisitUserByVlgOrCmtys(McVisitUser mcVisitUser);
+
 }
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitUserService.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitUserService.java
index 655e95b..d852f1f 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitUserService.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitUserService.java
@@ -1,19 +1,20 @@
 package com.chinagas.modules.schsf.service;
 
-import java.util.List;
 import com.chinagas.modules.schsf.domain.McVisitUser;
 
+import java.util.List;
+
 /**
  * 百万用户信息（被拜访的用户）Service接口
- * 
+ *
  * @author cw
  * @date 2024-05-30
  */
-public interface IMcVisitUserService 
+public interface IMcVisitUserService
 {
     /**
      * 查询百万用户信息（被拜访的用户）
-     * 
+     *
      * @param id 百万用户信息（被拜访的用户）主键
      * @return 百万用户信息（被拜访的用户）
      */
@@ -21,7 +22,7 @@ public interface IMcVisitUserService
 
     /**
      * 查询百万用户信息（被拜访的用户）列表
-     * 
+     *
      * @param mcVisitUser 百万用户信息（被拜访的用户）
      * @return 百万用户信息（被拜访的用户）集合
      */
@@ -29,7 +30,7 @@ public interface IMcVisitUserService
 
     /**
      * 新增百万用户信息（被拜访的用户）
-     * 
+     *
      * @param mcVisitUser 百万用户信息（被拜访的用户）
      * @return 结果
      */
@@ -37,7 +38,7 @@ public interface IMcVisitUserService
 
     /**
      * 修改百万用户信息（被拜访的用户）
-     * 
+     *
      * @param mcVisitUser 百万用户信息（被拜访的用户）
      * @return 结果
      */
@@ -45,7 +46,7 @@ public interface IMcVisitUserService
 
     /**
      * 批量删除百万用户信息（被拜访的用户）
-     * 
+     *
      * @param ids 需要删除的百万用户信息（被拜访的用户）主键集合
      * @return 结果
      */
@@ -53,9 +54,13 @@ public interface IMcVisitUserService
 
     /**
      * 删除百万用户信息（被拜访的用户）信息
-     * 
+     *
      * @param id 百万用户信息（被拜访的用户）主键
      * @return 结果
      */
     public int deleteMcVisitUserById(Long id);
+
+    List<McVisitUser> selectMcVisitUserByVlgOrCmtys(McVisitUser mcVisitUser);
+
+
 }
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitUserServiceImpl.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitUserServiceImpl.java
index baa06cb..350b10f 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitUserServiceImpl.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitUserServiceImpl.java
@@ -1,28 +1,30 @@
 package com.chinagas.modules.schsf.service.impl;
 
-import java.util.List;
 import com.chinagas.common.core.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.chinagas.modules.schsf.mapper.McVisitUserMapper;
 import com.chinagas.modules.schsf.domain.McVisitUser;
+import com.chinagas.modules.schsf.mapper.McVisitUserMapper;
 import com.chinagas.modules.schsf.service.IMcVisitUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
 
 /**
  * 百万用户信息（被拜访的用户）Service业务层处理
- * 
+ *
  * @author cw
  * @date 2024-05-30
  */
 @Service
-public class McVisitUserServiceImpl implements IMcVisitUserService 
+public class McVisitUserServiceImpl implements IMcVisitUserService
 {
     @Autowired
     private McVisitUserMapper mcVisitUserMapper;
 
     /**
      * 查询百万用户信息（被拜访的用户）
-     * 
+     *
      * @param id 百万用户信息（被拜访的用户）主键
      * @return 百万用户信息（被拜访的用户）
      */
@@ -34,7 +36,7 @@ public class McVisitUserServiceImpl implements IMcVisitUserService
 
     /**
      * 查询百万用户信息（被拜访的用户）列表
-     * 
+     *
      * @param mcVisitUser 百万用户信息（被拜访的用户）
      * @return 百万用户信息（被拜访的用户）
      */
@@ -46,7 +48,7 @@ public class McVisitUserServiceImpl implements IMcVisitUserService
 
     /**
      * 新增百万用户信息（被拜访的用户）
-     * 
+     *
      * @param mcVisitUser 百万用户信息（被拜访的用户）
      * @return 结果
      */
@@ -59,7 +61,7 @@ public class McVisitUserServiceImpl implements IMcVisitUserService
 
     /**
      * 修改百万用户信息（被拜访的用户）
-     * 
+     *
      * @param mcVisitUser 百万用户信息（被拜访的用户）
      * @return 结果
      */
@@ -71,7 +73,7 @@ public class McVisitUserServiceImpl implements IMcVisitUserService
 
     /**
      * 批量删除百万用户信息（被拜访的用户）
-     * 
+     *
      * @param ids 需要删除的百万用户信息（被拜访的用户）主键
      * @return 结果
      */
@@ -83,7 +85,7 @@ public class McVisitUserServiceImpl implements IMcVisitUserService
 
     /**
      * 删除百万用户信息（被拜访的用户）信息
-     * 
+     *
      * @param id 百万用户信息（被拜访的用户）主键
      * @return 结果
      */
@@ -92,4 +94,9 @@ public class McVisitUserServiceImpl implements IMcVisitUserService
     {
         return mcVisitUserMapper.deleteMcVisitUserById(id);
     }
+
+    @Override
+    public List<McVisitUser> selectMcVisitUserByVlgOrCmtys(McVisitUser mcVisitUser) {
+        return mcVisitUserMapper.selectMcVisitUserByVlgOrCmtys(mcVisitUser);
+    }
 }
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitUserMapper.xml b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitUserMapper.xml
index af26d81..caa3c51 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitUserMapper.xml
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitUserMapper.xml
@@ -193,4 +193,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectMcVisitUserByVlgOrCmtys" resultMap="McVisitUserResult"  parameterType="com.chinagas.modules.schsf.domain.McVisitUser">
+        SELECT user_code, user_name, user_phone, residence_type, family_members, income_source, house_condition, original_appliances, decoration_status, current_cooking_energy, current_heating_energy, is_intent, region_name, region_code, budget_owner, company_name, company_code , province, city,district,street,detailed_address, fridge_status, ac_status, tv_status, washer_status,water_heater_status, pv_system_status, township, village, vlg_or_cmty, user_age, create_time, create_by, def_flag
+        FROM mc_visit_user
+        where 1=1
+            <if test="userCode != null  and userCode != ''"> and user_code = #{userCode}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="userPhone != null  and userPhone != ''"> and user_phone = #{userPhone}</if>
+            <if test="residenceType != null  and residenceType != ''"> and residence_type = #{residenceType}</if>
+            <if test="familyMembers != null  and familyMembers != ''"> and family_members = #{familyMembers}</if>
+            <if test="incomeSource != null  and incomeSource != ''"> and income_source = #{incomeSource}</if>
+            <if test="houseCondition != null  and houseCondition != ''"> and house_condition = #{houseCondition}</if>
+            <if test="originalAppliances != null  and originalAppliances != ''"> and original_appliances = #{originalAppliances}</if>
+            <if test="decorationStatus != null  and decorationStatus != ''"> and decoration_status = #{decorationStatus}</if>
+            <if test="currentCookingEnergy != null  and currentCookingEnergy != ''"> and current_cooking_energy = #{currentCookingEnergy}</if>
+            <if test="currentHeatingEnergy != null  and currentHeatingEnergy != ''"> and current_heating_energy = #{currentHeatingEnergy}</if>
+            <if test="isIntent != null  and isIntent != ''"> and is_intent = #{isIntent}</if>
+            <if test="regionName != null  and regionName != ''"> and region_name like concat('%', #{regionName}, '%')</if>
+            <if test="regionCode != null  and regionCode != ''"> and region_code = #{regionCode}</if>
+            <if test="budgetOwner != null  and budgetOwner != ''"> and budget_owner = #{budgetOwner}</if>
+            <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
+            <if test="companyCode != null  and companyCode != ''"> and company_code = #{companyCode}</if>
+            <if test="province != null  and province != ''"> and province = #{province}</if>
+            <if test="city != null  and city != ''"> and city = #{city}</if>
+            <if test="district != null  and district != ''"> and district = #{district}</if>
+            <if test="street != null  and street != ''"> and street = #{street}</if>
+            <if test="detailedAddress != null  and detailedAddress != ''"> and detailed_address = #{detailedAddress}</if>
+            <if test="township != null  and township != ''"> and township = #{township}</if>
+            <if test="village != null  and village != ''"> and village = #{village}</if>
+            <if test="vlgOrCmty != null  and vlgOrCmty != ''"> and vlg_or_cmty = #{vlgOrCmty}</if>
+            <if test="userAge != null  and userAge != ''"> and user_age = #{userAge}</if>
+            <if test="defFlag != null  and defFlag != ''"> and def_flag = #{defFlag}</if>
+        UNION
+        SELECT DISTINCT v.user_code, v.user_name, v.user_phone,null ,v.family_members,null,v.house_condition,
+        null,null ,v.current_cooking_energy,v.current_heating_energy,v.is_intent,v.region_name,null,null,v.company_name,v.company_code,
+        v.user_province as province,v.user_city as city,v.user_district as district,v.user_street as street,v.user_detailed_address as detailed_address,
+        v.fridge_status, ac_status,v.tv_status, v.washer_status,v.water_heater_status,v.pv_system_status,null ,null ,v.vlg_or_cmty ,null ,null,null,null
+        FROM mc_visit v
+        INNER JOIN (
+            SELECT DISTINCT u.user_name, u.user_phone,max(u.id) as id
+            FROM mc_visit u
+            WHERE 1=1
+            and not exists( select id from mc_visit_user t where t.user_phone=u.user_phone)
+            GROUP BY u.user_name, u.user_phone
+        ) tb  on v.id= tb.id
+        WHERE 1=1
+        <if test="companyCode != null  and companyCode != ''"> and v.company_code = #{companyCode}</if>
+        <if test="vlgOrCmty != null  and vlgOrCmty != ''"> and v.vlg_or_cmty = #{vlgOrCmty}</if>
+    </select>
 </mapper>
--
libgit2 0.21.2