From c4714a3e9ecc6fd48260e5ab9963a09bc43ad43a Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期二, 13 八月 2024 16:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java b/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
index 09617fe..6feafc7 100644
--- a/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
+++ b/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
@@ -1,6 +1,7 @@
 package com.product.administration.service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -104,17 +105,17 @@
 		
 		sb.append(" SELECT ");
 		sb.append(" DATE_FORMAT(created_utc_datetime,'%Y-%m-%d')punch_date, ");
-		sb.append(" punch_time_one,IF(punch_time_one IS TRUE,IF(DATE_FORMAT(punch_time_one,'%H:%i:%S')>?,'杩熷埌','姝e父'),'鏈墦鍗�')result_one, ");
+		sb.append(" punch_time_one,IF(punch_time_one IS TRUE,IF(DATE_FORMAT(punch_time_one,'%H:%i:%S')>?,'杩熷埌','姝e父'),'涓婂崍涓婄彮鏈墦鍗�')result_one, ");
 		param.add(fseCompanyPunch.getDate("work_time_one","HH:mm:ss"));
 		
 		if (workTimeMethod==1) {
-			sb.append(" punch_time_two,IF(punch_time_two IS TRUE,IF(DATE_FORMAT(punch_time_two,'%H:%i:%S')<?,'鏃╅��','姝e父'),'鏈墦鍗�')result_two, ");
+			sb.append(" punch_time_two,IF(punch_time_two IS TRUE,IF(DATE_FORMAT(punch_time_two,'%H:%i:%S')<?,'鏃╅��','姝e父'),'涓婂崍涓嬬彮鏈墦鍗�')result_two, ");
 			param.add(fseCompanyPunch.getDate("work_time_two","HH:mm:ss"));
-			sb.append(" punch_time_three,IF(punch_time_three IS TRUE,IF(DATE_FORMAT(punch_time_three,'%H:%i:%S')>?,'杩熷埌','姝e父'),'鏈墦鍗�')result_three, ");
+			sb.append(" punch_time_three,IF(punch_time_three IS TRUE,IF(DATE_FORMAT(punch_time_three,'%H:%i:%S')>?,'杩熷埌','姝e父'),'涓嬪崍涓婄彮鏈墦鍗�')result_three, ");
 			param.add(fseCompanyPunch.getDate("work_time_three","HH:mm:ss"));
 		}
 		
-		sb.append(" punch_time_four,IF(punch_time_four IS TRUE,IF(DATE_FORMAT(punch_time_four,'%H:%i:%S')<?,'鏃╅��','姝e父'),'鏈墦鍗�')result_four ");
+		sb.append(" punch_time_four,IF(punch_time_four IS TRUE,IF(DATE_FORMAT(punch_time_four,'%H:%i:%S')<?,'鏃╅��','姝e父'),'涓嬪崍涓婄彮鏈墦鍗�')result_four ");
 		param.add(fseCompanyPunch.getDate("work_time_four","HH:mm:ss"));
 		
 		sb.append(" FROM product_oa_punch_record WHERE created_by=?");
@@ -126,7 +127,128 @@
 		
 		return baseDao.listTable(sb.toString(), param.toArray());
 	}
-	
+	/**
+	 * 	鎵撳崱鏈堢湅鏉�(鏂�)
+	 * @param fse
+	 * @return
+	 */
+	public DataTableEntity listMonthKanBanNew(FieldSetEntity fse) {
+		//鑾峰彇褰撳墠浜轰俊鎭�
+		Integer user_id=fse.getInteger("user_id");	//user_id
+          if(user_id==null){
+			  return null;
+		  }
+
+		//鑾峰彇鏌ヨ鏈堜唤
+		String yearAndMonth=fse.getString("yearAndMonth");
+		if (StringUtils.isEmpty(yearAndMonth)) {
+			yearAndMonth=DateUtils.formatDate(new Date(), "yyyy-MM");
+		}
+
+
+		StringBuilder sb=new StringBuilder();
+		List<Object> param=new ArrayList<>();
+
+		sb.append(" SELECT a.punch_date,e.bk,f.morning_work,f.morning_work_off,f.afternoon_work,f.afternoon_work_off, ");
+
+		sb.append(" CONCAT(if(d.punch_range_one is not null and d.punch_range_one>f.distance,'瓒呭嚭鎵撳崱鑼冨洿',0) ");
+		sb.append(" ,',',if(d.punch_range_two is not null and d.punch_range_two>f.distance,'瓒呭嚭鎵撳崱鑼冨洿',0) ");
+		sb.append(" ,',',if(d.punch_time_three is not null and d.punch_time_three>f.distance,'瓒呭嚭鎵撳崱鑼冨洿',0) ");
+		sb.append(" ,',',if(d.punch_range_four is not null and d.punch_range_four>f.distance,'瓒呭嚭鎵撳崱鑼冨洿',0)) dkfw, ");
+		sb.append(" CASE  WHEN b.uuid is not null THEN c.dict_label ELSE  ");
+		sb.append(" CASE  WHEN d.uuid is not null THEN   ");
+		sb.append(" CONCAT(IF(d.punch_time_one IS TRUE, IF ( DATE_FORMAT(d.punch_time_one, '%H:%i:%S' )>=DATE_FORMAT(f.morning_work, '%H:%i:%S'), CONCAT('涓婂崍杩熷埌',TIMESTAMPDIFF(MINUTE, DATE_FORMAT(CONCAT(a.punch_date,' ',DATE_FORMAT(f.morning_work, '%H:%i:%S')),'%Y-%m-%d %H:%i:%S'),d.punch_time_one),'鍒嗛挓'), 0 ), '涓婂崍涓婄彮鏈墦鍗�' ) ");
+		sb.append(" ,',',IF(d.punch_time_two IS TRUE, IF ( DATE_FORMAT(d.punch_time_two, '%H:%i:%S' )<=DATE_FORMAT(f.morning_work_off, '%H:%i:%S') and f.morning_work_off is not null, CONCAT('涓婂崍鏃╅��',TIMESTAMPDIFF(MINUTE,d.punch_time_two,DATE_FORMAT(CONCAT(a.punch_date,' ',DATE_FORMAT(f.morning_work_off, '%H:%i:%S')),'%Y-%m-%d %H:%i:%S')),'鍒嗛挓'), 0 ), '涓婂崍涓嬬彮鏈墦鍗�' ) ");
+		sb.append(" ,',',IF(d.punch_time_three IS TRUE, IF ( DATE_FORMAT(d.punch_time_three, '%H:%i:%S' )>=DATE_FORMAT(f.afternoon_work, '%H:%i:%S') and f.afternoon_work is not null, CONCAT('涓嬪崍杩熷埌',TIMESTAMPDIFF(MINUTE, DATE_FORMAT(CONCAT(a.punch_date,' ',DATE_FORMAT(f.afternoon_work, '%H:%i:%S')),'%Y-%m-%d %H:%i:%S'),d.punch_time_three),'鍒嗛挓'), 0 ), '涓嬪崍涓婄彮鏈墦鍗�' ) ");
+		sb.append(" ,',',IF(d.punch_time_four IS TRUE, IF ( DATE_FORMAT(d.punch_time_four, '%H:%i:%S' )<=DATE_FORMAT(f.afternoon_work_off, '%H:%i:%S'), CONCAT('涓嬪崍鏃╅��',TIMESTAMPDIFF(MINUTE,d.punch_time_four,DATE_FORMAT(CONCAT(a.punch_date,' ',DATE_FORMAT(f.afternoon_work_off, '%H:%i:%S')),'%Y-%m-%d %H:%i:%S')),'鍒嗛挓'), 0 ), '涓嬪崍涓嬬彮鏈墦鍗�' )) ");
+		sb.append(" ELSE '鍏ㄥぉ鏈墦鍗�' END END reidis,CASE  WHEN b.uuid is not null THEN 1 ELSE CASE  WHEN d.uuid is not null THEN 0 ELSE 2 END END type ");
+		sb.append(" FROM (SELECT CONCAT(DATE_FORMAT(?, '%Y-%m-'),IF(i<9,CONCAT('0',i + 1),i + 1)) punch_date  ");
+		param.add(yearAndMonth+"-01");
+		sb.append(" FROM (SELECT @row := @row + 1 as i FROM ");
+		sb.append(" (SELECT 0 UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5) t1, ");
+		sb.append(" (SELECT 0 UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5) t2, ");
+		sb.append(" (SELECT 0 UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5) t3, ");
+		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 ");
+		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  ");
+		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) ");
+		DataTableEntity dt = baseDao.listTable(sb.toString(), param.toArray());
+		for (int i = 0; i < dt.getRows(); i++) {
+			FieldSetEntity fs = dt.getFieldSetEntity(i);
+			//鑾峰彇琛ュ崱鏍囪瘑
+			List<String> bk=new ArrayList<>();
+			if (!StringUtils.isEmpty(fs.getString("bk"))){
+				bk= Arrays.asList(fs.getString("bk").split(","));
+			}
+			if (fs.getString("reidis").equals("鍏ㄥぉ鏈墦鍗�")&&!StringUtils.isEmpty(fs.getString("bk"))){
+				if (!bk.contains("1")){
+					fs.setValue("result_one", "涓婂崍涓婄彮鏈墦鍗�");
+				}
+				if (!bk.contains("2")&&!StringUtils.isEmpty(fs.getString("morning_work_off"))){
+					fs.setValue("result_two", "涓婂崍涓嬬彮鏈墦鍗�");
+				}
+				if (!bk.contains("3")&&!StringUtils.isEmpty(fs.getString("afternoon_work"))){
+					fs.setValue("result_three", "涓嬪崍涓婄彮鏈墦鍗�");
+				}
+				if (!bk.contains("4")){
+					fs.setValue("result_four", "涓嬪崍涓嬬彮鏈墦鍗�");
+				}
+				continue;
+			}
+			if ("0".equals(fs.getString("type"))){
+				String[] reidis = fs.getString("reidis").split(",");
+				String[] dkfwsArr = fs.getString("dkfw").split(",");
+				String a="1";
+				for (int j = 0; j < reidis.length; j++) {
+					String dkfws="";
+					if (!dkfwsArr[j].equals("0")){
+						dkfws=dkfwsArr[j];
+					}
+					if (reidis[j].contains("涓婂崍杩熷埌")) {
+						if (!bk.contains("1")) {
+							fs.setValue("result_one", reidis[j]+dkfws);
+							a = "2";
+						}
+					}
+					if (reidis[j].contains("涓婂崍鏃╅��")) {
+						if (!bk.contains("2")) {
+							fs.setValue("result_two", reidis[j]+dkfws);
+							a = "2";
+						}
+					}
+					if (reidis[j].contains("涓嬪崍杩熷埌")) {
+						if (!bk.contains("3")) {
+							fs.setValue("result_three", reidis[j]+dkfws);
+							a = "2";
+						}
+					}
+					if (reidis[j].contains("涓嬪崍鏃╅��")) {
+						if (!bk.contains("3")) {
+							fs.setValue("result_four", reidis[j]+dkfws);
+							a = "2";
+						}
+					}
+				}
+				if ("1".equals(a)){
+					fs.setValue("type",a);
+					fs.setValue("result_one","姝e父鎵撳崱");
+				}
+
+			}else {
+				fs.setValue("result_one",fs.getString("reidis"));
+			}
+		}
+		return dt;
+	}
 	/**
 	 * 	鑰冨嫟缁熻鎶ヨ〃
 	 * @param fse
@@ -137,9 +259,9 @@
 		//鑾峰彇褰撳墠浜轰俊鎭�
 		SystemUser currentUser=SpringMVCContextHolder.getCurrentUser();
 		String org_level_uuid=currentUser.getOrg_level_uuid();
-		
+
 		//鑾峰彇鍏徃宸ヤ綔鏃堕棿閰嶇疆淇℃伅
-		FieldSetEntity fseCompanyPunch=baseDao.getFieldSetEntityByFilter(CmnConst.PRODUCT_OA_PUNCH_TIME, "org_level_uuid=?", new Object[] {org_level_uuid}, false);
+		FieldSetEntity fseCompanyPunch=baseDao.getFieldSetEntityByFilter(CmnConst.PRODUCT_OA_PUNCH_TIME, "", new Object[] {}, false);
 		if (fseCompanyPunch==null) {
 			throw new BaseException(SystemCode.COMPANY_PUNCH_TIME_NOT_CONFIG.getValue(), SystemCode.COMPANY_PUNCH_TIME_NOT_CONFIG.getText(), this.getClass(), "listMonthReport");
 		}

--
Gitblit v1.9.2