Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!348

src/main/java/cn/timer/api/dto/kqmk/AttendanceSummaryQueryDto.java

@@ -18,6 +18,8 @@ public class AttendanceSummaryQueryDto extends Page {
 	private String query;
 	private String query;
 	private String times;
 	private String times;
 	private Integer attid;
 	private Integer attid;
+	
+	private Integer turnover_status;
 
 
 	private String year;
 	private String year;
 	private String month;
 	private String month;

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

@@ -133,7 +133,7 @@
 			LEFT JOIN zzgl_bmgw_m as gw on gw.id = emp.bmgw_id
 			LEFT JOIN zzgl_bmgw_m as gw on gw.id = emp.bmgw_id
 			LEFT JOIN zzgl_bmgw_m as c ON c.id = gw.up_id
 			LEFT JOIN zzgl_bmgw_m as c ON c.id = gw.up_id
 			where emp.org_code = #{orgcode} 
 			where emp.org_code = #{orgcode} 
-			and emp.job_status != 3
+			<!-- and emp.job_status != 3 -->
     </select>
     </select>
     
     
     <select id="RealTimeUpdate" resultMap="AdditionalMap">
     <select id="RealTimeUpdate" resultMap="AdditionalMap">

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

@@ -288,6 +288,9 @@
 			<if test="param.attid != null and param.attid != ''">
 			<if test="param.attid != null and param.attid != ''">
 				and sum.att_group = #{param.attid}
 				and sum.att_group = #{param.attid}
 			</if>
 			</if>
+			<if test="param.turnover_status == 1">
+				and sum.num not in (select em.emp_num from yggl_main_lzb em where em.org_code = #{param.orgCode} and em.job_status = 3)
+			</if>
 			
 			
 			<!-- yz.id as yzid,
 			<!-- yz.id as yzid,
 				yz.leave_rules_id as leaverulesid,
 				yz.leave_rules_id as leaverulesid,
@@ -479,6 +482,9 @@
 			<if test="param.attid != null and param.attid != ''">
 			<if test="param.attid != null and param.attid != ''">
 				and sum.att_group = #{param.attid}
 				and sum.att_group = #{param.attid}
 			</if>
 			</if>
+			<if test="param.turnover_status == 1">
+				and sum.num not in (select em.emp_num from yggl_main_lzb em where em.org_code = #{param.orgCode} and em.job_status = 3)
+			</if>
 			
 			
 			<!-- LEFT JOIN kqgl_asso_leave_employee_balance as mrtj on mrtj.userid = sum.num 
 			<!-- LEFT JOIN kqgl_asso_leave_employee_balance as mrtj on mrtj.userid = sum.num 
 			IFNULL(mrtj.leave_rules_id,'') as leaverulesid,
 			IFNULL(mrtj.leave_rules_id,'') as leaverulesid,