 钱涛
|
2c432ab1c0
|
可删除
|
2022-05-09 16:39:04 +08:00 |
|
钱涛
|
fd856e0750
|
入职日期
|
2022-05-09 14:24:40 +08:00 |
|
钱涛
|
bf37add9dd
|
修复导出异常
|
2022-05-09 14:11:07 +08:00 |
MustangDeng
|
c287aca4a8
|
工资单撤回
|
2022-05-09 12:28:59 +08:00 |
|
MustangDeng
|
9dd71e5045
|
工资单撤回
|
2022-05-09 12:15:13 +08:00 |
|
钱涛
|
d2a37df97f
|
申报表异常
|
2022-05-09 11:46:49 +08:00 |
|
MustangDeng
|
22de36ce59
|
Merge branch '20220505' into develop
|
2022-05-09 11:19:35 +08:00 |
|
MustangDeng
|
2200d0c793
|
工资单撤回
|
2022-05-09 11:18:54 +08:00 |
|
钱涛
|
b0b18ecb5e
|
导出日志和申报表异常
|
2022-05-09 10:32:14 +08:00 |
|
钱涛
|
525fcc49a7
|
公式模拟运行
|
2022-05-08 12:34:05 +08:00 |
|
钱涛
|
c852211b0e
|
核算log
|
2022-05-07 15:20:39 +08:00 |
|
MustangDeng
|
10f76c102c
|
福利档案导入模板
|
2022-05-06 16:58:01 +08:00 |
|
钱涛
|
0b523846d7
|
日期类型处理
|
2022-05-06 16:54:58 +08:00 |
|
钱涛
|
d2a564cb92
|
sql兼容性处理
|
2022-05-06 16:01:33 +08:00 |
|
钱涛
|
ba67612e40
|
sql兼容性处理
|
2022-05-06 13:22:16 +08:00 |
|
钱涛
|
5a406d52f3
|
系统项目及公式初始化脚本
|
2022-05-06 10:23:23 +08:00 |
|
钱涛
|
0a2640b459
|
公式变量累计
|
2022-05-05 15:22:12 +08:00 |
|
钱涛
|
88b94b7aac
|
薪资项目列表优化
|
2022-05-05 15:02:12 +08:00 |
|
钱涛
|
231961663f
|
核算结果导出
|
2022-05-05 14:10:19 +08:00 |
|
钱涛
|
fafd206101
|
账套删除校验
|
2022-05-05 11:19:13 +08:00 |
|
钱涛
|
a530532a45
|
去除run方法
|
2022-05-05 10:35:58 +08:00 |
|
钱涛
|
f2f678c6d1
|
核算进度
|
2022-04-29 17:15:22 +08:00 |
|
钱涛
|
ad6ab6daff
|
核算3.0
|
2022-04-29 14:56:33 +08:00 |
|
钱涛
|
dff9657c3d
|
核算字段
|
2022-04-29 14:17:31 +08:00 |
|
钱涛
|
e445e654de
|
往期累计
|
2022-04-28 19:32:38 +08:00 |
|
钱涛
|
beb725fb8a
|
导入
|
2022-04-28 18:27:25 +08:00 |
|
钱涛
|
712e4edb0b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-28 17:44:36 +08:00 |
|
钱涛
|
b0ee96eb41
|
导入模板改为内存生成
|
2022-04-28 17:44:26 +08:00 |
|
MustangDeng
|
48429fdcf6
|
福利档案列表添加delete_type判断
|
2022-04-28 17:29:40 +08:00 |
|
钱涛
|
23da0fb5e4
|
sql公式
|
2022-04-28 15:02:11 +08:00 |
|
钱涛
|
5c2bb1bf58
|
入职日期改为String
|
2022-04-28 10:05:27 +08:00 |
|
钱涛
|
e74931aa54
|
人员字段默认删除
|
2022-04-27 18:48:41 +08:00 |
|
钱涛
|
6ca41e8e59
|
字段分类
|
2022-04-27 18:29:38 +08:00 |
|
钱涛
|
c899d370a9
|
默认员工字段不可删除
|
2022-04-27 17:20:33 +08:00 |
 reset
|
2d68d686ca
|
!33 提供字段描述给薪资账
Merge pull request !33 from reset/archive
|
2022-04-27 08:23:19 +00:00 |
|
Chengliang
|
fb4f1a13fb
|
提供字段描述给薪资账套
|
2022-04-27 16:21:24 +08:00 |
|
reset
|
5dc9b79633
|
!32 增加福利数据供账套使用
Merge pull request !32 from reset/archive
|
2022-04-27 06:37:51 +00:00 |
|
Chengliang
|
7e28c952cc
|
增加福利数据供账套使用
|
2022-04-27 14:36:05 +08:00 |
|
钱涛
|
01354b2be9
|
fix线下对比404
|
2022-04-27 13:33:44 +08:00 |
|
钱涛
|
8abfb7631e
|
fix线下对比404
|
2022-04-27 09:43:24 +08:00 |
|
钱涛
|
8b2f54afc2
|
线下对比公式详情
|
2022-04-26 16:42:22 +08:00 |
|
钱涛
|
151fa2b575
|
线下对比
|
2022-04-26 16:39:41 +08:00 |
|
钱涛
|
d521bf5bf7
|
账套周期
|
2022-04-26 14:44:42 +08:00 |
|
钱涛
|
741a81bd29
|
除去导入无效的代码
|
2022-04-26 13:36:16 +08:00 |
|
钱涛
|
ebc602b328
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-26 11:26:23 +08:00 |
|
钱涛
|
11241d0b6f
|
权限构造
|
2022-04-26 11:26:13 +08:00 |
|
reset
|
52ae98df10
|
!31 1
Merge pull request !31 from reset/archive
|
2022-04-26 02:07:14 +00:00 |
|
Chengliang
|
8a0e4744cd
|
分页
|
2022-04-26 10:06:09 +08:00 |
|
钱涛
|
6a024cb35b
|
权限构造
|
2022-04-25 18:06:09 +08:00 |
|
钱涛
|
daeb41f092
|
fix列
|
2022-04-25 16:31:33 +08:00 |
|
钱涛
|
e0c2fafede
|
考勤
|
2022-04-25 16:20:57 +08:00 |
|
钱涛
|
12efa69503
|
同步考勤字段值
|
2022-04-25 15:51:35 +08:00 |
|
钱涛
|
416ccd57a6
|
同步考勤字段值
|
2022-04-25 14:51:30 +08:00 |
|
钱涛
|
26dd841aa8
|
同步考勤字段
|
2022-04-25 13:57:33 +08:00 |
|
钱涛
|
446523a87a
|
fix
|
2022-04-25 10:25:38 +08:00 |
|
钱涛
|
2ec48b2be1
|
考勤账套列表
|
2022-04-25 10:14:43 +08:00 |
|
钱涛
|
11190ee37d
|
区时+8
|
2022-04-24 17:42:32 +08:00 |
|
钱涛
|
f7760bf833
|
公式去除id生成
|
2022-04-24 10:47:38 +08:00 |
|
钱涛
|
82230fba96
|
fix 比较
|
2022-04-24 09:29:39 +08:00 |
|
钱涛
|
ffd5bd20a8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-22 19:22:50 +08:00 |
|
钱涛
|
3b342d4ec7
|
我的薪资福利
|
2022-04-22 19:22:40 +08:00 |
|
Chengliang
|
cd2f61be29
|
修复分页
|
2022-04-22 18:50:03 +08:00 |
|
reset
|
de39d7e26b
|
!29 11
Merge pull request !29 from reset/archive
|
2022-04-22 10:06:52 +00:00 |
|
Chengliang
|
906f9a8a36
|
修改保存
|
2022-04-22 18:05:19 +08:00 |
|
钱涛
|
16a4f32ec1
|
sqlserver的批量插入bug
|
2022-04-22 18:00:35 +08:00 |
|
钱涛
|
3e9d02e78b
|
日期
|
2022-04-22 17:26:17 +08:00 |
|
reset
|
df5fa147e1
|
!28 修复xml报错
Merge pull request !28 from reset/archive
|
2022-04-22 08:43:04 +00:00 |
|
Chengliang
|
9dc29b2b3c
|
修复xml文件报错
|
2022-04-22 16:42:06 +08:00 |
|
钱涛
|
5347c70809
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-22 15:46:14 +08:00 |
|
钱涛
|
6b76829b39
|
考勤接口
|
2022-04-22 15:46:03 +08:00 |
|
reset
|
ef4ffacbcc
|
!27 修复方案列表
Merge pull request !27 from reset/archive
|
2022-04-22 07:19:56 +00:00 |
|
Chengliang
|
c2c7d2dee5
|
修复方案列表
|
2022-04-22 15:17:31 +08:00 |
|
钱涛
|
afb65fced8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-22 15:02:34 +08:00 |
|
钱涛
|
bb418ff6b6
|
title
|
2022-04-22 15:02:24 +08:00 |
|
MustangDeng
|
ee9116ae2b
|
工资单列表问题处理
|
2022-04-22 11:02:15 +08:00 |
|
钱涛
|
3c03d7144d
|
删除bug
|
2022-04-21 20:36:04 +08:00 |
|
钱涛
|
a20198fc4f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-21 20:29:25 +08:00 |
|
钱涛
|
cd8df85e54
|
公式字段
|
2022-04-21 20:29:11 +08:00 |
|
MustangDeng
|
c327aafd6c
|
Merge branch 'feature/salaryBill' into develop
|
2022-04-21 16:45:33 +08:00 |
|
MustangDeng
|
3003d0fadb
|
生成工资单
|
2022-04-21 16:45:03 +08:00 |
|
MustangDeng
|
2f2b48b172
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-21 15:45:58 +08:00 |
|
MustangDeng
|
a93949e8c5
|
Merge branch 'feature/salaryBill' into develop
# Conflicts:
# src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
|
2022-04-21 15:42:47 +08:00 |
|
reset
|
926b132d50
|
!26 导出
Merge pull request !26 from reset/archive
|
2022-04-21 07:05:43 +00:00 |
|
Chengliang
|
d0f12c2faf
|
6个列表页导出完成
|
2022-04-21 15:04:35 +08:00 |
|
MustangDeng
|
38179daee9
|
我的工资单
|
2022-04-21 14:46:45 +08:00 |
|
钱涛
|
36d65de007
|
fix
|
2022-04-21 14:15:56 +08:00 |
|
MustangDeng
|
d0425fc387
|
福利档案-批量保存
|
2022-04-21 14:08:18 +08:00 |
18895359881@163.com
|
21e4afcbbb
|
Merge branch 'test_xxy' into develop
|
2022-04-20 21:37:39 +08:00 |
|
18895359881@163.com
|
d15cccca8d
|
申报表生成
|
2022-04-20 21:36:27 +08:00 |
|
钱涛
|
a0957ecd7b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-20 19:23:25 +08:00 |
|
钱涛
|
343cc1ad26
|
档案导入
|
2022-04-20 19:23:16 +08:00 |
|
reset
|
5320e0b4f8
|
!25 福利台账
Merge pull request !25 from reset/archive
|
2022-04-20 11:14:23 +00:00 |
|
Chengliang
|
72e9e152d6
|
福利台账相关
|
2022-04-20 19:12:01 +08:00 |
|
18895359881@163.com
|
e66defc3a2
|
身份类型
|
2022-04-20 16:45:59 +08:00 |
|
18895359881@163.com
|
5b90c0524f
|
身份类型
|
2022-04-20 16:45:09 +08:00 |
|
18895359881@163.com
|
c5ac683981
|
Merge branch 'test_xxy' into develop
|
2022-04-20 16:03:41 +08:00 |
|
18895359881@163.com
|
ad3af977ab
|
申报表导出完善
|
2022-04-20 16:02:52 +08:00 |
|
钱涛
|
d2ba2c3afe
|
公式参数
|
2022-04-20 11:31:55 +08:00 |
|
钱涛
|
643160e714
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-20 11:17:34 +08:00 |
|
钱涛
|
7882048217
|
公式
|
2022-04-20 11:17:25 +08:00 |