Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!216

src/main/resources/mapping/kqmk/KqglAssoMonthPunchSummaryMapper.xml

@@ -442,7 +442,7 @@
 							 WHEN DAYNAME(#{param.times}) = 'Saturday' THEN '6' ELSE '7' END))
 							 WHEN DAYNAME(#{param.times}) = 'Saturday' THEN '6' ELSE '7' END))
 					WHEN IFNULL((select kqz.pbfs from kqgl_main_kqz kqz where kqz.id = sum.att_group),'') = 2 
 					WHEN IFNULL((select kqz.pbfs from kqgl_main_kqz kqz where kqz.id = sum.att_group),'') = 2 
 					THEN (select pb.bcid from kqgl_asso_pbmx pb where pb.userid = sum.num
 					THEN (select pb.bcid from kqgl_asso_pbmx pb where pb.userid = sum.num
-							and pb.`data` = '2020-06-16' and pb.kqzid = sum.att_group) ELSE '' END))),'') as ydkcs,	
+							and pb.`data` = #{param.times} and pb.kqzid = sum.att_group) ELSE '' END))),'') as ydkcs,	
 					'' address,
 					'' address,
 					'' remarks,
 					'' remarks,
 					'' cardtype,
 					'' cardtype,
@@ -450,7 +450,7 @@
 					'' macname,
 					'' macname,
 					IFNULL(rtj.attdate, '') attdate,
 					IFNULL(rtj.attdate, '') attdate,
 					IFNULL(rtj.userid,'') userid,
 					IFNULL(rtj.userid,'') userid,
-					IFNULL(rtj.data,'') data,
+					#{param.times} data,
 					IFNULL(rtj.sbdk1,'') sbdk1,
 					IFNULL(rtj.sbdk1,'') sbdk1,
 					IFNULL(rtj.sbdk1jg,'') sbdk1jg,
 					IFNULL(rtj.sbdk1jg,'') sbdk1jg,
 					IFNULL(rtj.xbdk1 ,'') xbdk1,
 					IFNULL(rtj.xbdk1 ,'') xbdk1,