Ver Fonte

考勤规则代码

dzx há 1 ano atrás
pai
commit
5d161af1ae

+ 1 - 1
src/main/java/com/xjrsoft/module/attendance/controller/AttendanceRuleCategoryController.java

@@ -77,7 +77,7 @@ public class AttendanceRuleCategoryController {
     public RT<Boolean> add(@Valid @RequestBody AddAttendanceRuleCategoryDto dto){
         AttendanceRuleCategory attendanceRuleCategory = BeanUtil.toBean(dto, AttendanceRuleCategory.class);
         boolean isSuccess = attendanceRuleCategoryService.add(attendanceRuleCategory);
-    return RT.ok(isSuccess);
+        return RT.ok(isSuccess);
     }
 
     @PutMapping

+ 4 - 0
src/main/java/com/xjrsoft/module/attendance/dto/AddAttendanceRuleCategoryDto.java

@@ -71,4 +71,8 @@ public class AddAttendanceRuleCategoryDto implements Serializable {
     */
     @ApiModelProperty("attendanceUserRelation子表")
     private List<AddAttendanceUserRelationDto> attendanceUserRelationList;
+
+
+    @ApiModelProperty("非考勤周期是否允许进出(1:是 0:否)")
+    private Integer notCycleIsInOut;
 }

+ 3 - 0
src/main/java/com/xjrsoft/module/attendance/entity/AttendanceRuleCategory.java

@@ -127,4 +127,7 @@ public class AttendanceRuleCategory implements Serializable {
     @EntityMapping(thisField = "id", joinField = "attendanceRuleCategoryId")
     private List<AttendanceUserRelation> attendanceUserRelationList;
 
+    @ApiModelProperty("非考勤周期是否允许进出(1:是 0:否)")
+    private Integer notCycleIsInOut;
+
 }