考勤组插入bug
This commit is contained in:
parent
c0d43c01c6
commit
ca4d366d74
@ -34,7 +34,7 @@ public class AttendanceWeekSetBo extends BaseEntity {
|
||||
/**
|
||||
* 星期(1代表周一,7代表周日)
|
||||
*/
|
||||
private Long dayOfWeek;
|
||||
private Integer dayOfWeek;
|
||||
|
||||
/**
|
||||
* 是否休息(0:不休息,1:休息)
|
||||
|
@ -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;
|
||||
|
||||
/**
|
||||
* 被访人
|
||||
*/
|
||||
|
@ -69,6 +69,9 @@ public class TbVisitorManagementVo implements Serializable {
|
||||
@ExcelProperty(value = "被访人")
|
||||
private String interviewedPerson;
|
||||
|
||||
@ExcelProperty(value = "访客类型")
|
||||
private Integer type;
|
||||
|
||||
/**
|
||||
* 被访单位
|
||||
*/
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -118,16 +118,16 @@
|
||||
<version>2.4.0</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.hik</groupId>
|
||||
<artifactId>examples</artifactId>
|
||||
</dependency>
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>com.hik</groupId>-->
|
||||
<!-- <artifactId>examples</artifactId>-->
|
||||
<!-- </dependency>-->
|
||||
|
||||
<dependency>
|
||||
<groupId>com.hik</groupId>
|
||||
<artifactId>jna</artifactId>
|
||||
<version>4.5.2_1</version>
|
||||
</dependency>
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>com.hik</groupId>-->
|
||||
<!-- <artifactId>jna</artifactId>-->
|
||||
<!-- <version>4.5.2_1</version>-->
|
||||
<!-- </dependency>-->
|
||||
|
||||
<dependency>
|
||||
<groupId>org.eclipse.paho</groupId>
|
||||
|
Loading…
Reference in New Issue
Block a user