From 2fa59cb896243a42623dfb210dc5f426d9f93a78 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 22 二月 2023 00:23:56 +0800
Subject: [PATCH] 优化考勤人员
---
java110-db/src/main/resources/mapper/user/OwnerCarV1ServiceDaoImplMapper.xml | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 12 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/OwnerCarV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OwnerCarV1ServiceDaoImplMapper.xml
index 89a1a6e..e0e9e60 100644
--- a/java110-db/src/main/resources/mapper/user/OwnerCarV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerCarV1ServiceDaoImplMapper.xml
@@ -8,9 +8,9 @@
<!-- 淇濆瓨杞﹁締淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveOwnerCarInfo" parameterType="Map">
insert into owner_car(car_brand, car_num, ps_id, remark, owner_id, car_type_cd, user_id, car_id, car_color,
- car_type, start_time, end_time, state, community_id, member_id, b_id)
+ car_type, start_time, end_time, state, community_id, member_id, b_id,lease_type)
values (#{carBrand}, #{carNum}, #{psId}, #{remark}, #{ownerId}, #{carTypeCd}, #{userId}, #{carId}, #{carColor},
- #{carType}, #{startTime}, #{endTime}, #{state}, #{communityId}, #{memberId}, '-1')
+ #{carType}, #{startTime}, #{endTime}, #{state}, #{communityId}, #{memberId}, '-1',#{leaseType})
</insert>
@@ -20,7 +20,8 @@
psId,t.remark,t.status_cd,t.status_cd statusCd,t.owner_id,t.owner_id ownerId,t.car_type_cd,t.car_type_cd
carTypeCd,t.user_id,t.user_id userId,t.car_id,t.car_id carId,t.car_color,t.car_color
carColor,t.car_type,t.car_type carType,t.start_time,t.start_time startTime,t.end_time,t.end_time
- endTime,t.state,t.community_id,t.community_id communityId,t.member_id,t.member_id memberId
+ endTime,t.state,t.community_id,t.community_id communityId,t.member_id,t.member_id memberId,t.lease_type
+ leaseType
from owner_car t
where 1 =1
<if test="carBrand !=null and carBrand != ''">
@@ -40,6 +41,15 @@
</if>
<if test="ownerId !=null and ownerId != ''">
and t.owner_id= #{ownerId}
+ </if>
+ <if test="leaseType !=null and leaseType != ''">
+ and t.lease_type= #{leaseType}
+ </if>
+ <if test="leaseTypes !=null ">
+ and t.lease_type in
+ <foreach collection="leaseTypes" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
<if test="carTypeCd !=null and carTypeCd != ''">
and t.car_type_cd= #{carTypeCd}
@@ -100,14 +110,8 @@
<if test="ownerId !=null and ownerId != ''">
, t.owner_id= #{ownerId}
</if>
- <if test="carTypeCd !=null and carTypeCd != ''">
- , t.car_type_cd= #{carTypeCd}
- </if>
<if test="userId !=null and userId != ''">
, t.user_id= #{userId}
- </if>
- <if test="carId !=null and carId != ''">
- , t.car_id= #{carId}
</if>
<if test="carColor !=null and carColor != ''">
, t.car_color= #{carColor}
@@ -124,14 +128,25 @@
<if test="state !=null and state != ''">
, t.state= #{state}
</if>
- <if test="communityId !=null and communityId != ''">
- , t.community_id= #{communityId}
+ <if test="leaseType !=null and leaseType != ''">
+ , t.lease_type= #{leaseType}
</if>
where 1=1
+ <if test="bId !=null and bId != ''">
+ and t.b_id= #{bId}
+ </if>
+ <if test="carId !=null and carId != ''">
+ and t.car_id= #{carId}
+ </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="carTypeCd !=null and carTypeCd != ''">
+ and t.car_type_cd= #{carTypeCd}
+ </if>
</update>
<!-- 鏌ヨ杞﹁締鏁伴噺 add by wuxw 2018-07-03 -->
@@ -156,6 +171,15 @@
</if>
<if test="ownerId !=null and ownerId != ''">
and t.owner_id= #{ownerId}
+ </if>
+ <if test="leaseType !=null and leaseType != ''">
+ and t.lease_type= #{leaseType}
+ </if>
+ <if test="leaseTypes !=null ">
+ and t.lease_type in
+ <foreach collection="leaseTypes" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
<if test="carTypeCd !=null and carTypeCd != ''">
and t.car_type_cd= #{carTypeCd}
@@ -187,8 +211,19 @@
<if test="memberId !=null and memberId != ''">
and t.member_id= #{memberId}
</if>
+ </select>
+ <select id="queryOwnerCarCountByOwnerIds" parameterType="Map" resultType="Map">
+ select t.owner_id ownerId,count(1) carCount
+ from
+ owner_car t
+ where t.status_cd = '0'
+ and t.owner_id in
+ <foreach collection="ownerIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ group by t.owner_id
</select>
</mapper>
--
Gitblit v1.8.0