Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbVisitorManagement.java

@@ -49,6 +49,11 @@ public class TbVisitorManagement extends TenantEntity {
      */
     private String visitingReason;
 
+    /**
+     * 类型（0：拜访，1：邀约）
+     */
+    private Integer type;
+
     /**
      * 被访人
      */

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceWeekSetBo.java

@@ -34,7 +34,7 @@ public class AttendanceWeekSetBo extends BaseEntity {
     /**
      * 星期（1代表周一，7代表周日）
      */
-    private Long dayOfWeek;
+    private Integer dayOfWeek;
 
     /**
      * 是否休息（0：不休息，1：休息）

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbVisitorManagementBo.java

@@ -52,6 +52,9 @@ public class TbVisitorManagementBo extends BaseEntity {
     @NotBlank(message = "拜访事由不能为空", groups = { AddGroup.class, EditGroup.class })
     private String visitingReason;
 
+    @NotBlank(message = "类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Integer type;
+
     /**
      * 被访人
      */

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbVisitorManagementVo.java

@@ -69,6 +69,9 @@ public class TbVisitorManagementVo implements Serializable {
     @ExcelProperty(value = "被访人")
     private String interviewedPerson;
 
+    @ExcelProperty(value = "访客类型")
+    private Integer type;
+
     /**
      * 被访单位
      */

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java

@@ -163,6 +163,7 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService {
                     BeanUtils.copyProperties(weekSet, attendanceWeekSet);
                     attendanceWeekSet.setGroupId(add.getId());
                     attendanceWeekSet.setDayOfWeek(weekSet.getDayOfWeek());
+//                    attendanceWeekSet.setShiftId(weekSet.getShiftId());
                     weekSetMapper.insert(attendanceWeekSet);
                     //查询出周期表的id
                     Long weekSetId = attendanceWeekSet.getId();
@@ -209,6 +210,7 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService {
 
 
         }
+//        insertAttendaanceClockDate(bo);
 
         return flag;
     }
@@ -254,6 +256,18 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService {
         AttendanceGroup update = MapstructUtils.convert(bo, AttendanceGroup.class);
         validEntityBeforeSave(update);
 
+        //根据参数判断当前是固定班制还是排班制
+        if (Objects.equals(update.getAttendanceType(), FIXEDSCHEDULE)) {
+            //1.固定班制
+            //取出考勤组id
+            Long groupId = update.getId();
+            //根据考勤组id修改attendance_week_set表中的数据
+            weekSetMapper.update(null, Wrappers.<AttendanceWeekSet>lambdaUpdate().eq(AttendanceWeekSet::getGroupId, groupId));
+            //根据考勤组id查询出考勤周期id
+        }
+
+
+
 
         return baseMapper.updateById(update) > 0;
     }