考勤规则调整

src/main/java/com/xjrsoft/module/attendance/controller/AttendanceRuleCategoryController.java

@@ -83,10 +83,7 @@ public class AttendanceRuleCategoryController {
     @ApiOperation(value = "修改考勤规则")
     @SaCheckPermission("attendancerulecategory:edit")
     public RT<Boolean> update(@Valid @RequestBody UpdateAttendanceRuleCategoryDto dto){
-
-
         return RT.ok(attendanceRuleCategoryService.update(dto));
-
     }
 
     @DeleteMapping
@@ -94,7 +91,6 @@ public class AttendanceRuleCategoryController {
     @SaCheckPermission("attendancerulecategory:delete")
     public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
         return RT.ok(attendanceRuleCategoryService.delete(ids));
-
     }
 
 }

src/main/java/com/xjrsoft/module/attendance/service/impl/AttendanceRuleCategoryServiceImpl.java

@@ -65,6 +65,7 @@ public class AttendanceRuleCategoryServiceImpl extends MPJBaseServiceImpl<Attend
                 }
                 List<XjrUser> userList = xjrUserService.list(
                     new MPJLambdaWrapper<XjrUser>()
+                    .select(XjrUser::getId)
                     .select(XjrUser.class, x -> VoToColumnUtil.fieldsToColumns(XjrUser.class).contains(x.getProperty()))
                     .leftJoin(BaseTeacher.class, BaseTeacher::getUserId, XjrUser::getId)
                     .eq(BaseTeacher::getDeleteMark, DeleteMark.NODELETE.getCode())
@@ -87,6 +88,7 @@ public class AttendanceRuleCategoryServiceImpl extends MPJBaseServiceImpl<Attend
 
                 List<XjrUser> userList = xjrUserService.list(
                     new MPJLambdaWrapper<XjrUser>()
+                    .select(XjrUser::getId)
                     .select(XjrUser.class, x -> VoToColumnUtil.fieldsToColumns(XjrUser.class).contains(x.getProperty()))
                     .leftJoin(BaseTeacher.class, BaseTeacher::getUserId, XjrUser::getId)
                     .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, XjrUser::getId)
@@ -99,6 +101,7 @@ public class AttendanceRuleCategoryServiceImpl extends MPJBaseServiceImpl<Attend
                 List<Long> relationUserIds = userList.stream().map(XjrUser::getId).collect(Collectors.toList());
                 List<XjrUser> relations = xjrUserService.list(
                     new MPJLambdaWrapper<XjrUser>()
+                    .select(XjrUser::getId)
                     .select(XjrUser.class, x -> VoToColumnUtil.fieldsToColumns(XjrUser.class).contains(x.getProperty()))
                     .leftJoin(AttendanceUserRelation.class, AttendanceUserRelation::getUserId, XjrUser::getId)
                     .eq(AttendanceUserRelation::getDeleteMark, DeleteMark.NODELETE.getCode())
@@ -125,6 +128,7 @@ public class AttendanceRuleCategoryServiceImpl extends MPJBaseServiceImpl<Attend
                 }
                 List<XjrUser> userList = xjrUserService.list(
                     new MPJLambdaWrapper<XjrUser>()
+                    .select(XjrUser::getId)
                     .select(XjrUser.class, x -> VoToColumnUtil.fieldsToColumns(XjrUser.class).contains(x.getProperty()))
                     .leftJoin(BaseStudent.class, BaseStudent::getUserId, XjrUser::getId)
                     .eq(BaseStudent::getDeleteMark, DeleteMark.NODELETE.getCode())
@@ -147,6 +151,7 @@ public class AttendanceRuleCategoryServiceImpl extends MPJBaseServiceImpl<Attend
 
                 List<XjrUser> userList = xjrUserService.list(
                     new MPJLambdaWrapper<XjrUser>()
+                    .select(XjrUser::getId)
                     .select(XjrUser.class, x -> VoToColumnUtil.fieldsToColumns(XjrUser.class).contains(x.getProperty()))
                     .leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, XjrUser::getId)
                     .eq(BaseStudentSchoolRoll::getDeleteMark, DeleteMark.NODELETE.getCode())
@@ -158,6 +163,7 @@ public class AttendanceRuleCategoryServiceImpl extends MPJBaseServiceImpl<Attend
                 List<Long> relationUserIds = userList.stream().map(XjrUser::getId).collect(Collectors.toList());
                 List<XjrUser> relations = xjrUserService.list(
                     new MPJLambdaWrapper<XjrUser>()
+                    .select(XjrUser::getId)
                     .select(XjrUser.class, x -> VoToColumnUtil.fieldsToColumns(XjrUser.class).contains(x.getProperty()))
                     .leftJoin(AttendanceUserRelation.class, AttendanceUserRelation::getUserId, XjrUser::getId)
                     .eq(AttendanceUserRelation::getDeleteMark, DeleteMark.NODELETE.getCode())

src/main/java/com/xjrsoft/module/attendance/vo/AttendanceRuleCategoryVo.java

@@ -67,10 +67,8 @@ public class AttendanceRuleCategoryVo {
     */
     @ApiModelProperty("attendanceRuleDetails子表")
     private List<AttendanceRuleDetailsVo> attendanceRuleDetailsList;
-    /**
-    * attendanceUserRelation
-    */
-    @ApiModelProperty("attendanceUserRelation子表")
-    private List<AttendanceUserRelationVo> attendanceUserRelationList;
+
+    @ApiModelProperty("非考勤周期是否允许进出（1：是 0：否）")
+    private Integer notCycleIsInOut;
 
 }