打卡记录列表

zm

2024-10-23 70a6a22f94446bc9a1b96fc52584898aa7f67543

 src/main/java/com/product/administration/service/PunchRecordService.java

@@ -225,7 +225,7 @@

               int distance = Integer.parseInt(dataTableEntity.getData().get(0).getValue("distance").toString());

               if(ObjectUtil.isNotEmpty(fieldSetEntity.getValue("punch_time_one"))){
               if(ObjectUtil.isNotEmpty(fieldSetEntity.getValue("punch_time_one"))&&ObjectUtil.isNotEmpty(fieldSetEntity.getValue("punch_range_one"))){
                  String punch_time_one1 = dateFormatHHmmss.format(fieldSetEntity.getValue("punch_time_one"));
                  punch_time_one_date = DateUtil.parse(punch_time_one1);
                  if(punch_time_one_date.after(morning_work_date)){
@@ -244,7 +244,7 @@

               }

               if(ObjectUtil.isNotEmpty(fieldSetEntity.getValue("punch_time_two"))){
               if(ObjectUtil.isNotEmpty(fieldSetEntity.getValue("punch_time_two"))&&ObjectUtil.isNotEmpty(fieldSetEntity.getValue("punch_range_two"))){
                  String punch_time_two= dateFormatHHmmss.format(fieldSetEntity.getValue("punch_time_two"));
                  punch_time_two_date = DateUtil.parse(punch_time_two);
                  if(punch_time_two_date.before(morning_work_off_date)){
@@ -260,7 +260,7 @@
               }else {
                  earilySb.append("早下班未打卡"+" ");
               }
               if(ObjectUtil.isNotEmpty(fieldSetEntity.getValue("punch_time_three"))){
               if(ObjectUtil.isNotEmpty(fieldSetEntity.getValue("punch_time_three"))&&ObjectUtil.isNotEmpty(fieldSetEntity.getValue("punch_range_three"))){
                  String punch_time_three = dateFormatHHmmss.format(fieldSetEntity.getValue("punch_time_three"));
                  punch_time_three_date = DateUtil.parse(punch_time_three);
                  if(punch_time_three_date.after(afternoon_work_date)){
@@ -275,7 +275,7 @@
               }else {
                  lateSb.append("早上班未打卡"+" ");
               }
               if(ObjectUtil.isNotEmpty(fieldSetEntity.getValue("punch_time_four"))){
               if(ObjectUtil.isNotEmpty(fieldSetEntity.getValue("punch_time_four"))&&ObjectUtil.isNotEmpty(fieldSetEntity.getValue("punch_range_four"))){
                  String punch_time_four = dateFormatHHmmss.format(fieldSetEntity.getValue("punch_time_four"));
                  punch_time_four_date = DateUtil.parse(punch_time_four);
                  if(punch_time_four_date.before(afternoon_work_off_date)){
@@ -299,10 +299,10 @@
         }

      }
      dt.setFieldFormat("punch_time_one", " HH:mm");
      dt.setFieldFormat("punch_time_two", " HH:mm");
      dt.setFieldFormat("punch_time_three", " HH:mm");
      dt.setFieldFormat("punch_time_four", " HH:mm");
      dt.setFieldFormat("punch_time_one", "HH:mm");
      dt.setFieldFormat("punch_time_two", "HH:mm");
      dt.setFieldFormat("punch_time_three", "HH:mm");
      dt.setFieldFormat("punch_time_four", "HH:mm");
      baseDao.loadPromptData(dt);
      return dt;
   }
@@ -313,7 +313,7 @@
    * @return
    */
   public FieldSetEntity findRecordInfo(String uuid) {
      return baseDao.getFieldSetEntity(CmnConst.PRODUCT_OA_PUNCH_RECORD, uuid, true);
      return baseDao.getFieldSetEntity(CmnConst.PRODUCT_OA_PUNCH_RECORD, uuid, false);
   }

   /**