修改自动考核

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

@@ -273,25 +273,25 @@ public class PerformAttendAppealEntity extends PerformAttendAppealVo {
 
     public void initAttrValue(){
 
-        this.checkRecordId = -1L;
+        this.checkRecordId = 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 = "";
 
@@ -329,7 +329,7 @@ public class PerformAttendAppealEntity extends PerformAttendAppealVo {
 
         this.violationType = "";
 
-        this.reviewResult = -1;
+        this.reviewResult = 0;
 
         this.reviewTime = null;
 
@@ -359,7 +359,7 @@ public class PerformAttendAppealEntity extends PerformAttendAppealVo {
 
         this.goworkTime = null;
 
-        this.irregularType = -1;
+        this.irregularType = null;
 
         this.happenTime = null;
 
@@ -369,7 +369,7 @@ public class PerformAttendAppealEntity extends PerformAttendAppealVo {
 
         this.snapPath = "";
 
-        this.irregularOtherType = -1;
+        this.irregularOtherType = null;
 
         this.performType = "";
 

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

@@ -9,6 +9,7 @@ import com.mortals.framework.model.Result;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.EnabledEnum;
+import com.mortals.xhx.common.code.IrregularTypeEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.module.perform.model.vo.AppealInfo;
 import com.mortals.xhx.module.perform.model.vo.AppealSummaryQuery;
@@ -67,7 +68,7 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
         this.addDict(model, "appealResult", paramService.getParamBySecondOrganize("PerformAttendAppeal", "appealResult"));
         this.addDict(model, "reviewResult", paramService.getParamBySecondOrganize("PerformAttendAppeal", "reviewResult"));
         this.addDict(model, "reviewSource", paramService.getParamBySecondOrganize("PerformAttendAppeal", "reviewSource"));
-        this.addDict(model, "irregularType", paramService.getParamBySecondOrganize("PerformAttendAppeal", "irregularType"));
+        this.addDict(model, "irregularType", IrregularTypeEnum.getEnumMap());
         this.addDict(model, "irregularOtherType", paramService.getParamBySecondOrganize("PerformAttendAppeal", "irregularOtherType"));
         super.init(model, context);
     }