chenwei
/
weaver-sskj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
56 Commits
4 Branches
0 Tags
1.9 MiB
dev
dev-chenwnj
dev-lh
dev-shilei
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '6cf48877fe'
${ noResults }
Commit Graph

56 Commits (6cf48877fe351c5693cbeaeb7b3a52f6669e6c94)
 

Author SHA1 Message Date
Administrator 6cf48877fe 历史代码提交 1 year ago
chenwei 37e4d8592b Merge remote-tracking branch 'origin/dev' into dev 1 year ago
chenwei 8fb7e4bbec 出差流程没有外勤打卡不计算考勤 1 year ago
Administrator 6c374db8e4 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
Administrator baed0d4ad5 连班加班action优化 1 year ago
chenwei b966a3b429 出差流程没有外勤打卡不计算考勤 1 year ago
chenwei add2b096db 出差流程没有外勤打卡不计算考勤 1 year ago
chenwei 137ea3ee8e Merge remote-tracking branch 'origin/dev-chenwnj' into dev-chenwnj 1 year ago
chenwei 21999092a9 出差流程没有外勤打卡不计算考勤 1 year ago
chenwei a74245754f 获取入职类型 1 year ago
chenwei 0f14f88473 获取入职类型 1 year ago
chenwei addf7c3bf7 出差流程没有外勤打卡不计算考勤 1 year ago
chenwei d38ea317e5 出差流程没有外勤打卡不计算考勤 1 year ago
chenwei bb8fb2ae0a Merge branch 'dev' into dev-chenwnj 1 year ago
chenwei 1332bedb67 出差流程没有外勤打卡不计算考勤 1 year ago
howec 0603f8ee15 日报月报 新增展示列，以及影响了导出功能。 1 year ago
chenwei d2343f9eba 合并 1 year ago
chenwei c43a5a985d Merge branch 'dev' into dev-chenwnj 1 year ago
howec bf1d6375ce 劳务转自招生效日 同步员工性质 1 year ago
chenwei 6271e9c86c 日志表 1 year ago
howec dac18c51c5 劳务转自招生效日期同步到通讯录的那个字段的时候，也要同步刷到入职日期上去 1 year ago
chenwei 3836779156 Merge branch 'dev' into dev-chenwnj 
# Conflicts:
#	src/com/engine/kq/cmd/report/GetKQReportCmd.java
 1 year ago
chenwei caa60529d6 转事假关联考勤部分 1 year ago
howec ccb43ae87e 日报，月报，大夜班天数，小夜班天数 1 year ago
Administrator 4d015e61e8 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
shilei 45b1676579 #SSKJ-3# 加班周末计算的接口 1 year ago
Administrator 89a775677d Merge remote-tracking branch 'origin/dev' into dev 1 year ago
shilei 9c24e3e1cf #SSKJ-2# 增加排班的公休的特殊情况 1 year ago
Administrator d9cc795f64 请假调休数据同步建模 
批量导入更新数据
 1 year ago
chenwei f52e8484df 后续加班扣减转事假 1 year ago
chenwei 1faf03be7c Merge branch 'dev-chenwnj' into dev 1 year ago
chenwei dfbe7e7d0c 后续加班扣减转事假 1 year ago
chenwei 8d0809c20c Merge branch 'dev-chenwnj' into dev 1 year ago
chenwei df237d031f 后续加班扣减转事假 1 year ago
howec 0dfe105276 劳务转自招申请-归档同步人员卡片自定义字段 1 year ago
howec f5baa91e86 定时，根据员工的部门 去更新自定义字段： 
第一部门，第二部门，第三部门，第四部门，第五部门，第六部门
 1 year ago
chenwei 77647842f3 Merge branch 'dev' into dev-chenwnj 1 year ago
chenwei fae6234b30 连班加班，补卡不允许补当天还没到班次结束时间点的卡，消除值夜班班次的连班行政岗班次的迟到 1 year ago
howec b6b2c37e1d Merge remote-tracking branch 'origin/dev' into dev 1 year ago
howec 690737d33f 推荐奖励--逻辑修复. 1 year ago
shilei 054dde7d0f #SSKJ-2# 增加排班的公休的特殊情况 1 year ago
chenwei 1ae17c8ea5 Merge branch 'dev' into dev-chenwnj 1 year ago
chenwei c23078df0f 连班加班，补卡不允许补当天还没到班次结束时间点的卡，消除值夜班班次的连班行政岗班次的迟到 1 year ago
howec dbf6315c40 盛世科技: 
三个定时源码.
需求:
1.建模台账的自动更新(定时,每日),按照人-年的维度,进行和各个请假类型的数量合计(小时)

2.内推奖励需要根据规则计算，定时写入奖励台账

3.讲师津贴需要根据规则计算，定时写入奖励台账
 1 year ago
howec 655f9c7217 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
chenwei 0d961a3d7c 批量连班加班 1 year ago
howec c8ab12b24d Merge branch 'dev' of http://221.226.25.34:3000/chenwei/weaver-sskj into dev 1 year ago
howec 26429f2575 Merge pull request '盛世科技:' (#1) from dev-lh into dev 
Reviewed-on: #1
 1 year ago
howec c1e961117b 盛世科技: 
1.夜班天数日报表、月报表字段添加 2.更新日报表、月报表夜班天数字段数据，（当天排班是 夜班，上班 1 和下班1都打卡 计为一天）
2.天数统计需要按照搜索条件进行更新.
3.日报表导出.
4.月报表导出.(导出并非是按照当月进行合计,是根据条件,本周,当天,本季度,上个月)  夜班统计sql用的是id(3,5,6)分别代表(两班夜班,值夜班(17:00-8:00),值夜班(8:00-8:00))
 1 year ago
howec 9bf8eecad0 盛世科技: 
1.夜班天数日报表、月报表字段添加 2.更新日报表、月报表夜班天数字段数据，（当天排班是 夜班，上班 1 和下班1都打卡 计为一天）
2.天数统计需要按照搜索条件进行更新.
3.日报表导出.
4.月报表导出.(导出并非是按照当月进行合计,是根据条件,本周,当天,本季度,上个月)  夜班统计sql用的是id(3,5,6)分别代表(两班夜班,值夜班(17:00-8:00),值夜班(8:00-8:00))
 1 year ago