From 4b4eb27dcc051acba3841e7205dc4a593924362d Mon Sep 17 00:00:00 2001
From: zm <2369059705qq.com>
Date: 星期三, 23 十月 2024 17:16:31 +0800
Subject: [PATCH] 打卡记录列表
---
src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 9 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..26ccf68 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<>();
@@ -156,41 +158,63 @@
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 b.uuid is not null THEN '璇峰亣' 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 ");
+ 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");
- sb.append(" LEFT JOIN (SELECT * FROM product_oa_ask_for_leave WHERE user_id=?) b ");
+ 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' ) ");
- 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) ");
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 (null!=fs.getString("reidis")&&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="";
+ if(reidis.length!=1){
+ string = Arrays.toString(reidis);
+ }else {
+ string=fs.getString("reidis");
+ }
+ fs.setValue("reidis",string);
+ }
+ }
//鑾峰彇琛ュ崱鏍囪瘑
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 (!StringUtils.isEmpty(fs.getString("reidis"))&&fs.getString("reidis").equals("鍏ㄥぉ鏈墦鍗�")&&!StringUtils.isEmpty(fs.getString("bk"))){
if (!bk.contains("1")){
fs.setValue("result_one", "涓婂崍涓婄彮鏈墦鍗�");
}
@@ -237,6 +261,18 @@
fs.setValue("result_four", reidis[j]+dkfws);
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)){
@@ -385,7 +421,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 +458,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