修改考勤汇总

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/PerformApiController.java

@@ -424,26 +424,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
             } else {
                 performDetailInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
             }
-
-          /*
-            if (ObjectUtils.isEmpty(appealEntity)) {
-                performDetailInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
-            } else {
-                if (ProcessStatusEnum.未处理.getValue() == appealEntity.getProcessStatus()) {
-                    performDetailInfo.setAppealStatus(AppealStatusEnum.申诉中.getValue());
-                } else {
-                    if (AppealResultEnum.通过.getValue() == appealEntity.getProcessStatus()) {
-                        performDetailInfo.setAppealStatus(AppealStatusEnum.申诉通过.getValue());
-                    } else if (AppealResultEnum.不通过.getValue() == appealEntity.getProcessStatus()) {
-                        performDetailInfo.setAppealStatus(AppealStatusEnum.申诉拒绝.getValue());
-                    }
-                }
-            }*/
-
             PerformRulesEntity rulesEntity = rulesService.getCache(performDetailInfo.getRuleId().toString());
-
             performDetailInfo.setRuleDesc(rulesEntity == null ? "" : rulesEntity.getContent());
-
             rest.setData(performDetailInfo);
             log.info("rspperformDetailInfo:{}", JSON.toJSONString(performDetailInfo));
 

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncDoorsEventAfterTaskImpl.java

@@ -155,7 +155,7 @@ public class SyncDoorsEventAfterTaskImpl implements ITaskExcuteService {
             //单个插入 去掉重复时间段的打卡记录
             for (AttendanceRecordHikEntity recordHikEntity : saveRecordList) {
                 try {
-                    recordHikService.save(recordHikEntity);
+                    recordHikService.getDao().insert(recordHikEntity);
                 } catch (Exception e) {
                     log.error("基础考勤数据保存异常", e.getMessage());
                 }

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncDoorsEventTaskImpl.java

@@ -155,7 +155,7 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
             //单个插入 去掉重复时间段的打卡记录
             for (AttendanceRecordHikEntity recordHikEntity : saveRecordList) {
                 try {
-                    recordHikService.save(recordHikEntity);
+                    recordHikService.getDao().insert(recordHikEntity);
                 } catch (Exception e) {
                     log.error("基础考勤数据保存异常", e.getMessage());
                 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordEntity.java

@@ -181,25 +181,25 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
 
     public void initAttrValue(){
 
-        this.recordId = -1L;
+        this.recordId = 0L;
 
-        this.staffId = -1L;
+        this.staffId = 0L;
 
         this.staffName = "";
 
         this.workNum = "";
 
-        this.deptId = -1L;
+        this.deptId = 0L;
 
         this.deptName = "";
 
-        this.attendanceGroupId = -1L;
+        this.attendanceGroupId = 0L;
 
         this.attendanceGroupName = "";
 
         this.attendanceDate = null;
 
-        this.ruleId = -1L;
+        this.ruleId = 0L;
 
         this.ruleName = "";
 
@@ -233,13 +233,13 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
 
         this.filePaths = "";
 
-        this.categoryId = -1L;
+        this.categoryId = 0L;
 
         this.categoryName = "";
 
         this.deductPerson = "";
 
-        this.deductTime = null;
+        this.deductTime = new Date();
 
         this.windowNum = "";
     }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckComplainRecordEntity.java

@@ -171,9 +171,9 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
 
     public void initAttrValue(){
 
-            this.recordId = -1L;
+            this.recordId = 0L;
 
-            this.staffId = -1L;
+            this.staffId = 0L;
 
             this.staffName = "";
 
@@ -181,7 +181,7 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
 
             this.windowNum = "";
 
-            this.deptId = -1L;
+            this.deptId = 0L;
 
             this.deptName = "";
 
@@ -199,7 +199,7 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
 
             this.complainDevice = "";
 
-            this.ruleId = -1L;
+            this.ruleId = 0L;
 
             this.ruleName = "";
 
@@ -227,7 +227,7 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
 
             this.filePaths = "";
 
-            this.categoryId = -1L;
+            this.categoryId = 0L;
 
             this.categoryName = "";
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckEffectRecordEntity.java

@@ -164,9 +164,9 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
 
     public void initAttrValue(){
 
-            this.recordId = -1L;
+            this.recordId = 0L;
 
-            this.staffId = -1L;
+            this.staffId = 0L;
 
             this.staffName = "";
 
@@ -174,11 +174,11 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
 
             this.windowNum = "";
 
-            this.deptId = -1L;
+            this.deptId = 0L;
 
             this.deptName = "";
 
-            this.irregularType = -1;
+            this.irregularType = 1;
 
             this.happenTime = null;
 
@@ -188,7 +188,7 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
 
             this.snapPath = "";
 
-            this.ruleId = -1L;
+            this.ruleId = 0L;
 
             this.ruleName = "";
 
@@ -216,7 +216,7 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
 
             this.filePaths = "";
 
-            this.categoryId = -1L;
+            this.categoryId = 0L;
 
             this.categoryName = "";
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckGoworkRecordEntity.java

@@ -166,9 +166,9 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
 
     public void initAttrValue(){
 
-        this.recordId = -1L;
+        this.recordId = 0L;
 
-        this.staffId = -1L;
+        this.staffId = 0L;
 
         this.staffName = "";
 
@@ -176,7 +176,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
 
         this.windowNum = "";
 
-        this.deptId = -1L;
+        this.deptId = 0L;
 
         this.deptName = "";
 
@@ -188,7 +188,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
 
         this.goworkTime = null;
 
-        this.ruleId = -1L;
+        this.ruleId = 0L;
 
         this.ruleName = "";
 
@@ -216,7 +216,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
 
         this.filePaths = "";
 
-        this.categoryId = -1L;
+        this.categoryId = 0L;
 
         this.categoryName = "";
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckOtherRecordEntity.java

@@ -163,27 +163,27 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
 
     public void initAttrValue(){
 
-        this.recordId = -1L;
+        this.recordId = 0L;
 
-        this.staffId = -1L;
+        this.staffId = 0L;
 
         this.staffName = "";
 
         this.workNum = "";
 
-        this.deptId = -1L;
+        this.deptId = null;
 
         this.deptName = "";
 
         this.windowNum = "";
 
-        this.irregularOtherType = -1;
+        this.irregularOtherType = 1;
 
         this.happenTime = null;
 
         this.duration = 0;
 
-        this.ruleId = -1L;
+        this.ruleId = 0L;
 
         this.ruleName = "";
 
@@ -213,7 +213,7 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
 
         this.filePaths = "";
 
-        this.categoryId = -1L;
+        this.categoryId = null;
 
         this.categoryName = "";
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckReviewRecordEntity.java

@@ -165,9 +165,9 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
 
     public void initAttrValue(){
 
-        this.recordId = -1L;
+        this.recordId = 0L;
 
-        this.staffId = -1L;
+        this.staffId = 0L;
 
         this.staffName = "";
 
@@ -175,11 +175,11 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
 
         this.windowNum = "";
 
-        this.deptId = -1L;
+        this.deptId = 0L;
 
         this.deptName = "";
 
-        this.reviewResult = -1;
+        this.reviewResult = 1;
 
         this.reviewTime = null;
 
@@ -187,7 +187,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
 
         this.reviewDevice = "";
 
-        this.ruleId = -1L;
+        this.ruleId = 0L;
 
         this.ruleName = "";
 
@@ -215,7 +215,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
 
         this.filePaths = "";
 
-        this.categoryId = -1L;
+        this.categoryId = 0L;
 
         this.categoryName = "";
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformAttendRecordEntity.java

@@ -144,23 +144,23 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
 
     public void initAttrValue(){
 
-        this.staffId = -1L;
+        this.staffId = 0L;
 
         this.staffName = "";
 
         this.workNum = "";
 
-        this.deptId = -1L;
+        this.deptId = 0L;
 
         this.deptName = "";
 
-        this.attendanceGroupId = -1L;
+        this.attendanceGroupId =0L;
 
         this.attendanceGroupName = "";
 
         this.attendanceDate = null;
 
-        this.ruleId = -1L;
+        this.ruleId = 0L;
 
         this.errorTime = null;
 
@@ -188,7 +188,7 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
 
         this.filePaths = "";
 
-        this.categoryId = -1L;
+        this.categoryId = 0L;
 
         this.categoryName = "";
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformComplainRecordEntity.java

@@ -151,7 +151,7 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
 
     public void initAttrValue(){
 
-            this.staffId = -1L;
+            this.staffId = 0L;
 
             this.staffName = "";
 
@@ -159,7 +159,7 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
 
             this.windowNum = "";
 
-            this.deptId = -1L;
+            this.deptId = 0L;
 
             this.deptName = "";
 
@@ -177,7 +177,7 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
 
             this.complainDevice = "";
 
-            this.ruleId = -1L;
+            this.ruleId = 0L;
 
             this.ruleName = "";
 
@@ -197,7 +197,7 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
 
             this.filePaths = "";
 
-            this.categoryId = -1L;
+            this.categoryId = 0L;
 
             this.categoryName = "";
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformEffectRecordEntity.java

@@ -142,7 +142,7 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
 
     public void initAttrValue(){
 
-            this.staffId = -1L;
+            this.staffId = 0L;
 
             this.staffName = "";
 
@@ -150,11 +150,11 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
 
             this.windowNum = "";
 
-            this.deptId = -1L;
+            this.deptId = 0L;
 
             this.deptName = "";
 
-            this.irregularType = -1;
+            this.irregularType = 1;
 
             this.happenTime = null;
 
@@ -164,7 +164,7 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
 
             this.snapPath = "";
 
-            this.ruleId = -1L;
+            this.ruleId = 0L;
 
             this.ruleName = "";
 
@@ -184,7 +184,7 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
 
             this.filePaths = "";
 
-            this.categoryId = -1L;
+            this.categoryId = 0L;
 
             this.categoryName = "";
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformGoworkRecordEntity.java

@@ -141,7 +141,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
 
     public void initAttrValue(){
 
-            this.staffId = -1L;
+            this.staffId = 0L;
 
             this.staffName = "";
 
@@ -149,7 +149,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
 
             this.windowNum = "";
 
-            this.deptId = -1L;
+            this.deptId = 0L;
 
             this.deptName = "";
 
@@ -161,7 +161,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
 
             this.goworkTime = null;
 
-            this.ruleId = -1L;
+            this.ruleId = 0L;
 
             this.ruleName = "";
 
@@ -181,7 +181,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
 
             this.filePaths = "";
 
-            this.categoryId = -1L;
+            this.categoryId = 0L;
 
             this.categoryName = "";
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformOtherRecordEntity.java

@@ -130,7 +130,7 @@ public class PerformOtherRecordEntity extends PerformOtherRecordVo {
 
     public void initAttrValue(){
 
-            this.staffId = -1L;
+            this.staffId = 0L;
 
             this.staffName = "";
 
@@ -138,17 +138,17 @@ public class PerformOtherRecordEntity extends PerformOtherRecordVo {
 
             this.windowNum = "";
 
-            this.deptId = -1L;
+            this.deptId =0L;
 
             this.deptName = "";
 
-            this.irregularOtherType = -1;
+            this.irregularOtherType = 1;
 
             this.happenTime = null;
 
             this.duration = 0;
 
-            this.ruleId = -1L;
+            this.ruleId = null;
 
             this.ruleName = "";
 
@@ -170,7 +170,7 @@ public class PerformOtherRecordEntity extends PerformOtherRecordVo {
 
             this.filePaths = "";
 
-            this.categoryId = -1L;
+            this.categoryId = null;
 
             this.categoryName = "";
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformReviewRecordEntity.java

@@ -137,7 +137,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
 
     public void initAttrValue(){
 
-            this.staffId = -1L;
+            this.staffId = 0L;
 
             this.staffName = "";
 
@@ -145,11 +145,11 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
 
             this.windowNum = "";
 
-            this.deptId = -1L;
+            this.deptId = 0L;
 
             this.deptName = "";
 
-            this.reviewResult = -1;
+            this.reviewResult = 1;
 
             this.reviewTime = null;
 
@@ -157,7 +157,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
 
             this.reviewDevice = "";
 
-            this.ruleId = -1L;
+            this.ruleId = 0L;
 
             this.ruleName = "";
 
@@ -177,7 +177,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
 
             this.filePaths = "";
 
-            this.categoryId = -1L;
+            this.categoryId = 0L;
 
             this.categoryName = "";