From e0c9131696c8ba61037c36f8c85e5bb67d5d9d81 Mon Sep 17 00:00:00 2001
From: duckweed <duckweed_lzy@aliyun.com>
Date: 星期二, 08 十月 2019 22:05:39 +0800
Subject: [PATCH] 修复拜访时间显示问题

---
 java110-db/src/main/resources/mapper/visit/VisitServiceDaoImplMapper.xml |  222 +++++++++++++++++++++++++++++++-----------------------
 1 files changed, 127 insertions(+), 95 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/visit/VisitServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/visit/VisitServiceDaoImplMapper.xml
index 73b5c7e..8600e17 100644
--- a/java110-db/src/main/resources/mapper/visit/VisitServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/visit/VisitServiceDaoImplMapper.xml
@@ -7,40 +7,26 @@
     <!-- 淇濆瓨璁垮淇℃伅淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessVisitInfo" parameterType="Map">
         insert into business_visit_info(
-        v_id,departure_time,visit_time,phoneNumber,operate,name,visit_case,visit_gender,owner_id,userId
+        departure_time,v_name,visit_gender,owner_id,user_id,v_id,phone_number,operate,visit_case,community_id,b_id,visit_time
         ) values (
-        #{vId},#{departureTime},#{visitTime},#{phoneNumber},#{operate},#{name},#{visitCase},#{visitGender},#{ownerId},#{userId}
+        #{departureTime},#{vName},#{visitGender},#{ownerId},#{userId},#{vId},#{phoneNumber},#{operate},#{visitCase},#{communityId},#{bId},#{visitTime}
         )
     </insert>
 
 
     <!-- 鏌ヨ璁垮淇℃伅淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
     <select id="getBusinessVisitInfo" parameterType="Map" resultType="Map">
-        select t.v_id,t.v_id vId,t.departure_time,t.departure_time departureTime,t.visit_time,t.visit_time
-        visitTime,t.phoneNumber,t.operate,t.name,t.visit_case,t.visit_case visitCase,t.visit_gender,t.visit_gender
-        visitGender,t.owner_id,t.owner_id ownerId,t.userId
+        select t.departure_time,t.departure_time departureTime,t.v_name,t.v_name vName,t.visit_gender,t.visit_gender
+        visitGender,t.owner_id,t.owner_id ownerId,t.user_id,t.user_id userId,t.v_id,t.v_id vId,t.visit_time,t.visit_time
+        visitTime,t.phone_number,t.phone_number phoneNumber,t.operate,t.visit_case,t.visit_case
+        visitCase,t.community_id,t.community_id communityId,t.b_id,t.b_id bId
         from business_visit_info t
         where 1 =1
-        <if test="vId !=null and vId != ''">
-            and t.v_id= #{vId}
-        </if>
-        <if test="departureTime !=null and departureTime != ''">
+        <if test="departureTime !=null ">
             and t.departure_time= #{departureTime}
         </if>
-        <if test="visitTime !=null and visitTime != ''">
-            and t.visit_time= #{visitTime}
-        </if>
-        <if test="phoneNumber !=null and phoneNumber != ''">
-            and t.phoneNumber= #{phoneNumber}
-        </if>
-        <if test="operate !=null and operate != ''">
-            and t.operate= #{operate}
-        </if>
-        <if test="name !=null and name != ''">
-            and t.name= #{name}
-        </if>
-        <if test="visitCase !=null and visitCase != ''">
-            and t.visit_case= #{visitCase}
+        <if test="vName !=null and vName != ''">
+            and t.v_name= #{vName}
         </if>
         <if test="visitGender !=null and visitGender != ''">
             and t.visit_gender= #{visitGender}
@@ -49,7 +35,28 @@
             and t.owner_id= #{ownerId}
         </if>
         <if test="userId !=null and userId != ''">
-            and t.userId= #{userId}
+            and t.user_id= #{userId}
+        </if>
+        <if test="vId !=null and vId != ''">
+            and t.v_id= #{vId}
+        </if>
+        <if test="visitTime !=null ">
+            and t.visit_time= #{visitTime}
+        </if>
+        <if test="phoneNumber !=null and phoneNumber != ''">
+            and t.phone_number= #{phoneNumber}
+        </if>
+        <if test="operate !=null and operate != ''">
+            and t.operate= #{operate}
+        </if>
+        <if test="visitCase !=null and visitCase != ''">
+            and t.visit_case= #{visitCase}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
         </if>
 
     </select>
@@ -57,29 +64,16 @@
 
     <!-- 淇濆瓨璁垮淇℃伅淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
     <insert id="saveVisitInfoInstance" parameterType="Map">
-        insert into visit_info(
-        v_id,departure_time,visit_time,phoneNumber,name,visit_case,status_cd,visit_gender,owner_id,userId
+        insert into s_visit_info(
+        departure_time,v_name,status_cd,visit_gender,owner_id,user_id,v_id,visit_time,phone_number,visit_case,community_id,b_id
         ) select
-        t.v_id,t.departure_time,t.visit_time,t.phoneNumber,t.name,t.visit_case,'0',t.visit_gender,t.owner_id,t.userId
+        t.departure_time,t.v_name,'0',t.visit_gender,t.owner_id,t.user_id,t.v_id,t.visit_time,t.phone_number,t.visit_case,t.community_id,t.b_id
         from business_visit_info t where 1=1
-        <if test="vId !=null and vId != ''">
-            and t.v_id= #{vId}
-        </if>
-        <if test="departureTime !=null and departureTime != ''">
+        <if test="departureTime !=null ">
             and t.departure_time= #{departureTime}
         </if>
-        <if test="visitTime !=null and visitTime != ''">
-            and t.visit_time= #{visitTime}
-        </if>
-        <if test="phoneNumber !=null and phoneNumber != ''">
-            and t.phoneNumber= #{phoneNumber}
-        </if>
-        and t.operate= 'ADD'
-        <if test="name !=null and name != ''">
-            and t.name= #{name}
-        </if>
-        <if test="visitCase !=null and visitCase != ''">
-            and t.visit_case= #{visitCase}
+        <if test="vName !=null and vName != ''">
+            and t.v_name= #{vName}
         </if>
         <if test="visitGender !=null and visitGender != ''">
             and t.visit_gender= #{visitGender}
@@ -88,7 +82,26 @@
             and t.owner_id= #{ownerId}
         </if>
         <if test="userId !=null and userId != ''">
-            and t.userId= #{userId}
+            and t.user_id= #{userId}
+        </if>
+        <if test="vId !=null and vId != ''">
+            and t.v_id= #{vId}
+        </if>
+        <if test="visitTime !=null ">
+            and t.visit_time= #{visitTime}
+        </if>
+        <if test="phoneNumber !=null and phoneNumber != ''">
+            and t.phone_number= #{phoneNumber}
+        </if>
+        and t.operate= 'ADD'
+        <if test="visitCase !=null and visitCase != ''">
+            and t.visit_case= #{visitCase}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
         </if>
 
     </insert>
@@ -96,28 +109,17 @@
 
     <!-- 鏌ヨ璁垮淇℃伅淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getVisitInfo" parameterType="Map" resultType="Map">
-        select t.v_id,t.v_id vId,t.departure_time,t.departure_time departureTime,t.visit_time,t.visit_time
-        visitTime,t.phoneNumber,t.name,t.visit_case,t.visit_case visitCase,t.status_cd,t.status_cd
-        statusCd,t.visit_gender,t.visit_gender visitGender,t.owner_id,t.owner_id ownerId,t.userId
-        from visit_info t
+        select t.departure_time,t.departure_time departureTime,t.v_name,t.v_name vName,t.status_cd,t.status_cd
+        statusCd,t.visit_gender,t.visit_gender visitGender,t.owner_id,t.owner_id ownerId,t.user_id,t.user_id
+        userId,t.v_id,t.v_id vId,t.visit_time,t.visit_time visitTime,t.phone_number,t.phone_number
+        phoneNumber,t.visit_case,t.visit_case visitCase,t.community_id,t.community_id communityId,t.b_id,t.b_id bId
+        from s_visit_info t
         where 1 =1
-        <if test="vId !=null and vId != ''">
-            and t.v_id= #{vId}
-        </if>
-        <if test="departureTime !=null and departureTime != ''">
+        <if test="departureTime !=null ">
             and t.departure_time= #{departureTime}
         </if>
-        <if test="visitTime !=null and visitTime != ''">
-            and t.visit_time= #{visitTime}
-        </if>
-        <if test="phoneNumber !=null and phoneNumber != ''">
-            and t.phoneNumber= #{phoneNumber}
-        </if>
-        <if test="name !=null and name != ''">
-            and t.name= #{name}
-        </if>
-        <if test="visitCase !=null and visitCase != ''">
-            and t.visit_case= #{visitCase}
+        <if test="vName !=null and vName != ''">
+            and t.v_name= #{vName}
         </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
@@ -129,7 +131,25 @@
             and t.owner_id= #{ownerId}
         </if>
         <if test="userId !=null and userId != ''">
-            and t.userId= #{userId}
+            and t.user_id= #{userId}
+        </if>
+        <if test="vId !=null and vId != ''">
+            and t.v_id= #{vId}
+        </if>
+        <if test="visitTime !=null ">
+            and t.visit_time= #{visitTime}
+        </if>
+        <if test="phoneNumber !=null and phoneNumber != ''">
+            and t.phone_number= #{phoneNumber}
+        </if>
+        <if test="visitCase !=null and visitCase != ''">
+            and t.visit_case= #{visitCase}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
         </if>
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -140,24 +160,15 @@
 
     <!-- 淇敼璁垮淇℃伅淇℃伅 add by wuxw 2018-07-03 -->
     <update id="updateVisitInfoInstance" parameterType="Map">
-        update visit_info t set t.status_cd = #{statusCd}
+        update s_visit_info t set t.status_cd = #{statusCd}
         <if test="newBId != null and newBId != ''">
             ,t.b_id = #{newBId}
         </if>
-        <if test="departureTime !=null and departureTime != ''">
+        <if test="departureTime !=null ">
             , t.departure_time= #{departureTime}
         </if>
-        <if test="visitTime !=null and visitTime != ''">
-            , t.visit_time= #{visitTime}
-        </if>
-        <if test="phoneNumber !=null and phoneNumber != ''">
-            , t.phoneNumber= #{phoneNumber}
-        </if>
-        <if test="name !=null and name != ''">
-            , t.name= #{name}
-        </if>
-        <if test="visitCase !=null and visitCase != ''">
-            , t.visit_case= #{visitCase}
+        <if test="vName !=null and vName != ''">
+            , t.v_name= #{vName}
         </if>
         <if test="visitGender !=null and visitGender != ''">
             , t.visit_gender= #{visitGender}
@@ -166,11 +177,26 @@
             , t.owner_id= #{ownerId}
         </if>
         <if test="userId !=null and userId != ''">
-            , t.userId= #{userId}
+            , t.user_id= #{userId}
+        </if>
+        <if test="visitTime !=null ">
+            , t.visit_time= #{visitTime}
+        </if>
+        <if test="phoneNumber !=null and phoneNumber != ''">
+            , t.phone_number= #{phoneNumber}
+        </if>
+        <if test="visitCase !=null and visitCase != ''">
+            , t.visit_case= #{visitCase}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
         </if>
         where 1=1
         <if test="vId !=null and vId != ''">
             and t.v_id= #{vId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
         </if>
 
     </update>
@@ -178,25 +204,13 @@
     <!-- 鏌ヨ璁垮淇℃伅鏁伴噺 add by wuxw 2018-07-03 -->
     <select id="queryVisitsCount" parameterType="Map" resultType="Map">
         select count(1) count
-        from visit_info t
+        from s_visit_info t
         where 1 =1
-        <if test="vId !=null and vId != ''">
-            and t.v_id= #{vId}
-        </if>
-        <if test="departureTime !=null and departureTime != ''">
+        <if test="departureTime !=null ">
             and t.departure_time= #{departureTime}
         </if>
-        <if test="visitTime !=null and visitTime != ''">
-            and t.visit_time= #{visitTime}
-        </if>
-        <if test="phoneNumber !=null and phoneNumber != ''">
-            and t.phoneNumber= #{phoneNumber}
-        </if>
-        <if test="name !=null and name != ''">
-            and t.name= #{name}
-        </if>
-        <if test="visitCase !=null and visitCase != ''">
-            and t.visit_case= #{visitCase}
+        <if test="vName !=null and vName != ''">
+            and t.v_name= #{vName}
         </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
@@ -208,7 +222,25 @@
             and t.owner_id= #{ownerId}
         </if>
         <if test="userId !=null and userId != ''">
-            and t.userId= #{userId}
+            and t.user_id= #{userId}
+        </if>
+        <if test="vId !=null and vId != ''">
+            and t.v_id= #{vId}
+        </if>
+        <if test="visitTime !=null ">
+            and t.visit_time= #{visitTime}
+        </if>
+        <if test="phoneNumber !=null and phoneNumber != ''">
+            and t.phone_number= #{phoneNumber}
+        </if>
+        <if test="visitCase !=null and visitCase != ''">
+            and t.visit_case= #{visitCase}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
         </if>
 
 

--
Gitblit v1.8.0