考勤功能优化8.13-1

18756

2024-08-13 ae0fd658c16150f8965cafe44bf684660a742737

 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;