From 032ab98c53cd1448f81d1e8be04423d6b46c4fa1 Mon Sep 17 00:00:00 2001 From: zm <2369059705qq.com> Date: 星期二, 15 十月 2024 17:37:40 +0800 Subject: [PATCH] 请假申请,请假看板调整 --- src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java | 12 ++++++++---- 1 files changed, 8 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 0a7fe28..26ccf68 100644 --- a/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java +++ b/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java @@ -158,7 +158,7 @@ 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 ), '涓婂崍涓嬬彮鏈墦鍗�' ) "); @@ -179,7 +179,6 @@ 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=? and flow_flag=2 GROUP BY applicant,DATE_FORMAT( replenish_date, '%Y-%m-%d')) e on a.punch_date=e.replenish_date "); @@ -191,7 +190,7 @@ FieldSetEntity fs = dt.getFieldSetEntity(i); //褰撳ぉ鎵撳崱澶勭悊 if (fs.getString("punch_date").equals(day)){ - if (fs.getString("reidis").equals("鍏ㄥぉ鏈墦鍗�")){ + if (null!=fs.getString("reidis")&&fs.getString("reidis").equals("鍏ㄥぉ鏈墦鍗�")){ fs.setValue("reidis",null); fs.setValue("dkfw",null); }else { @@ -201,7 +200,12 @@ reidis[j]="0"; } } - String string = Arrays.toString(reidis); + String string=""; + if(reidis.length!=1){ + string = Arrays.toString(reidis); + }else { + string=fs.getString("reidis"); + } fs.setValue("reidis",string); } } -- Gitblit v1.9.2