From ab7ddb13ba6ea769748d1ee67255a53ad7913554 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期三, 21 八月 2024 10:40:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java b/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
index 9ca15d7..64a4e4a 100644
--- a/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
+++ b/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
@@ -172,13 +172,13 @@
 		sb.append(" (SELECT 0 UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5) t4, ");
 		sb.append(" (SELECT @row := -1) t0) d WHERE i < DAY(last_day(DATE_FORMAT(?, '%Y-%m-01')))) a ");
 		param.add(yearAndMonth+"-01");
-		sb.append(" LEFT JOIN (SELECT * FROM product_oa_ask_for_leave WHERE user_id=?) b ");
+		sb.append(" LEFT JOIN (SELECT * FROM product_oa_ask_for_leave WHERE user_id=? and flow_flag=2) b ");
 		param.add(user_id);
 		sb.append(" on DATE_FORMAT( a.punch_date, '%Y-%m-%d' )>= DATE_FORMAT( b.start_time, '%Y-%m-%d' ) and DATE_FORMAT( a.punch_date, '%Y-%m-%d' )<= DATE_FORMAT( b.end_time, '%Y-%m-%d' ) ");
 		sb.append(" LEFT JOIN (SELECT * FROM product_sys_dict where dict_name='Leave_Type') c on b.leave_type =c.dict_value ");
 		sb.append(" LEFT JOIN product_oa_punch_record d on a.punch_date=DATE_FORMAT( d.punch_time_one, '%Y-%m-%d' ) ");
 		sb.append(" LEFT JOIN (SELECT applicant,DATE_FORMAT( replenish_date, '%Y-%m-%d') replenish_date,max(replacement_card_type) bk FROM product_oa_replenish_punch ");
-		sb.append(" where applicant=? GROUP BY applicant,DATE_FORMAT( replenish_date, '%Y-%m-%d')) e on a.punch_date=e.replenish_date  ");
+		sb.append(" where applicant=? and flow_flag=2 GROUP BY applicant,DATE_FORMAT( replenish_date, '%Y-%m-%d')) e on a.punch_date=e.replenish_date  ");
 		param.add(user_id);
 		sb.append(" LEFT JOIN  product_oa_punch_time f on d.punch_congfig_uuid =f.punch_site_uuid  ");
 		sb.append(" where a.punch_date NOT IN (SELECT DATE_FORMAT( date_holiday, '%Y-%m-%d' ) FROM product_sys_company_holiday) ");
@@ -385,7 +385,7 @@
 			sb.append(" sum(IF(leave_type=9,TRUE,0))marriage_leave,sum(IF(leave_type=4,TRUE,0))paid_leave, ");
 			sb.append(" sum(IF(leave_type!=1 && leave_type!=2 && leave_type!=4 && leave_type!=9,TRUE,0))other_leave ");
 			sb.append(" FROM product_oa_ask_for_leave ");
-			sb.append(" WHERE DATE_FORMAT(start_time,'%Y-%m')=? ");
+			sb.append(" WHERE DATE_FORMAT(start_time,'%Y-%m')=? and flow_flag=2 ");
 			sb.append(" GROUP BY created_by ");
 			sb.append(" )c ");
 			sb.append(" ON a.created_by=c.created_by ");
@@ -422,7 +422,7 @@
 		sbReplenish.append(" SELECT DISTINCT replenish_date ");
 		sbReplenish.append(" FROM product_oa_replenish_punch ");
 		sbReplenish.append(" WHERE");
-		sbReplenish.append(" created_by =? ");
+		sbReplenish.append(" created_by =? and flow_flag=2");
 		sbReplenish.append(" AND DATE_FORMAT( replenish_date, '%Y-%m' )=? ");
 		sbReplenish.append(" and DATE_FORMAT( replenish_date, '%Y-%m-%d') ");
 		sbReplenish.append(" not in (");

--
Gitblit v1.9.2