From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/common/AttendanceClassesTaskDetailServiceDaoImplMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 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 5ed35f6..e644d81
--- a/java110-db/src/main/resources/mapper/common/AttendanceClassesTaskDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/AttendanceClassesTaskDetailServiceDaoImplMapper.xml
@@ -19,9 +19,10 @@
<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
from attendance_classes_task_detail t
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="checkTime !=null and checkTime != ''">
and t.check_time= #{checkTime}
@@ -52,7 +53,7 @@
</if>
<if test="taskId !=null and taskId != ''">
and t.task_id= #{taskId}
- </if>reportFeeMonthStatistics
+ </if>
<if test="taskIds != null">
and t.task_id in
<foreach collection="taskIds" item="item" open="(" close=")" separator=",">
--
Gitblit v1.8.0