From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/common/AttendanceLogServiceDaoImplMapper.xml | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/common/AttendanceLogServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/AttendanceLogServiceDaoImplMapper.xml
index 3e78401..dc7742b 100755
--- a/java110-db/src/main/resources/mapper/common/AttendanceLogServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/AttendanceLogServiceDaoImplMapper.xml
@@ -8,9 +8,9 @@
<!-- 淇濆瓨鑰冨嫟鏃ュ織淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveAttendanceLogInfo" parameterType="Map">
insert into attendance_log(
- department_name,department_id,staff_name,log_id,store_id,staff_id,clock_time
+ department_name,department_id,staff_name,log_id,store_id,staff_id,clock_time,face_path
) values (
- #{departmentName},#{departmentId},#{staffName},#{logId},#{storeId},#{staffId},#{clockTime}
+ #{departmentName},#{departmentId},#{staffName},#{logId},#{storeId},#{staffId},#{clockTime},#{facePath}
)
</insert>
@@ -19,7 +19,8 @@
<select id="getAttendanceLogInfo" parameterType="Map" resultType="Map">
select t.department_name,t.department_name departmentName,t.department_id,t.department_id
departmentId,t.staff_name,t.staff_name staffName,t.log_id,t.log_id logId,t.status_cd,t.status_cd
- statusCd,t.store_id,t.store_id storeId,t.staff_id,t.staff_id staffId,t.clock_time,t.clock_time clockTime
+ statusCd,t.store_id,t.store_id storeId,t.staff_id,t.staff_id staffId,t.clock_time,t.clock_time clockTime,
+ t.face_path facePath,t.remark
from attendance_log t
where 1 =1
<if test="departmentName !=null and departmentName != ''">
@@ -63,6 +64,9 @@
<if test="departmentName !=null and departmentName != ''">
, t.department_name= #{departmentName}
</if>
+ <if test="remark !=null and remark != ''">
+ , t.remark= #{remark}
+ </if>
<if test="departmentId !=null and departmentId != ''">
, t.department_id= #{departmentId}
</if>
@@ -77,6 +81,9 @@
</if>
<if test="clockTime !=null and clockTime != ''">
, t.clock_time= #{clockTime}
+ </if>
+ <if test="facePath !=null and facePath != ''">
+ , t.face_path = #{facePath}
</if>
where 1=1
<if test="logId !=null and logId != ''">
@@ -112,7 +119,7 @@
and t.staff_id= #{staffId}
</if>
<if test="clockTime !=null and clockTime != ''">
- and t.clock_time= #{clockTime}
+ and DATE_FORMAT(t.clock_time,'%Y-%m-%d')= #{clockTime}
</if>
--
Gitblit v1.8.0