|
@@ -161,7 +161,7 @@
|
|
|
<select id="findUserReports" resultType="java.util.LinkedHashMap">
|
|
<select id="findUserReports" resultType="java.util.LinkedHashMap">
|
|
|
SELECT a.id,c.firstDepartName,c.secondDepartName,a.userId,groupName,workTime,offWorkTime,a.name,a.checkinDay,
|
|
SELECT a.id,c.firstDepartName,c.secondDepartName,a.userId,groupName,workTime,offWorkTime,a.name,a.checkinDay,
|
|
|
checkinDate,checkinException,checkoffDate,checkoffException,checkoutDate1,checkoutDate2,leaveCreatedTime,
|
|
checkinDate,checkinException,checkoffDate,checkoffException,checkoutDate1,checkoutDate2,leaveCreatedTime,
|
|
|
- leaveStartDate,leaveEndDate,leaveDay,leaveComment,bukaDay,result
|
|
|
|
|
|
|
+ leaveStartDate,leaveDay,leaveComment,bukaDay,result
|
|
|
from sap_check_report a, sap_checkdate b, wx_user c
|
|
from sap_check_report a, sap_checkdate b, wx_user c
|
|
|
where b.weekday = 1 and a.checkinDay=b.checkinDay and a.userId = c.userId
|
|
where b.weekday = 1 and a.checkinDay=b.checkinDay and a.userId = c.userId
|
|
|
<if test="departId != null and departId != ''">
|
|
<if test="departId != null and departId != ''">
|
