by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

考勤组插入bug

Browse Source
This commit is contained in:
dy 2025-07-27 14:41:53 +08:00
parent c0d43c01c6
commit ca4d366d74
5 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

@ -163,6 +163,7 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService {
BeanUtils.copyProperties(weekSet, attendanceWeekSet); BeanUtils.copyProperties(weekSet, attendanceWeekSet);
attendanceWeekSet.setGroupId(add.getId()); attendanceWeekSet.setGroupId(add.getId());
attendanceWeekSet.setDayOfWeek(weekSet.getDayOfWeek()); attendanceWeekSet.setDayOfWeek(weekSet.getDayOfWeek());
// attendanceWeekSet.setShiftId(weekSet.getShiftId());
weekSetMapper.insert(attendanceWeekSet); weekSetMapper.insert(attendanceWeekSet);
//查询出周期表的id //查询出周期表的id
Long weekSetId = attendanceWeekSet.getId(); Long weekSetId = attendanceWeekSet.getId();
@ -209,6 +210,7 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService {
} }
// insertAttendaanceClockDate(bo);
return flag; return flag;
} }

18
ruoyi-modules/Sis/pom.xml
View File

@ -118,16 +118,16 @@
<version>2.4.0</version> <version>2.4.0</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>com.hik</groupId> <!-- <groupId>com.hik</groupId>-->
<artifactId>examples</artifactId> <!-- <artifactId>examples</artifactId>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>com.hik</groupId> <!-- <groupId>com.hik</groupId>-->
<artifactId>jna</artifactId> <!-- <artifactId>jna</artifactId>-->
<version>4.5.2_1</version> <!-- <version>4.5.2_1</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>org.eclipse.paho</groupId> <groupId>org.eclipse.paho</groupId>