 钱涛
|
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 |
|
钱涛
|
caf83c6386
|
fix
|
2022-04-07 14:19:06 +08:00 |
|
钱涛
|
90335032fd
|
调整原因
|
2022-04-07 11:39:22 +08:00 |
|
钱涛
|
0735bdf99b
|
记录表头
|
2022-04-07 09:50:30 +08:00 |
|
钱涛
|
9d223c7a06
|
核算基础类
|
2022-04-06 20:01:00 +08:00 |
|
钱涛
|
1c38214f6f
|
薪资档案表单
|
2022-04-02 16:57:27 +08:00 |
|
钱涛
|
3307c5c67e
|
薪资档案后续接口
|
2022-04-02 15:34:27 +08:00 |
|
钱涛
|
126444b9f3
|
薪资档案
|
2022-04-01 18:25:24 +08:00 |
|
钱涛
|
77229d18a0
|
列表
|
2022-04-01 14:13:04 +08:00 |
|
钱涛
|
f95d8a7d0d
|
暂存
|
2022-04-01 13:50:24 +08:00 |
|
钱涛
|
163963d463
|
fix bug
|
2022-03-31 18:41:41 +08:00 |
|
钱涛
|
a8732708a8
|
薪资档案导入
|
2022-03-31 15:41:55 +08:00 |
|
钱涛
|
4167cb55ee
|
限制薪资项目的删除
|
2022-03-30 20:27:17 +08:00 |
|
钱涛
|
922a055f97
|
统一sql
|
2022-03-30 18:00:56 +08:00 |
|
钱涛
|
d6ed96e891
|
sql修改
|
2022-03-30 15:58:29 +08:00 |
|
钱涛
|
a3604a28f0
|
校驗規則列表
|
2022-03-30 12:15:49 +08:00 |
|
钱涛
|
f8a704e66c
|
修改sql
|
2022-03-30 11:29:48 +08:00 |
|
钱涛
|
5c550365f1
|
薪资档案
|
2022-03-29 17:10:59 +08:00 |
|
钱涛
|
ba707878fc
|
薪资档案
|
2022-03-28 20:04:27 +08:00 |
|
钱涛
|
5ae4eb5fc8
|
项目id
|
2022-03-28 16:36:40 +08:00 |
|
钱涛
|
1db71a97ff
|
薪资账套
|
2022-03-25 18:05:07 +08:00 |
|
钱涛
|
83e1cf2805
|
相对更新
|
2022-03-24 16:59:52 +08:00 |
|
钱涛
|
79f9e010af
|
账套薪资项目
|
2022-03-23 20:54:08 +08:00 |
|
钱涛
|
b3d7123401
|
列表添加id
|
2022-03-23 18:41:38 +08:00 |
|
钱涛
|
e66445ce20
|
人员sql
|
2022-03-23 13:52:43 +08:00 |
|
钱涛
|
c01e63040c
|
薪资项目&账套
|
2022-03-22 21:01:38 +08:00 |
|
钱涛
|
0b3b971ecd
|
参数验证，运行期功能
|
2022-03-22 10:42:26 +08:00 |
|
钱涛
|
2f8b56e4ac
|
参数验证类
|
2022-03-21 20:09:10 +08:00 |
|
钱涛
|
f8d68fa7bc
|
分页
|
2022-03-21 09:33:21 +08:00 |
|
钱涛
|
5a7cc85e53
|
分页
|
2022-03-17 15:14:35 +08:00 |
|
钱涛
|
fb42a5f041
|
删除接口ids改为json入参
|
2022-03-01 18:49:22 +08:00 |
|
钱涛
|
8922047306
|
税率接口及相关基础类
|
2022-03-01 16:45:57 +08:00 |