From ca4d366d745265847bd167659a70c5f694e95224 Mon Sep 17 00:00:00 2001 From: dy <2389062315@qq.com> Date: Sun, 27 Jul 2025 14:41:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E7=BB=84=E6=8F=92=E5=85=A5bu?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/bo/AttendanceWeekSetBo.java | 2 +- .../domain/bo/TbVisitorManagementBo.java | 3 +++ .../domain/vo/TbVisitorManagementVo.java | 3 +++ .../impl/AttendanceGroupServiceImpl.java | 2 ++ ruoyi-modules/Sis/pom.xml | 18 +++++++++--------- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceWeekSetBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceWeekSetBo.java index 553ba155..f5dfa168 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceWeekSetBo.java +++ b/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：休息） diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbVisitorManagementBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbVisitorManagementBo.java index c9b697a9..9e26f81b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbVisitorManagementBo.java +++ b/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; + /** * 被访人 */ diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbVisitorManagementVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbVisitorManagementVo.java index 9f4fb19b..1edf997f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbVisitorManagementVo.java +++ b/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; + /** * 被访单位 */ diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java index 3c8e3524..0c27bf93 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java +++ b/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; } diff --git a/ruoyi-modules/Sis/pom.xml b/ruoyi-modules/Sis/pom.xml index ba3949e3..8c7a9bdc 100644 --- a/ruoyi-modules/Sis/pom.xml +++ b/ruoyi-modules/Sis/pom.xml @@ -118,16 +118,16 @@ 2.4.0 - - com.hik - examples - + + + + - - com.hik - jna - 4.5.2_1 - + + + + + org.eclipse.paho