Skip to content
[Jenkins]Jenkins
log in

Changes

Summary

  1. 考勤套增删改 (details)
  2. APP考勤班次接口 (details)
  3. APP考勤班次接口 (details)
  4. APP考勤排班 排班详情 (details)
  5. APP考勤排班 排班详情 查询参数判断 (details)
  6. APP考勤排班 排班保存 (details)
  7. APP考勤排班 排班保存 冲突判断保存 (details)
  8. APP考勤排班 冲突覆盖 (details)
  9. APP考勤排班 冲突覆盖 (details)
  10. APP考勤排班 排班保存 冲突判断保存 (details)
  11. 排班保存 冲突判断保存 (details)
  12. 考勤人员批量添加 (details)
  13. 考勤人员批量添加 (details)
  14. 新增根据perIds查询人员信息 (details)
  15. 新增根据perIds查询人员信息 (details)
  16. 打卡方式： 支持 多wifi 或者多地点打卡，Wi-Fi和地点 依旧二选一 (details)
  17. 放开保险回调接口鉴权限制 (details)
  18. 开放public (details)
  19. 修改保险公共接口权限过滤 (details)
  20. 增加打印调试 (details)
  21. 修改保险公共接口权限 (details)
  22. 修改请求保险接口时替换https为http (details)
  23. 修改保险查询语句 (details)
  24. 打卡方式： 支持 多wifi 或者多地点打卡，Wi-Fi和地点 依旧二选一 (details)
  25. 打卡方式： 支持 多wifi 或者多地点打卡，Wi-Fi和地点依旧二选一 (details)
  26. 班次列表查询 增加查询条件 (details)
  27. 【APP考勤排班】- 根据ids获取人员列表 增加查询条件 (details)
  28. 【APP考勤排班】- 根据ids获取人员列表 增加查询条件 (details)
  29. 【APP考勤排班】- 根据ids获取人员列表 增加查询条件 (details)
  30. 考勤人员id (details)
  31. 考勤排班 班次校验 (details)
  32. 新增根据perIds删除驻勤人员 (details)
  33. 增加线下保全人数 (details)
  34. 考勤套详情增加 人员数量 (details)
  35. 修改在保人数查询 (details)
  36. 判断版本 (details)
  37. redis连接串 (details)
  38. 数据库连接串修改 (details)
  39. 部门判空条件 (details)
  40. 排查 (details)
  41. 更新版本 (details)
Commit 73b26761c0b07e5d6682441a7ab46c1738a2425c by justme070
考勤套增删改
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendServiceImpl.java
The file was modified bcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendController.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/AttendService.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/dto/app/AppAttendEditDto.java
The file was modified bcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendPerController.java
Commit 767a9deb933476599e42df2d08f84e992b8c344c by justme070
APP考勤班次接口
The file was modified bcxin-business/src/main/java/com/bcxin/platform/mapper/attend/AttendShiftMapper.java
The file was modified bcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendShiftController.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/AttendShiftService.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendShiftServiceImpl.java
The file was modified bcxin-business/src/main/resources/mapper/platform/attend/AttendShiftMapper.xml
Commit b91c8d95a2d957e4771651fa14c79bb16e6a760d by justme070
APP考勤班次接口
The file was modified bcxin-business/src/main/resources/mapper/platform/attend/AttendShiftMapper.xml
The file was modified bcxin-business/src/main/resources/mapper/platform/attend/AttendPerMapper.xml
The file was modified bcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendPerController.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/mapper/attend/AttendPerMapper.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/mapper/attend/AttendShiftMapper.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendPerServiceImpl.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendShiftServiceImpl.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/AttendPerService.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/AttendShiftService.java
The file was modified bcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendShiftController.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/dto/app/AppAttendPerDto.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/dto/app/AppAttendShiftDto.java
Commit a50bd195bc8f4054f1c049eb90801e5ad68612a4 by justme070
APP考勤排班 排班详情
The file was modified bcxin-business/src/main/resources/mapper/platform/attend/AttendShiftMapper.xml
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendSchedulServiceImpl.java
The file was modified bcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendSchedulController.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/dto/app/AppAttendSchedulDto.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 modified bcxin-business/src/main/resources/mapper/platform/attend/AttendSchedulDetailMapper.xml
Commit c2b12cc243e99e07cafbe115ca1826074a6f8912 by justme070
APP考勤排班 排班详情 查询参数判断
The file was modified bcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendSchedulController.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/dto/app/AppAttendSchedulDto.java
Commit e9d064947411c7ea816400d487c70751fa4e9fa9 by justme070
APP考勤排班 排班保存
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/dto/attend/AttendSchedulDto.java
The file was addedbcxin-business/src/main/resources/mapper/platform/attend/AttendSchedulConflictDetailMapper.xml
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendSchedulServiceImpl.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/domain/attend/AttendSchedul.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/dto/app/AppAttendSchedulDto.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/oauth/OAuthServiceImpl.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/domain/attend/AttendSchedulConflict.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/domain/attend/AttendSchedulConflictDetail.java
The file was modified bcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendSchedulController.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/mapper/attend/AttendSchedulConflictMapper.java
The file was modified bcxin-business/src/main/resources/mapper/platform/attend/AttendSchedulDetailMapper.xml
The file was modified bcxin-common/src/main/java/com/bcxin/platform/common/utils/DateUtil.java
The file was addedsql/20220211.sql
The file was modified bcxin-common/src/main/java/com/bcxin/platform/common/constant/DictConst.java
The file was modified bcxin-business/src/main/resources/mapper/platform/attend/AttendSchedulMapper.xml
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/service/attend/AttendSchedulService.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/mapper/attend/AttendSchedulConflictDetailMapper.java
The file was addedbcxin-business/src/main/resources/mapper/platform/attend/AttendSchedulConflictMapper.xml
Commit 3c9416f75e62b0120da56dce509686c67fa6f2e1 by justme070
APP考勤排班 排班保存 冲突判断保存
The file was modified bcxin-business/src/main/resources/mapper/platform/attend/AttendSchedulMapper.xml
The file was modified bcxin-business/src/main/resources/mapper/platform/attend/AttendSchedulDetailMapper.xml
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendSchedulServiceImpl.java
Commit dca6a18b0ce6665b7d803d192fc5ec2235f1675f by justme070
APP考勤排班 冲突覆盖
The file was modified bcxin-business/src/main/java/com/bcxin/platform/mapper/attend/AttendSchedulConflictMapper.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/service/attend/impl/AttendSchedulServiceImpl.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/dto/app/AppAttendSchedulConflictDto.java
The file was addedbcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendSchedulConflictController.java
The file was modified sql/20220211.sql
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 d66f81d8b1d4360bac012181cacd14328e8816ff by justme070
APP考勤排班 冲突覆盖
The file was modified bcxin-business/src/main/resources/mapper/platform/attend/AttendSchedulConflictMapper.xml
Commit c8d81a6c269aa81e4afd4e47bf8c2db87cceb1fe by justme070
APP考勤排班 排班保存 冲突判断保存
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/AttendSchedulService.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendSchedulServiceImpl.java
The file was modified bcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendSchedulController.java
Commit 15a429d8f7dd9ab8e81561114f01068d171d85f5 by justme070
排班保存 冲突判断保存
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendShiftServiceImpl.java
Commit f42fed5db3996adc43104709e1ee7d1dd689686c by justme070
考勤人员批量添加
The file was modified bcxin-business/src/main/java/com/bcxin/platform/mapper/attend/AttendPerMapper.java
The file was modified bcxin-web/src/main/java/com/bcxin/platform/web/controller/attend/AttendPerController.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendPerServiceImpl.java
The file was modified bcxin-business/src/main/resources/mapper/platform/attend/AttendPerMapper.xml
The file was modified bcxin-business/src/main/java/com/bcxin/platform/domain/attend/AttendPer.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/AttendPerService.java
Commit 95f6af87bf1bc924aa8a37bf5ae01c321f4787d3 by justme070
考勤人员批量添加
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendPerServiceImpl.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/domain/attend/AttendPer.java
The file was modified bcxin-web/src/main/java/com/bcxin/platform/web/controller/attend/AttendPerController.java
Commit 056e0eb60e5d672e00fbd3e1a8f0cb0e6b4318b3 by justme070
新增根据perIds查询人员信息
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/company/PerBaseInfoService.java
The file was modified bcxin-business/src/main/resources/mapper/platform/company/PerBaseInfoMapper.xml
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/company/impl/PerBaseInfoServiceImpl.java
The file was modified bcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendPerController.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/mapper/company/PerBaseInfoMapper.java
Commit 63cc89a347f7113684f3fd6554022d4a771225ba by justme070
新增根据perIds查询人员信息
The file was modified bcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendPerController.java
Commit 33816e61e91e84114bace8c0820b669f3380f587 by justme070
打卡方式： 支持 多wifi 或者多地点打卡，Wi-Fi和地点 依旧二选一
APP 考勤套负责人要支持可修改为非本人
The file was modified sql/20220211.sql
The file was addedbcxin-business/src/main/java/com/bcxin/platform/mapper/attend/AttendWifiMapper.java
The file was addedbcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendWifiController.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendWifiServiceImpl.java
The file was addedbcxin-business/src/main/resources/mapper/platform/attend/AttendWifiMapper.xml
The file was addedbcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendAddressServiceImpl.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendServiceImpl.java
The file was modified bcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendController.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/mapper/attend/AttendAddressMapper.java
The file was addedbcxin-web/src/main/java/com/bcxin/platform/web/controller/attend/AttendWifiController.java
The file was addedbcxin-web/src/main/java/com/bcxin/platform/web/controller/attend/AttendAddressController.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/domain/attend/AttendWifi.java
The file was addedbcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendAddressController.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/domain/attend/Attend.java
The file was addedbcxin-business/src/main/resources/mapper/platform/attend/AttendAddressMapper.xml
The file was modified bcxin-business/src/main/resources/mapper/platform/attend/AttendMapper.xml
The file was addedbcxin-business/src/main/java/com/bcxin/platform/service/attend/AttendWifiService.java
The file was addedbcxin-business/src/main/java/com/bcxin/platform/service/attend/AttendAddressService.java
Commit b783bbff29916cba7ccac59207a1716c8be3fc15 by zhongxuefeng
放开保险回调接口鉴权限制
The file was modified bcxin-framework/src/main/java/com/bcxin/platform/framework/config/ShiroConfig.java
Commit de7b7fb9f3765708eb32911ca89d45d5d19d493e by zhongxuefeng
开放public
The file was modified bcxin-framework/src/main/java/com/bcxin/platform/framework/config/ShiroConfig.java
Commit 7cce5886908510e2bc627034f2f616f8507c52fd by zhongxuefeng
修改保险公共接口权限过滤
The file was modified bcxin-framework/src/main/java/com/bcxin/platform/framework/config/ShiroConfig.java
Commit da4e6e234fd80f262dbf8e9638a7e8dd1a1c619d by zhongxuefeng
增加打印调试
The file was modified bcxin-business/src/main/java/com/bcxin/platform/config/V5AccessControlFilter.java
Commit 3312787884adc776cfa8f0ebf7afb9aa526d91f9 by zhongxuefeng
修改保险公共接口权限
The file was modified bcxin-framework/src/main/java/com/bcxin/platform/framework/config/ShiroConfig.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/config/V5AccessControlFilter.java
Commit 4934e06cb96981a293dcea682e4ddde7d41a1b4f by zhongxuefeng
修改请求保险接口时替换https为http
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/blb/BlbTestServiceImpl.java
Commit 3aa19b7dd0e79f91ee9d6c5fd8d47694576f6877 by zhongxuefeng
修改保险查询语句
The file was modified bcxin-business/src/main/resources/mapper/platform/insurance/ComOnlineInsPerMapper.xml
Commit 1a54cbc4b5a141e71256485c1d50987d46843341 by justme070
打卡方式： 支持 多wifi 或者多地点打卡，Wi-Fi和地点 依旧二选一
APP 考勤套负责人要支持可修改为非本人
The file was modified bcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendController.java
Commit 588e8b55552611dd89f89e998fb58562e83acdd5 by justme070
打卡方式： 支持 多wifi 或者多地点打卡，Wi-Fi和地点依旧二选一
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendServiceImpl.java
Commit bf864c5de69598711641557603d9b8d8302c6162 by justme070
班次列表查询 增加查询条件
The file was modified bcxin-business/src/main/resources/mapper/platform/attend/AttendShiftMapper.xml
The file was modified bcxin-business/src/main/java/com/bcxin/platform/dto/attend/AttendShiftDto.java
Commit d73bca2060d0f97f3a58f45ee1ba1cd059a4cb2a by justme070
【APP考勤排班】- 根据ids获取人员列表 增加查询条件
The file was modified bcxin-business/src/main/resources/mapper/platform/company/PerBaseInfoMapper.xml
The file was modified bcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendPerController.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/company/PerBaseInfoService.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/mapper/company/PerBaseInfoMapper.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/company/impl/PerBaseInfoServiceImpl.java
Commit 5bdf60ac51d4031449035fe979a3e4e465123439 by justme070
【APP考勤排班】- 根据ids获取人员列表 增加查询条件
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/company/impl/PerBaseInfoServiceImpl.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/company/PerBaseInfoService.java
The file was modified bcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendPerController.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/dto/attend/AttendPerDto.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/mapper/company/PerBaseInfoMapper.java
Commit e8d3453d29d01f0ec76907fb48064e8d550d1ce7 by justme070
【APP考勤排班】- 根据ids获取人员列表 增加查询条件
The file was modified bcxin-business/src/main/resources/mapper/platform/company/PerBaseInfoMapper.xml
Commit 198cc4b0d5c58f36efb24321e705fdade422bcd5 by justme070
考勤人员id
The file was modified bcxin-business/src/main/java/com/bcxin/platform/dto/app/AppAttendPerDto.java
The file was modified bcxin-business/src/main/resources/mapper/platform/attend/AttendPerMapper.xml
Commit 09ac3eca91e891374bf903f2031c395d0c436739 by justme070
考勤排班 班次校验
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendSchedulServiceImpl.java
Commit 0e646f37d0c878c29f4dbf1e5f8726cd182c7bb8 by justme070
新增根据perIds删除驻勤人员
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendPerServiceImpl.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/mapper/attend/AttendPerMapper.java
The file was modified bcxin-web/src/main/java/com/bcxin/platform/web/controller/app/attend/AppAttendPerController.java
The file was modified bcxin-business/src/main/resources/mapper/platform/attend/AttendPerMapper.xml
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/AttendPerService.java
The file was modified bcxin-business/src/main/resources/mapper/platform/attend/AttendSchedulDetailMapper.xml
The file was modified bcxin-business/src/main/java/com/bcxin/platform/dto/app/AppAttendPerDto.java
Commit 891fe11cfcfbb4c1c6d8fbc740dee9652b12cfa0 by zhongxuefeng
增加线下保全人数
The file was modified bcxin-business/src/main/resources/mapper/platform/insurance/manage/ComInsManageMapper.xml
The file was modified bcxin-web/src/main/resources/templates/manage/insurance/insuranceList.html
Commit cf5e5b78436d5b2ddb86711e6861857a157e9c3a by justme070
考勤套详情增加 人员数量
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/attend/impl/AttendServiceImpl.java
The file was modified bcxin-business/src/main/resources/mapper/platform/attend/AttendPerMapper.xml
The file was modified bcxin-business/src/main/java/com/bcxin/platform/domain/attend/Attend.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/mapper/attend/AttendPerMapper.java
Commit 4c01790073592d29b7232cbda4b0a23abe7f2af4 by zhongxuefeng
修改在保人数查询
The file was modified bcxin-web/src/main/resources/templates/manage/insurance/insuranceList.html
The file was modified bcxin-business/src/main/resources/mapper/platform/insurance/manage/ComInsManageMapper.xml
Commit e8f15e8cd42954aed65ae108d1c08c4ec247a293 by baowenhua
判断版本
The file was modified bcxin-business/src/main/java/com/bcxin/platform/config/V5AccessControlFilter.java
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/oauth/OAuthServiceImpl.java
Commit 97ff9ff0768513fcf03ab6725b0401d69e6384ba by baowenhua
redis连接串
The file was modified bcxin-web/src/main/resources/profiles/dev/application-druid.yml
Commit b1c48f5e2d708690277ee65563ab6ce0a9e1e3ac by baowenhua
数据库连接串修改
The file was modified bcxin-business/src/main/java/com/bcxin/platform/config/V5AccessControlFilter.java
The file was modified bcxin-web/src/main/resources/profiles/dev/application-druid.yml
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/oauth/OAuthServiceImpl.java
Commit b9900dbcd7f42e7e02db3c1afd4813f114522421 by baowenhua
部门判空条件
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/company/impl/ComDepartServiceImpl.java
Commit 92c390e844421a41a0c6e46178607f9033f5ee72 by baowenhua
排查
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/company/impl/ComDepartServiceImpl.java
Commit 423057bb114409ed6b7179a252d5a9a79bc7d615 by baowenhua
更新版本
The file was modified bcxin-business/src/main/java/com/bcxin/platform/service/company/impl/ComDepartServiceImpl.java