From 301a0ae856cea8f19936991ff977b4717e83dc8e Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期六, 14 九月 2024 18:59:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into dev
---
src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java b/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
index 64a4e4a..5127f73 100644
--- a/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
+++ b/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
@@ -146,6 +146,8 @@
yearAndMonth=DateUtils.formatDate(new Date(), "yyyy-MM");
}
+ //
+ String day=DateUtils.formatDate(new Date(), "yyyy-MM-dd");
StringBuilder sb=new StringBuilder();
List<Object> param=new ArrayList<>();
@@ -163,15 +165,17 @@
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 ");
+ 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 ");
+ sb.append(" (SELECT @row := -1) t0) d WHERE i < DAY(last_day(DATE_FORMAT(?, '%Y-%m-01'))) and CONCAT(DATE_FORMAT(?, '%Y-%m-'),IF(i<9,CONCAT('0',i + 1),i + 1))<=? ) a ");
param.add(yearAndMonth+"-01");
+ param.add(yearAndMonth+"-01");
+ param.add(day);
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' ) ");
@@ -185,6 +189,22 @@
DataTableEntity dt = baseDao.listTable(sb.toString(), param.toArray());
for (int i = 0; i < dt.getRows(); i++) {
FieldSetEntity fs = dt.getFieldSetEntity(i);
+ //褰撳ぉ鎵撳崱澶勭悊
+ if (fs.getString("punch_date").equals(day)){
+ if (fs.getString("reidis").equals("鍏ㄥぉ鏈墦鍗�")){
+ fs.setValue("reidis",null);
+ fs.setValue("dkfw",null);
+ }else {
+ String[] reidis = fs.getString("reidis").split(",");
+ for (int j = 0; j <reidis.length ; j++) {
+ if (reidis[j].contains("鏈墦鍗�")){
+ reidis[j]="0";
+ }
+ }
+ String string = Arrays.toString(reidis);
+ fs.setValue("reidis",string);
+ }
+ }
//鑾峰彇琛ュ崱鏍囪瘑
List<String> bk=new ArrayList<>();
if (!StringUtils.isEmpty(fs.getString("bk"))){
@@ -238,6 +258,18 @@
a = "2";
}
}
+ if (reidis[j].contains("涓婂崍涓婄彮鏈墦鍗�")) {
+ fs.setValue("result_one", reidis[j]);
+ }
+ if (reidis[j].contains("涓婂崍涓嬬彮鏈墦鍗�")) {
+ fs.setValue("result_two", reidis[j]);
+ }
+ if (reidis[j].contains("涓嬪崍涓婄彮鏈墦鍗�")) {
+ fs.setValue("result_three", reidis[j]);
+ }
+ if (reidis[j].contains("涓嬪崍涓嬬彮鏈墦鍗�")) {
+ fs.setValue("result_four", reidis[j]);
+ }
}
if ("1".equals(a)){
fs.setValue("type",a);
--
Gitblit v1.9.2