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/AttendanceClassesTaskDetailServiceDaoImplMapper.xml |   41 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/common/AttendanceClassesTaskDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/AttendanceClassesTaskDetailServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index e141361..b508760
--- a/java110-db/src/main/resources/mapper/common/AttendanceClassesTaskDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/AttendanceClassesTaskDetailServiceDaoImplMapper.xml
@@ -8,9 +8,9 @@
     <!-- 淇濆瓨鑰冨嫟浠诲姟鏄庣粏淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveAttendanceClassesTaskDetailInfo" parameterType="Map">
         insert into attendance_classes_task_detail(
-        check_time,detail_id,spec_cd,remark,face_path,state,store_id,value,task_id
+        check_time,detail_id,spec_cd,remark,face_path,state,store_id,value,task_id,leave_value,late_value
         ) values (
-        #{checkTime},#{detailId},#{specCd},#{remark},#{facePath},#{state},#{storeId},#{value},#{taskId}
+        #{checkTime},#{detailId},#{specCd},#{remark},#{facePath},#{state},#{storeId},#{value},#{taskId},#{leaveValue},#{lateValue}
         )
     </insert>
 
@@ -19,12 +19,24 @@
     <select id="getAttendanceClassesTaskDetailInfo" parameterType="Map" resultType="Map">
         select t.check_time,t.check_time checkTime,t.detail_id,t.detail_id detailId,t.spec_cd,t.spec_cd
         specCd,t.status_cd,t.status_cd statusCd,t.remark,t.face_path,t.face_path facePath,t.state,t.store_id,t.store_id
-        storeId,t.value,t.task_id,t.task_id taskId,td.`name` specName
+        storeId,t.value,t.task_id,t.task_id taskId,td.`name` specName,td1.name stateName,t.leave_value leaveValue,t.late_value lateValue
         from attendance_classes_task_detail t
+        left join attendance_classes_task act on t.task_id = act.task_id and act.status_cd = '0'
         left join t_dict td on t.spec_cd = td.status_cd and td.table_name = 'attendance_classes_attr' and td.table_columns = 'spec_cd'
+        left join t_dict td1 on t.state = td1.status_cd and td1.table_name = 'attendance_classes_task_detail' and td1.table_columns = 'state'
         where 1 =1
+        <if test="classId !=null and classId != ''">
+            and act.class_id = #{classId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            and act.staff_id = #{staffId}
+        </if>
         <if test="checkTime !=null and checkTime != ''">
             and t.check_time= #{checkTime}
+        </if>
+        <if test="nowCheckTime !=null and nowCheckTime != ''">
+            and t.leave_value &lt; #{nowCheckTime}
+            and t.late_value &gt; #{nowCheckTime}
         </if>
         <if test="detailId !=null and detailId != ''">
             and t.detail_id= #{detailId}
@@ -59,7 +71,7 @@
                 #{item}
             </foreach>
         </if>
-        order by t.create_time desc
+        order by t.value
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
@@ -93,6 +105,12 @@
         </if>
         <if test="value !=null and value != ''">
             , t.value= #{value}
+        </if>
+        <if test="leaveValue !=null and leaveValue != ''">
+            , t.leave_value= #{leaveValue}
+        </if>
+        <if test="lateValue !=null and lateValue != ''">
+            , t.late_value= #{lateValue}
         </if>
         <if test="taskId !=null and taskId != ''">
             , t.task_id= #{taskId}
@@ -143,4 +161,19 @@
 
     </select>
 
+
+    <select id="queryWaitSendMsgDetail" parameterType="Map" resultType="Map">
+        select t.check_time,t.check_time checkTime,t.detail_id,t.detail_id detailId,t.spec_cd,t.spec_cd
+        specCd,t.status_cd,t.status_cd statusCd,t.remark,t.face_path,t.face_path facePath,t.state,t.store_id,t.store_id
+        storeId,t.value,t.task_id,t.task_id taskId,t.leave_value leaveValue,t.late_value lateValue,act.staff_id staffId, act.staff_name staffName
+        from attendance_classes_task_detail t
+        left join attendance_classes_task act on t.task_id = act.task_id and act.status_cd = '0'
+        where 1 =1
+        <if test="startTime != null and startTime != ''">
+        and t.`value` &gt; #{startTime}
+        and t.`value` &lt;= #{endTime}
+        </if>
+        and t.status_cd = '0'
+        and t.state = '10000'
+    </select>
 </mapper>

--
Gitblit v1.8.0