From b2b5bdf6f42597e582da96aa56707e1f68d3936e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 10 五月 2022 11:41:44 +0800
Subject: [PATCH] 优化 费用

---
 java110-db/src/main/resources/mapper/community/VisitServiceDaoImplMapper.xml |  134 +++++++++++++++++++++++++++++++++++++-------
 1 files changed, 113 insertions(+), 21 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/community/VisitServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/VisitServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 8600e17..aff84a6
--- a/java110-db/src/main/resources/mapper/community/VisitServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/VisitServiceDaoImplMapper.xml
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="visitServiceDaoImpl">
 
     <!-- 淇濆瓨璁垮淇℃伅淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessVisitInfo" parameterType="Map">
-        insert into business_visit_info(
-        departure_time,v_name,visit_gender,owner_id,user_id,v_id,phone_number,operate,visit_case,community_id,b_id,visit_time
-        ) values (
-        #{departureTime},#{vName},#{visitGender},#{ownerId},#{userId},#{vId},#{phoneNumber},#{operate},#{visitCase},#{communityId},#{bId},#{visitTime}
-        )
+        insert into business_visit_info(departure_time, v_name, visit_gender, owner_id, user_id, v_id, phone_number,
+                                        operate, visit_case, community_id, b_id, visit_time, car_num, entourage,
+                                        reason_type, state, state_remark)
+        values (#{departureTime}, #{vName}, #{visitGender}, #{ownerId}, #{userId}, #{vId}, #{phoneNumber}, #{operate},
+                #{visitCase}, #{communityId}, #{bId}, #{visitTime}, #{carNum}, #{entourage}, #{reasonType}, #{state},
+                #{stateRemark})
     </insert>
-
 
     <!-- 鏌ヨ璁垮淇℃伅淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
     <select id="getBusinessVisitInfo" parameterType="Map" resultType="Map">
         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
+        visitCase,t.community_id,t.community_id communityId,t.b_id,t.b_id ,t.car_num,t.car_num carNum,t.entourage,
+        t.reason_type,t.reason_type reasonType,t.state,t.state_remark,t.state_remark
+        stateRemark,t.create_time,t.create_time createTime
         from business_visit_info t
         where 1 =1
         <if test="departureTime !=null ">
@@ -52,22 +53,37 @@
         <if test="visitCase !=null and visitCase != ''">
             and t.visit_case= #{visitCase}
         </if>
+        <if test="carNum !=null and carNum != ''">
+            and t.car_num= #{carNum}
+        </if>
+        <if test="entourage !=null and entourage != ''">
+            and t.entourage= #{entourage}
+        </if>
+        <if test="reasonType !=null and reasonType != ''">
+            and t.reason_type= #{reasonType}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="stateRemark !=null and stateRemark != ''">
+            and t.state_remark= #{stateRemark}
+        </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>
-
 
     <!-- 淇濆瓨璁垮淇℃伅淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
     <insert id="saveVisitInfoInstance" parameterType="Map">
         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
+        departure_time,v_name,status_cd,visit_gender,owner_id,user_id,v_id,visit_time,phone_number,visit_case,community_id,b_id,car_num,
+        entourage,reason_type,state,state_remark
         ) select
-        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
+        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,
+        t.car_num,t.entourage,t.reason_type,t.state,t.state_remark
         from business_visit_info t where 1=1
         <if test="departureTime !=null ">
             and t.departure_time= #{departureTime}
@@ -93,6 +109,21 @@
         <if test="phoneNumber !=null and phoneNumber != ''">
             and t.phone_number= #{phoneNumber}
         </if>
+        <if test="carNum !=null and carNum != ''">
+            and t.car_num= #{carNum}
+        </if>
+        <if test="entourage !=null and entourage != ''">
+            and t.entourage= #{entourage}
+        </if>
+        <if test="reasonType !=null and reasonType != ''">
+            and t.reason_type= #{reasonType}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="stateRemark !=null and stateRemark != ''">
+            and t.state_remark= #{stateRemark}
+        </if>
         and t.operate= 'ADD'
         <if test="visitCase !=null and visitCase != ''">
             and t.visit_case= #{visitCase}
@@ -103,17 +134,19 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-
     </insert>
-
 
     <!-- 鏌ヨ璁垮淇℃伅淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getVisitInfo" parameterType="Map" resultType="Map">
         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
+        phoneNumber,t.visit_case,t.visit_case visitCase,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,
+        t.car_num,t.car_num carNum,t.entourage,t.reason_type,t.reason_type
+        reasonType,t.state,t.state_remark,t.state_remark stateRemark,td.name stateName,t.create_time,
+        t.create_time createTime
         from s_visit_info t
+        left join t_dict td on t.state = td.status_cd and td.table_name = 's_visit_info' and td.table_columns = 'state'
         where 1 =1
         <if test="departureTime !=null ">
             and t.departure_time= #{departureTime}
@@ -151,12 +184,38 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
+        <if test="visitStartTime !=null and visitStartTime !='' ">
+            and t.visit_time &gt;= #{visitStartTime}
+        </if>
+        <if test="visitEndTime !=null and visitEndTime !='' ">
+            and t.visit_time &lt;= #{visitEndTime}
+        </if>
+        <if test="carNum !=null and carNum != ''">
+            and t.car_num= #{carNum}
+        </if>
+        <if test="entourage !=null and entourage != ''">
+            and t.entourage= #{entourage}
+        </if>
+        <if test="reasonType !=null and reasonType != ''">
+            and t.reason_type= #{reasonType}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="stateRemark !=null and stateRemark != ''">
+            and t.state_remark= #{stateRemark}
+        </if>
+        <if test="carNumNoEmpty !=null and carNumNoEmpty != ''">
+            and t.car_num!= ""
+        </if>
+        <if test="sameDay !=null and sameDay != ''">
+            and TO_DAYS(t.create_time) = TO_DAYS(NOW())
+        </if>
+        order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
-
     </select>
-
 
     <!-- 淇敼璁垮淇℃伅淇℃伅 add by wuxw 2018-07-03 -->
     <update id="updateVisitInfoInstance" parameterType="Map">
@@ -191,6 +250,21 @@
         <if test="communityId !=null and communityId != ''">
             , t.community_id= #{communityId}
         </if>
+        <if test="carNum !=null and carNum != ''">
+            , t.car_num= #{carNum}
+        </if>
+        <if test="entourage !=null and entourage != ''">
+            , t.entourage= #{entourage}
+        </if>
+        <if test="reasonType !=null and reasonType != ''">
+            , t.reason_type= #{reasonType}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+        <if test="stateRemark !=null and stateRemark != ''">
+            , t.state_remark= #{stateRemark}
+        </if>
         where 1=1
         <if test="vId !=null and vId != ''">
             and t.v_id= #{vId}
@@ -198,7 +272,6 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-
     </update>
 
     <!-- 鏌ヨ璁垮淇℃伅鏁伴噺 add by wuxw 2018-07-03 -->
@@ -242,8 +315,27 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-
-
+        <if test="visitStartTime !=null and visitStartTime !='' ">
+            and t.visit_time &gt;= #{visitStartTime}
+        </if>
+        <if test="visitEndTime !=null and visitEndTime !='' ">
+            and t.visit_time &lt;= #{visitEndTime}
+        </if>
+        <if test="carNum !=null and carNum != ''">
+            and t.car_num= #{carNum}
+        </if>
+        <if test="entourage !=null and entourage != ''">
+            and t.entourage= #{entourage}
+        </if>
+        <if test="reasonType !=null and reasonType != ''">
+            and t.reason_type= #{reasonType}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="stateRemark !=null and stateRemark != ''">
+            and t.state_remark= #{stateRemark}
+        </if>
     </select>
 
 </mapper>

--
Gitblit v1.8.0