Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/attendance/record/hik/list.vue

@@ -220,12 +220,13 @@ export default {
     },
     /** 导出Excel */
     doExport() {
-
-      console.log("isExport:",this.isExport)
-
+      console.log("isExport:",this.isExport==true)
       if(this.isExport==true) {
+        console.log("isExport:",this.isExport)
         this.$message.info("考勤数据正在导出中，请勿重复点击！")
         return false;
+      }else{
+        console.log("isExport11:",this.isExport)
       }
 
       this.isExport = true;

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceStatVo.java

@@ -19,10 +19,8 @@ public class AttendanceStatVo extends BaseEntityLong {
 
     private List<AttendanceStaffStatEntity> attendanceStaffStatEntities;
 
-
     private String startTime;
     private String endTime;
-
-
+    private List <Long> idList;
 
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java

@@ -308,9 +308,25 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
         }
 
         if (!ObjectUtils.isEmpty(errorEntityList)) {
+
+            //删除当前员工当日未处理的异常后，重新添加
+            AttendanceRecordErrorQuery errorQuery = new AttendanceRecordErrorQuery();
+            errorQuery.setCreateTimeStart(DateUtil.today());
+            errorQuery.setCreateTimeEnd(DateUtil.today());
+            errorQuery.setStaffId(attendanceRecordEntity.getStaffId());
+            errorQuery.setProcessStatus(ProcessStatusEnum.未处理.getValue());
+
+            Long[] errorIds = errorService.find(errorQuery).stream().map(i -> i.getId()).toArray(Long[]::new);
+
+            if(!ObjectUtils.isEmpty(errorIds)){
+                errorService.remove(errorIds,context);
+            }
+
             for (AttendanceRecordErrorEntity errorEntity : errorEntityList) {
-                //查看是否存在相同的异常记录，如果存在 则不添加
-                AttendanceRecordErrorQuery errorQuery = new AttendanceRecordErrorQuery();
+                errorService.save(errorEntity, context);
+
+               /* //查看是否存在相同的异常记录，如果存在 则不添加
+                 errorQuery = new AttendanceRecordErrorQuery();
                 errorQuery.setShiftsId(errorEntity.getShiftsId());
                 errorQuery.setGoOffDateTime(errorEntity.getErrorDateTime());
                 errorQuery.setStaffId(errorEntity.getStaffId());
@@ -323,7 +339,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                     errorEntity.setId(attendanceRecordErrorEntity.getId());
                     errorService.update(errorEntity,context);
                     log.info("已经存在相同的异常记录，更新保存！");
-                }
+                }*/
             }
         }
     }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordController.java

@@ -6,6 +6,7 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
+import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.utils.ServletUtils;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
@@ -14,6 +15,7 @@ import com.mortals.xhx.common.code.GoWorkResultEnum;
 import com.mortals.xhx.common.code.NormalEnum;
 import com.mortals.xhx.common.code.OffWorkResultEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.common.keys.RedisCacheKeys;
 import com.mortals.xhx.module.attendance.model.*;
 import com.mortals.xhx.module.attendance.model.vo.AttendStatInfo;
 import com.mortals.xhx.module.attendance.service.AttendanceClassService;
@@ -75,6 +77,8 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
     private AttendanceGroupService groupService;
     @Autowired
     private AttendanceClassService classService;
+    @Autowired
+    private ICacheService cacheService;
 
     public AttendanceRecordController() {
         super.setModuleDesc("考勤打卡记录信息");
@@ -96,6 +100,14 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
 
     @Override
     public void doExportBefore(Context context, AttendanceRecordEntity query, List<String> properties) throws AppException {
+
+
+        String bool = cacheService.get(RedisCacheKeys.getRecordExportLockKey());
+        if (!ObjectUtils.isEmpty(bool)) {
+            throw new AppException("每日数据正在导出中，请稍后再试！");
+        }
+        cacheService.set(RedisCacheKeys.getRecordExportLockKey(), "111", 120L);
+
         if (!ObjectUtils.isEmpty(query.getProperties())) {
           /*  //通过属性转换为注解
             List<Field> tempFields = new ArrayList<>();
@@ -177,6 +189,9 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
         attendanceExportRecordEntity.setType(2);
         attendanceExportRecordEntity.setExportOrImport(1);
         attendanceExportRecordService.save(attendanceExportRecordEntity);
+
+        cacheService.del(RedisCacheKeys.getRecordExportLockKey());
+
     }
 
 
@@ -323,7 +338,7 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
         JSONObject jsonObject = new JSONObject();
         String busiDesc = this.getModuleDesc() + "统计";
         try {
-           // Rest<AttendStatInfo> rest = this.service.statByDay(getContext());
+            // Rest<AttendStatInfo> rest = this.service.statByDay(getContext());
 //            if (rest.getCode() == YesNoEnum.NO.getValue()) {
 //                throw new AppException("统计异常！");
 //            } else {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordHikController.java

@@ -190,7 +190,6 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
 
 
         String bool = cacheService.get(RedisCacheKeys.getHikExportLockKey());
-
         if(!ObjectUtils.isEmpty(bool)){
             throw new AppException("考勤数据正在导出中，请稍后再试！");
         }

common-lib/src/main/java/com/mortals/xhx/common/keys/RedisCacheKeys.java

@@ -23,4 +23,8 @@ public final class RedisCacheKeys {
         return "hik:export:lock";
     }
 
+    public static String getRecordExportLockKey() {
+        return "record:export:lock";
+    }
+
 }