Merge branch 'develop' into 'master'

Develop

See merge request 8timerv2/8timerapiv200!567

src/main/java/cn/timer/api/dao/kqgl/AttendanceWeeklySchMapper.java

@@ -26,6 +26,7 @@ public interface AttendanceWeeklySchMapper {
     List<AttendanceWeeklySch> selectAttWeeklySchByKqzid(Integer kqzid);
     List<AttendanceWeeklySch> selectAttWeeklySchByKqzid(Integer kqzid);
     
     
     List<AttendanceWeeklySch> selectAttendanceMadeByUserid(Integer userid,Integer qyid);
     List<AttendanceWeeklySch> selectAttendanceMadeByUserid(Integer userid,Integer qyid);
+    List<AttendanceWeeklySch> selectAttendanceMadeByZhou(Integer userid,Integer qyid);
     
     
     AttendanceWeeklySch selectZhouDetail(Integer kqzid,Integer type);
     AttendanceWeeklySch selectZhouDetail(Integer kqzid,Integer type);
     
     

src/main/resources/mapping/kqgl/AttendanceWeeklySchMapper.xml

@@ -146,6 +146,23 @@
 		and zpb.bcid != 0
 		and zpb.bcid != 0
   </select>
   </select>
   
   
+  <select id="selectAttendanceMadeByZhou" resultMap="BaseResultMap">
+  			select zpb.*,
+				case zpb.type
+				WHEN 1 then '星期一' 
+				WHEN 2 then '星期二' 
+				WHEN 3 then '星期三' 
+				WHEN 4 then '星期四' 
+				WHEN 5 then '星期五' 
+				WHEN 6 then '星期六' 
+				WHEN 7 then '星期日' 
+				else '自由工时'  
+				end as wekmc
+			from kqgl_asso_zhoupaiban zpb
+		where zpb.kqzid = (select yhkqz.kqzid from kqgl_asso_yhkqz yhkqz
+		where yhkqz.userid = #{userid} and yhkqz.qyid = #{qyid})
+  </select>
+  
   <select id="selectZhouDetail" resultMap="BaseResultMap">
   <select id="selectZhouDetail" resultMap="BaseResultMap">
   		select * from kqgl_asso_zhoupaiban zpb
   		select * from kqgl_asso_zhoupaiban zpb
 			where zpb.kqzid = #{kqzid,jdbcType=INTEGER}
 			where zpb.kqzid = #{kqzid,jdbcType=INTEGER}