From 4430ceb824ac85a3b50108dadb2eac1e31d2c7d8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 23 一月 2021 15:48:33 +0800
Subject: [PATCH] 优化 考勤编辑功能

---
 java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml |   59 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml
index b2f9659..b9064aa 100644
--- a/java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml
@@ -7,9 +7,10 @@
     <!-- 淇濆瓨缁戝畾涓氫富淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessOwnerAppUserInfo" parameterType="Map">
         insert into business_owner_app_user(
-        id_card,open_id,link,remark,operate,app_user_name,community_name,state,app_user_id,community_id,app_type_cd,b_id,member_id,user_id
+        id_card,open_id,link,remark,operate,app_user_name,community_name,state,app_user_id,community_id,app_type_cd,b_id,member_id,user_id,app_type
         ) values (
-        #{idCard},#{openId},#{link},#{remark},#{operate},#{appUserName},#{communityName},#{state},#{appUserId},#{communityId},#{appTypeCd},#{bId},#{memberId},#{userId}
+        #{idCard},#{openId},#{link},#{remark},#{operate},#{appUserName},#{communityName},#{state},#{appUserId},#{communityId},
+        #{appTypeCd},#{bId},#{memberId},#{userId},#{appType}
         )
     </insert>
 
@@ -19,7 +20,8 @@
         select t.id_card,t.id_card idCard,t.open_id,t.open_id
         openId,t.link,t.remark,t.operate,t.app_user_name,t.app_user_name appUserName,t.community_name,t.community_name
         communityName,t.state,t.app_user_id,t.app_user_id appUserId,t.community_id,t.community_id
-        communityId,t.app_type_cd,t.app_type_cd appTypeCd,t.b_id,t.b_id bId,t.member_id,t.member_id memberId,t.user_id,t.user_id userId
+        communityId,t.app_type_cd,t.app_type_cd appTypeCd,t.b_id,t.b_id bId,t.member_id,t.member_id memberId,t.user_id,
+        t.user_id userId,t.app_type,t.app_type appType
         from business_owner_app_user t
         where 1 =1
         <if test="idCard !=null and idCard != ''">
@@ -71,9 +73,11 @@
     <!-- 淇濆瓨缁戝畾涓氫富淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
     <insert id="saveOwnerAppUserInfoInstance" parameterType="Map">
         insert into owner_app_user(
-        id_card,open_id,link,remark,status_cd,app_user_name,community_name,state,app_user_id,community_id,app_type_cd,b_id,member_id,user_id
+        id_card,open_id,link,remark,status_cd,app_user_name,community_name,state,app_user_id,community_id,app_type_cd,b_id,member_id,user_id,
+        app_type
         ) select
-        t.id_card,t.open_id,t.link,t.remark,'0',t.app_user_name,t.community_name,t.state,t.app_user_id,t.community_id,t.app_type_cd,t.b_id,t.member_id,t.user_id
+        t.id_card,t.open_id,t.link,t.remark,'0',t.app_user_name,t.community_name,t.state,t.app_user_id,t.community_id,t.app_type_cd,t.b_id,
+        t.member_id,t.user_id,t.app_type
         from business_owner_app_user t where 1=1
         <if test="idCard !=null and idCard != ''">
             and t.id_card= #{idCard}
@@ -124,12 +128,17 @@
         select t.id_card,t.id_card idCard,t.open_id,t.open_id openId,t.link,t.remark,t.status_cd,t.status_cd
         statusCd,t.app_user_name,t.app_user_name appUserName,t.community_name,t.community_name
         communityName,t.state,t.app_user_id,t.app_user_id appUserId,t.community_id,t.community_id
-        communityId,t.app_type_cd,t.app_type_cd appTypeCd,t.b_id,t.b_id bId,t.member_id,t.member_id memberId,td1.name stateName,t.user_id,t.user_id userId
-        from owner_app_user t,t_dict td1
+        communityId,t.app_type_cd,t.app_type_cd appTypeCd,t.b_id,t.b_id bId,t.member_id,t.member_id memberId,
+        td1.name stateName,t.user_id,t.user_id userId,t.app_type,t.app_type appType,t.create_time createTime,
+        bo.owner_id ownerId
+        from owner_app_user t,t_dict td1,building_owner bo
         where 1 =1
         and t.state = td1.status_cd
         and td1.table_name = 'owner_app_user'
         and td1.table_columns = 'state'
+        and t.member_id = bo.member_id
+        and t.community_id = bo.community_id
+        and bo.status_cd = '0'
         <if test="idCard !=null and idCard != ''">
             and t.id_card= #{idCard}
         </if>
@@ -179,6 +188,17 @@
         <if test="userId !=null and userId != ''">
             and t.user_id = #{userId}
         </if>
+        <if test="appType !=null and appType != ''">
+            and t.app_type = #{appType}
+        </if>
+        <if test="userIds !=null">
+            and t.user_id in
+            <foreach collection="userIds" open="(" close=")"
+                     separator=","  item="item">
+                #{item}
+            </foreach>
+        </if>
+        order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
@@ -213,9 +233,6 @@
         <if test="state !=null and state != ''">
             , t.state= #{state}
         </if>
-        <if test="communityId !=null and communityId != ''">
-            , t.community_id= #{communityId}
-        </if>
         <if test="appTypeCd !=null and appTypeCd != ''">
             , t.app_type_cd= #{appTypeCd}
         </if>
@@ -225,9 +242,18 @@
         <if test="userId !=null and userId != ''">
             , t.user_id= #{userId}
         </if>
+        <if test="appType !=null and appType != ''">
+            , t.app_type = #{appType}
+        </if>
         where 1=1
         <if test="appUserId !=null and appUserId != ''">
             and t.app_user_id= #{appUserId}
+        </if>
+        <if test="memberId !=null and memberId != ''">
+            and t.member_id= #{memberId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
         </if>
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
@@ -243,6 +269,7 @@
         and t.state = td1.status_cd
         and td1.table_name = 'owner_app_user'
         and td1.table_columns = 'state'
+        and t.status_cd = '0'
         <if test="idCard !=null and idCard != ''">
             and t.id_card= #{idCard}
         </if>
@@ -283,7 +310,17 @@
             and t.member_id= #{memberId}
         </if>
         <if test="userId !=null and userId != ''">
-            , t.user_id= #{userId}
+            and t.user_id= #{userId}
+        </if>
+        <if test="appType !=null and appType != ''">
+            and t.app_type = #{appType}
+        </if>
+        <if test="userIds !=null">
+            and t.user_id in
+            <foreach collection="userIds" open="(" close=")"
+                     separator=","  item="item">
+                #{item}
+            </foreach>
         </if>
 
 

--
Gitblit v1.8.0