杜洪波
2025-05-14 9db1c6c261049fbdcb104e6c0e07fa544bb42013
src/main/java/com/product/administration/service/PunchRecordService.java
@@ -56,11 +56,23 @@
      DataTableEntity dt=baseDao.listTable(CmnConst.PRODUCT_OA_PUNCH_RECORD, "created_by=?", new Object[] {SpringMVCContextHolder.getCurrentUser().getUser_id()}, null, CmnConst.CREATED_UTC_DATETIME+" DESC", fse.getInteger(CmnConst.PAGESIZE), fse.getInteger(CmnConst.CPAGE));
      for (int i=0;i<dt.getRows();i++){
         FieldSetEntity fieldSetEntity = dt.getData().get(i);
         String punch_time_one = fieldSetEntity.getValue("punch_time_one").toString();
         Date date1=new Date(punch_time_one);
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         String sign_date = dateFormat.format(date1);
         fieldSetEntity.setValue("sign_date",sign_date);
         String punch_time_one = null;
         if (fieldSetEntity.getString("punch_time_one") != null) {
            punch_time_one=fieldSetEntity.getValue("punch_time_one").toString();
         }else if (fieldSetEntity.getString("punch_time_two") != null) {
            punch_time_one=fieldSetEntity.getValue("punch_time_two").toString();
         }else if (fieldSetEntity.getString("punch_time_three") != null) {
            punch_time_one=fieldSetEntity.getValue("punch_time_three").toString();
         }else if (fieldSetEntity.getString("punch_time_four") != null) {
            punch_time_one=fieldSetEntity.getValue("punch_time_four").toString();
         }
         String sign_date=null;
         if (null!=punch_time_one){
            Date date1=new Date(punch_time_one);
            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
             sign_date = dateFormat.format(date1);
            fieldSetEntity.setValue("sign_date",sign_date);
         }
         DateFormat dateFormatGet = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         //获取早退迟到的分钟数
@@ -182,7 +194,7 @@
                  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)){
@@ -213,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)){
@@ -232,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)){
@@ -248,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)){
@@ -263,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)){
@@ -287,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;
   }
@@ -301,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);
   }
   /**