 钱涛
|
6986b39231
|
暂存
|
2022-05-30 14:17:02 +08:00 |
|
钱涛
|
7e09b283da
|
暂存
|
2022-05-30 13:33:22 +08:00 |
|
钱涛
|
841ca27c84
|
暂存
|
2022-05-27 17:21:39 +08:00 |
|
钱涛
|
71ea4b8609
|
导入
|
2022-05-27 15:43:38 +08:00 |
|
钱涛
|
c4c04ac87a
|
暂存
|
2022-05-27 14:46:01 +08:00 |
|
钱涛
|
c6ea4c5698
|
线下对比
|
2022-05-26 15:45:37 +08:00 |
|
钱涛
|
6103c9233e
|
批量操作数量限制
|
2022-05-26 13:41:58 +08:00 |
|
钱涛
|
f6eb69e62a
|
暂存
|
2022-05-26 11:02:55 +08:00 |
|
钱涛
|
586fad5f2c
|
分权累计专项附加扣除
|
2022-05-25 16:51:43 +08:00 |
|
钱涛
|
90a6bd9921
|
暂存
|
2022-05-25 13:49:25 +08:00 |
|
钱涛
|
f066d1ef64
|
fix档案分页
|
2022-05-25 13:13:03 +08:00 |
|
钱涛
|
e1b579d480
|
暂存
|
2022-05-25 13:10:03 +08:00 |
|
钱涛
|
895d258a44
|
分权基本控制开发完毕
|
2022-05-24 13:25:56 +08:00 |
|
钱涛
|
082d02ae67
|
Merge branch 'develop' into auth
|
2022-05-24 11:26:37 +08:00 |
|
钱涛
|
bccd246b2c
|
fix分页异常
|
2022-05-24 10:54:46 +08:00 |
MustangDeng
|
05f529769c
|
加解密
|
2022-05-24 09:23:17 +08:00 |
|
钱涛
|
cb1a53c649
|
暂存
|
2022-05-24 09:14:26 +08:00 |
|
钱涛
|
49cd388df1
|
暂存
|
2022-05-20 15:58:58 +08:00 |
|
钱涛
|
4f36f89e53
|
Merge branch 'develop' into auth
|
2022-05-20 14:56:25 +08:00 |
|
钱涛
|
2c03d4bc27
|
暂存
|
2022-05-19 16:36:18 +08:00 |
|
钱涛
|
ed0ba7ed6d
|
暂存
|
2022-05-19 14:50:01 +08:00 |
|
钱涛
|
bb66f80906
|
fix 新增系统薪资项目，模糊搜索
|
2022-05-18 16:07:51 +08:00 |
|
钱涛
|
fa4d605c8d
|
暂存
|
2022-05-18 09:19:50 +08:00 |
|
钱涛
|
282c0abc22
|
薪资项目不使用自增
|
2022-05-13 11:22:10 +08:00 |
|
钱涛
|
e49bc9943f
|
薪酬核算第一步不使用线程池
|
2022-05-12 15:41:12 +08:00 |
|
钱涛
|
6f3d8e85c0
|
个税申报bug
|
2022-05-09 17:47:19 +08:00 |
|
钱涛
|
2c432ab1c0
|
可删除
|
2022-05-09 16:39:04 +08:00 |
|
钱涛
|
c852211b0e
|
核算log
|
2022-05-07 15:20:39 +08:00 |
|
钱涛
|
0b523846d7
|
日期类型处理
|
2022-05-06 16:54:58 +08:00 |
|
钱涛
|
d2a564cb92
|
sql兼容性处理
|
2022-05-06 16:01:33 +08:00 |
|
钱涛
|
5a406d52f3
|
系统项目及公式初始化脚本
|
2022-05-06 10:23:23 +08:00 |
|
钱涛
|
231961663f
|
核算结果导出
|
2022-05-05 14:10:19 +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 |
|
钱涛
|
23da0fb5e4
|
sql公式
|
2022-04-28 15:02:11 +08:00 |
|
钱涛
|
5c2bb1bf58
|
入职日期改为String
|
2022-04-28 10:05:27 +08:00 |
|
钱涛
|
6ca41e8e59
|
字段分类
|
2022-04-27 18:29:38 +08:00 |
|
钱涛
|
151fa2b575
|
线下对比
|
2022-04-26 16:39:41 +08:00 |
|
钱涛
|
d521bf5bf7
|
账套周期
|
2022-04-26 14:44:42 +08:00 |
|
钱涛
|
6a024cb35b
|
权限构造
|
2022-04-25 18:06:09 +08:00 |
|
钱涛
|
daeb41f092
|
fix列
|
2022-04-25 16:31:33 +08:00 |
|
钱涛
|
12efa69503
|
同步考勤字段值
|
2022-04-25 15:51:35 +08:00 |
|
钱涛
|
446523a87a
|
fix
|
2022-04-25 10:25:38 +08:00 |
|
钱涛
|
3b342d4ec7
|
我的薪资福利
|
2022-04-22 19:22:40 +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 |
|
MustangDeng
|
ee9116ae2b
|
工资单列表问题处理
|
2022-04-22 11:02:15 +08:00 |
|
钱涛
|
36d65de007
|
fix
|
2022-04-21 14:15:56 +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 |
|
钱涛
|
d2ba2c3afe
|
公式参数
|
2022-04-20 11:31:55 +08:00 |
|
18895359881@163.com
|
4fd63c1999
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-19 20:59:33 +08:00 |
|
18895359881@163.com
|
bfdb9a33d5
|
个税申报表接口
|
2022-04-19 20:58:30 +08:00 |
|
钱涛
|
cb30e24e95
|
公式
|
2022-04-19 20:33:06 +08:00 |
|
reset
|
24a20e14d0
|
!24 福利台账导出及列表bug修
Merge pull request !24 from reset/archive
|
2022-04-19 09:47:11 +00:00 |
|
Chengliang
|
bef9b30a2e
|
福利台账导出及列表bug修复
|
2022-04-19 17:46:24 +08:00 |
|
钱涛
|
c4c757d055
|
Merge branch 'feature/v1' into develop
|
2022-04-19 15:13:23 +08:00 |
|
钱涛
|
c537b7d944
|
补充列
|
2022-04-19 15:13:08 +08:00 |
|
reset
|
37830fc89e
|
!22 增加datakey
Merge pull request !22 from reset/archive
|
2022-04-19 04:20:18 +00:00 |
|
Chengliang
|
9c02c9c9fd
|
列表增加datakey
|
2022-04-19 12:19:06 +08:00 |
|
reset
|
8ed7bbb3b6
|
!21 福利台账导出各接口
Merge pull request !21 from reset/archive
|
2022-04-18 12:26:02 +00:00 |
|
Chengliang
|
651df1842e
|
福利台账导出
|
2022-04-18 20:24:43 +08:00 |
|
18895359881@163.com
|
cd41ca92c7
|
Merge branch 'test_xxy' into develop
|
2022-04-18 19:53:52 +08:00 |
|
18895359881@163.com
|
6fce8cdf4c
|
薪酬接口
|
2022-04-18 18:56:17 +08:00 |
|
钱涛
|
91da4ab831
|
自定义按钮
|
2022-04-18 17:28:34 +08:00 |
|
MustangDeng
|
fee9a35b42
|
Merge branch 'feature/salaryBill' into develop
|
2022-04-18 09:20:00 +08:00 |
|
MustangDeng
|
86d3604c7e
|
工资单发放-问题处理
|
2022-04-18 09:19:07 +08:00 |
|
钱涛
|
50d502632f
|
公式
|
2022-04-16 16:49:22 +08:00 |
|
18895359881@163.com
|
a5b73098c9
|
Merge branch 'develop' into test_xxy
|
2022-04-16 16:14:56 +08:00 |
|
18895359881@163.com
|
3e64b1cfde
|
薪酬接口
|
2022-04-16 15:33:51 +08:00 |
|
钱涛
|
9971e9a760
|
jar
|
2022-04-16 13:51:53 +08:00 |
|
钱涛
|
7d440ce005
|
薪资项目分页
|
2022-04-15 13:54:47 +08:00 |
|
钱涛
|
941a34990f
|
Merge branch 'feature/acct' into develop
# Conflicts:
# src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java
# src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java
|
2022-04-14 20:49:24 +08:00 |
|
钱涛
|
4db39902b5
|
公式v2
|
2022-04-14 20:46:17 +08:00 |
|
MustangDeng
|
a739d746f7
|
工资单发放-测试
|
2022-04-14 19:32:09 +08:00 |
|
MustangDeng
|
775b39074d
|
工资单发放-工资单发放信息列表
|
2022-04-14 16:11:44 +08:00 |
|
钱涛
|
a4547db7ff
|
公式
|
2022-04-14 10:03:49 +08:00 |
|
MustangDeng
|
87ef976b7c
|
工资单发放-引包修改
|
2022-04-14 09:08:04 +08:00 |
|
钱涛
|
a2102a49b4
|
核算v3
|
2022-04-13 14:18:00 +08:00 |
|
MustangDeng
|
50c03b19e0
|
Merge branch 'develop' into feature/salaryBill
# Conflicts:
# src/com/engine/salary/annotation/SalaryFormulaVar.java
|
2022-04-13 11:09:41 +08:00 |
|
MustangDeng
|
e672961dc2
|
账套-薪资项目设置，人员基本信息下拉框数据修改
|
2022-04-13 11:03:27 +08:00 |
|
MustangDeng
|
b8ac967ed1
|
工资单发放-BeanUtil导包问题
|
2022-04-13 10:33:56 +08:00 |
|
钱涛
|
692c2f5a79
|
核算
|
2022-04-12 19:25:19 +08:00 |
|
MustangDeng
|
bd8305763e
|
工资单发放-编译
|
2022-04-12 10:11:53 +08:00 |
|
钱涛
|
a069447f02
|
核算基础公式
|
2022-04-11 20:17:47 +08:00 |
|
MustangDeng
|
1573abd1ee
|
Revert "工资单发放-todo"
This reverts commit b850f5ad
|
2022-04-11 14:30:30 +08:00 |
|
MustangDeng
|
31acdbb606
|
Merge branch 'feature/djp' into develop
|
2022-04-11 14:29:25 +08:00 |
|
MustangDeng
|
b850f5ad8d
|
工资单发放-todo
|
2022-04-11 14:28:45 +08:00 |
|
钱涛
|
0b72b2e6cb
|
核算v2
|
2022-04-08 19:08:59 +08:00 |
|
钱涛
|
23adb455fd
|
核算v1
|
2022-04-08 16:30:10 +08:00 |
|
钱涛
|
70f3239e98
|
查询条件
|
2022-04-07 20:05:58 +08:00 |
|
钱涛
|
0dedda4dbd
|
核算
|
2022-04-07 16:54:10 +08:00 |