Skip to content

Changes

Summary

  1. APP考勤排班 排班保存 (details)
  2. APP考勤排班 冲突覆盖 (details)
  3. 打卡方式: 支持 多wifi 或者多地点打卡,Wi-Fi和地点 依旧二选一 (details)
Commit e9d064947411c7ea816400d487c70751fa4e9fa9 by justme070
APP考勤排班 排班保存
The file was addedbcxin-business/src/main/resources/mapper/platform/attend/AttendSchedulConflictDetailMapper.xml
The file was modified bcxin-business/src/main/resources/mapper/platform/attend/AttendSchedulDetailMapper.xml
The file was modified bcxin-business/src/main/resources/mapper/platform/attend/AttendSchedulMapper.xml
The file was modified bcxin-business/src/main/java/com/bcxin/platform/domain/attend/AttendSchedul.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/mapper/attend/AttendSchedulConflictDetailMapper.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/oauth/OAuthServiceImpl.java
The file was modified bcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendSchedulController.java
The file was modified bcxin-web/src/main/java/com/bcxin/platform/web/controller/system/SysConfigController.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/mapper/attend/AttendSchedulDetailMapper.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/AttendSchedulService.java
The file was addedsql/20220211.sql
The file was modified bcxin-business/src/main/java/com/bcxin/platform/dto/attend/AttendSchedulDto.java
The file was modified bcxin-common/src/main/java/com/bcxin/platform/common/utils/DateUtil.java
The file was modified bcxin-common/src/main/java/com/bcxin/platform/common/constant/DictConst.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/mapper/attend/AttendSchedulConflictMapper.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/domain/attend/AttendSchedulConflictDetail.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/dto/app/AppAttendSchedulDto.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/domain/attend/AttendSchedulConflict.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendSchedulServiceImpl.java
The file was addedbcxin-business/src/main/resources/mapper/platform/attend/AttendSchedulConflictMapper.xml
Commit dca6a18b0ce6665b7d803d192fc5ec2235f1675f by justme070
APP考勤排班 冲突覆盖
The file was modified sql/20220211.sql
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendSchedulServiceImpl.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendSchedulConflictServiceImpl.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/mapper/attend/AttendSchedulConflictMapper.java
The file was addedbcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendSchedulConflictController.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/dto/app/AppAttendSchedulConflictDto.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/service/attend/AttendSchedulConflictService.java
The file was modified bcxin-business/src/main/resources/mapper/platform/attend/AttendSchedulConflictMapper.xml
Commit 33816e61e91e84114bace8c0820b669f3380f587 by justme070
打卡方式: 支持 多wifi 或者多地点打卡,Wi-Fi和地点 依旧二选一
APP 考勤套负责人要支持可修改为非本人
The file was addedbcxin-business/src/main/java/com/bcxin/platform/mapper/attend/AttendAddressMapper.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/domain/attend/AttendWifi.java
The file was addedbcxin-web/src/main/java/com/bcxin/platform/web/controller/attend/AttendWifiController.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/domain/attend/AttendAddress.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendWifiServiceImpl.java
The file was modified bcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendController.java
The file was addedbcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendWifiController.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/domain/attend/Attend.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendAddressServiceImpl.java
The file was addedbcxin-business/src/main/resources/mapper/platform/attend/AttendAddressMapper.xml
The file was addedbcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendAddressController.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/service/attend/AttendAddressService.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendServiceImpl.java
The file was addedbcxin-web/src/main/java/com/bcxin/platform/web/controller/attend/AttendAddressController.java
The file was modified bcxin-business/src/main/resources/mapper/platform/attend/AttendMapper.xml
The file was addedbcxin-business/src/main/resources/mapper/platform/attend/AttendWifiMapper.xml
The file was addedbcxin-business/src/main/java/com/bcxin/platform/mapper/attend/AttendWifiMapper.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/service/attend/AttendWifiService.java
The file was modified sql/20220211.sql