From ae0fd658c16150f8965cafe44bf684660a742737 Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期二, 13 八月 2024 17:38:16 +0800
Subject: [PATCH] 考勤功能优化8.13-1
---
src/main/java/com/product/administration/service/PunchRecordService.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/product/administration/service/PunchRecordService.java b/src/main/java/com/product/administration/service/PunchRecordService.java
index 7633bbd..579b0aa 100644
--- a/src/main/java/com/product/administration/service/PunchRecordService.java
+++ b/src/main/java/com/product/administration/service/PunchRecordService.java
@@ -115,7 +115,9 @@
String punch_time_one1 = dateFormatHHmmss.format(fieldSetEntity.getValue("punch_time_one"));
punch_time_one_date = DateUtil.parse(punch_time_one1);
beLate1 = DateUtil.between(punch_time_one_date, morning_work_date, DateUnit.MINUTE);
- lateSb.append("杩熷埌:"+beLate1+"鍒嗛挓");
+ if(beLate1>0){
+ lateSb.append("杩熷埌:"+beLate1+"鍒嗛挓");
+ }
int punch_range_one = Integer.parseInt(fieldSetEntity.getValue("punch_range_one").toString());
if(punch_range_one>distance){
int distanceMorning = punch_range_one- distance;
@@ -129,7 +131,9 @@
String punch_time_four = dateFormatHHmmss.format(fieldSetEntity.getValue("punch_time_four"));
punch_time_four_date = DateUtil.parse(punch_time_four);
beEarily2 = DateUtil.between(punch_time_four_date, afternoon_work_off_date, DateUnit.MINUTE);
- earilySb.append("鏃╅��:"+beEarily2+"鍒嗛挓");
+ if(beEarily2>0){
+ earilySb.append("鏃╅��:"+beEarily2+"鍒嗛挓");
+ }
int punch_range_four = Integer.parseInt(fieldSetEntity.getValue("punch_range_four").toString());
if(punch_range_four>distance){
int distanceMorning = punch_range_four- distance;
@@ -174,15 +178,17 @@
String punch_time_one1 = dateFormatHHmmss.format(fieldSetEntity.getValue("punch_time_one"));
punch_time_one_date = DateUtil.parse(punch_time_one1);
beLate1 = DateUtil.between(punch_time_one_date, morning_work_date, DateUnit.MINUTE);
- lateSb.append("鏃╀笂涓婄彮杩熷埌:"+beLate1+" ");
+ if(beLate1>0){
+ lateSb.append("鏃╀笂鐝繜鍒�:"+beLate1+" ");
+ }
int punch_range_one = Integer.parseInt(fieldSetEntity.getValue("punch_range_one").toString());
if(punch_range_one>distance){
int distanceMorning = punch_range_one- distance;
- supereffective_distance.append("鏃╀笂涓婄彮瓒呮湁鏁堣窛绂�:"+distanceMorning);
+ supereffective_distance.append("鏃╀笂鐝秴鏈夋晥璺濈:"+distanceMorning);
}
}else {
- lateSb.append("鏃╀笂涓婄彮鏈墦鍗�"+" ");
+ lateSb.append("鏃╀笂鐝湭鎵撳崱"+" ");
}
@@ -190,36 +196,43 @@
String punch_time_two= dateFormatHHmmss.format(fieldSetEntity.getValue("punch_time_two"));
punch_time_two_date = DateUtil.parse(punch_time_two);
beEarily1 = DateUtil.between(punch_time_two_date, morning_work_off_date, DateUnit.MINUTE);
- earilySb.append("鏃╀笂涓嬬彮鏃╅��:"+beEarily1+" ");
+ if(beEarily1>0){
+ earilySb.append("鏃╀笅鐝棭閫�:"+beEarily1+" ");
+ }
int punch_range_two = Integer.parseInt(fieldSetEntity.getValue("punch_range_two").toString());
if(punch_range_two>distance){
int distanceMorningoff = punch_range_two- distance;
- supereffective_distance.append("鏃╀笂涓嬬彮瓒呮湁鏁堣窛绂�:"+distanceMorningoff);
+ supereffective_distance.append("鏃╀笅鐝秴鏈夋晥璺濈:"+distanceMorningoff);
}
}else {
- earilySb.append("鏃╀笂涓嬬彮鏈墦鍗�"+" ");
+ earilySb.append("鏃╀笅鐝湭鎵撳崱"+" ");
}
if(ObjectUtil.isNotEmpty(fieldSetEntity.getValue("punch_time_three"))){
String punch_time_three = dateFormatHHmmss.format(fieldSetEntity.getValue("punch_time_three"));
punch_time_three_date = DateUtil.parse(punch_time_three);
beLate2 = DateUtil.between(punch_time_three_date, afternoon_work_date, DateUnit.MINUTE);
- lateSb.append("涓嬪崍涓婄彮杩熷埌:"+beLate2+" ");
+ if(beLate2>0){
+ lateSb.append("涓嬪崍涓婄彮杩熷埌:"+beLate2+" ");
+ }
+
int punch_range_three = Integer.parseInt(fieldSetEntity.getValue("punch_range_three").toString());
if(punch_range_three>distance){
int distanceAfternoon = punch_range_three- distance;
supereffective_distance.append("涓嬪崍涓婄彮瓒呮湁鏁堣窛绂�:"+distanceAfternoon);
}
}else {
- lateSb.append("鏃╀笂涓婄彮鏈墦鍗�"+" ");
+ lateSb.append("鏃╀笂鐝湭鎵撳崱"+" ");
}
if(ObjectUtil.isNotEmpty(fieldSetEntity.getValue("punch_time_four"))){
String punch_time_four = dateFormatHHmmss.format(fieldSetEntity.getValue("punch_time_four"));
punch_time_four_date = DateUtil.parse(punch_time_four);
beEarily2 = DateUtil.between(punch_time_four_date, afternoon_work_off_date, DateUnit.MINUTE);
- earilySb.append("涓嬪崍涓嬬彮鏃╅��:"+beEarily2+" ");
+ if(beEarily2>0){
+ earilySb.append("涓嬪崍涓嬬彮鏃╅��:"+beEarily2+" ");
+ }
int punch_range_four = Integer.parseInt(fieldSetEntity.getValue("punch_range_four").toString());
if(punch_range_four>distance){
int distanceAfternoonoff = punch_range_four- distance;
--
Gitblit v1.9.2