From e2b452e71090b5f561055f345ccd257e5f757764 Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期一, 19 八月 2024 13:53:15 +0800
Subject: [PATCH] 会议室功能8.19
---
src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java b/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
index 284d5c2..9ca15d7 100644
--- a/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
+++ b/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
@@ -185,9 +185,6 @@
DataTableEntity dt = baseDao.listTable(sb.toString(), param.toArray());
for (int i = 0; i < dt.getRows(); i++) {
FieldSetEntity fs = dt.getFieldSetEntity(i);
- if ("2024-08-07".equals(fs.getString("punch_date"))){
- System.out.println(fs.getString("punch_date"));
- }
//鑾峰彇琛ュ崱鏍囪瘑
List<String> bk=new ArrayList<>();
if (!StringUtils.isEmpty(fs.getString("bk"))){
@@ -410,13 +407,43 @@
dataTableEntity1.getData().get(0).setValue("leaveEarly",Integer.parseInt(fieldSetEntity.getValue("leaveEarly").toString())+Integer.parseInt(fieldSetEntity1.getValue("leaveEarly").toString()));
dataTableEntity1.getData().get(0).setValue("workDayOfMonth",Integer.parseInt(fieldSetEntity.getValue("workDayOfMonth").toString())+Integer.parseInt(fieldSetEntity1.getValue("workDayOfMonth").toString()));
dataTableEntity1.getData().get(0).setValue("absenteeism",Integer.parseInt(fieldSetEntity1.getValue("absenteeism").toString())-Integer.parseInt(fieldSetEntity.getValue("workDayOfMonth").toString()));
-
-
}
+
+
+
}
+ //澶勭悊琛ュ崱鐨勬儏鍐�
+ List<Object>param2=new ArrayList<>();
+ param2.add(currentUser);
+ param2.add(fse.getString("yearAndMonth"));
+
+ StringBuilder sbReplenish=new StringBuilder();
+ sbReplenish.append(" SELECT DISTINCT replenish_date ");
+ sbReplenish.append(" FROM product_oa_replenish_punch ");
+ sbReplenish.append(" WHERE");
+ sbReplenish.append(" created_by =? ");
+ sbReplenish.append(" AND DATE_FORMAT( replenish_date, '%Y-%m' )=? ");
+ sbReplenish.append(" and DATE_FORMAT( replenish_date, '%Y-%m-%d') ");
+ sbReplenish.append(" not in (");
+ sbReplenish.append(" SELECT DISTINCT record_data FROM ");
+ sbReplenish.append(" ( ");
+ sbReplenish.append(" select DATE_FORMAT(punch_time_one, '%Y-%m-%d') as record_data from product_oa_punch_record ");
+ sbReplenish.append(" union all select DATE_FORMAT(punch_time_two, '%Y-%m-%d') as record_data from product_oa_punch_record");
+ sbReplenish.append(" union all select DATE_FORMAT(punch_time_three, '%Y-%m-%d') as record_data from product_oa_punch_record");
+ sbReplenish.append(" union all select DATE_FORMAT(punch_time_four, '%Y-%m-%d') as record_data from product_oa_punch_record");
+ sbReplenish.append(" )n )");
+ DataTableEntity dataTableEntityReplenish = baseDao.listTable(sbReplenish.toString(), param2.toArray());
+ if(dataTableEntityReplenish.getRows()!=0){
+ dataTableEntity1.getData().get(0).setValue("workDayOfMonth",Integer.parseInt(dataTableEntity1.getData().get(0).getString("workDayOfMonth"))+dataTableEntityReplenish.getRows());
+ dataTableEntity1.getData().get(0).setValue("dayOfWork",Integer.parseInt(dataTableEntity1.getData().get(0).getString("dayOfWork"))-dataTableEntityReplenish.getRows());
+ }
return dataTableEntity1;
}
+
+
+
+
}
--
Gitblit v1.9.2