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 |
|
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 |
|
钱涛
|
b1b086caf1
|
预览
|
2022-04-19 19:50:00 +08:00 |
|
钱涛
|
ccd4768a0e
|
线下对比导入
|
2022-04-19 19:34:57 +08:00 |
|
钱涛
|
72b52de3aa
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-19 19:32:34 +08:00 |
|
钱涛
|
dc008dad5c
|
核算导入
|
2022-04-19 19:32:09 +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 |
|
reset
|
6be53605d5
|
!23 福利台账导出及列表bug修
Merge pull request !23 from reset/archive
|
2022-04-19 09:45:08 +00:00 |
|
钱涛
|
c2cbdce9ec
|
补充列
|
2022-04-19 17:21:27 +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 |
|
钱涛
|
e16a533089
|
补充列
|
2022-04-19 13:42:16 +08:00 |
|
Chengliang
|
0feadcf0b2
|
1
|
2022-04-19 13:32:11 +08:00 |
|
钱涛
|
2afab36ee7
|
补充列
|
2022-04-19 13:30:41 +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 |
|
钱涛
|
982fffeb73
|
Merge branch 'feature/v1' into develop
|
2022-04-19 10:42:01 +08:00 |
|
钱涛
|
51e816ab56
|
补充列
|
2022-04-19 10:40:47 +08:00 |
|
钱涛
|
10e39169e3
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-18 21:36:24 +08:00 |
|
钱涛
|
fc806ebcc7
|
sql
|
2022-04-18 21:35:08 +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
|
545e8f5b7a
|
个税申报表相关信息SQL
|
2022-04-18 19:50:28 +08:00 |
|
钱涛
|
2cd32a5168
|
Merge branch 'feature/v1' into develop
|
2022-04-18 19:11:46 +08:00 |
|
钱涛
|
dcdb7ec4ac
|
sql
|
2022-04-18 19:11:32 +08:00 |
|
18895359881@163.com
|
6fce8cdf4c
|
薪酬接口
|
2022-04-18 18:56:17 +08:00 |
|
钱涛
|
bba5b7b5ca
|
sql
|
2022-04-18 18:29:58 +08:00 |
|
MustangDeng
|
3b3e9ee6fc
|
福利核算-batchList
|
2022-04-18 18:25:45 +08:00 |
|
钱涛
|
3bfdef7966
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-18 17:28:49 +08:00 |
|
钱涛
|
91da4ab831
|
自定义按钮
|
2022-04-18 17:28:34 +08:00 |
|
reset
|
11f0354d3a
|
!20 合并
Merge pull request !20 from reset/archive
|
2022-04-18 09:16:30 +00:00 |
|
钱涛
|
cc8f5d54f1
|
公式bug
|
2022-04-18 15:56:52 +08:00 |
|
钱涛
|
beb7061707
|
公式
|
2022-04-18 15:45:21 +08:00 |
|
钱涛
|
38a4c524f3
|
公式
|
2022-04-18 15:38:27 +08:00 |
|
钱涛
|
dcec31bf06
|
Merge branch 'feature/acctV2' into develop
|
2022-04-18 15:24:47 +08:00 |
|
钱涛
|
bbcb5916ce
|
公式更换jar
|
2022-04-18 14:45:12 +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 |
|
钱涛
|
7fbe29b36a
|
Merge branch 'feature/acctV2' into develop
|
2022-04-16 16:49:57 +08:00 |
|
钱涛
|
50d502632f
|
公式
|
2022-04-16 16:49:22 +08:00 |
|
Chengliang
|
2d98890c04
|
台账相关列表
|
2022-04-16 16:43:33 +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 |
|
钱涛
|
18025fd4b6
|
Merge branch 'feature/acctV2' into develop
|
2022-04-16 13:52:29 +08:00 |
|
钱涛
|
9971e9a760
|
jar
|
2022-04-16 13:51:53 +08:00 |
|
钱涛
|
f2b56fedeb
|
init
|
2022-04-16 13:51:24 +08:00 |
|
Chengliang
|
8ec04e8efc
|
福利
|
2022-04-16 13:20:52 +08:00 |
|
钱涛
|
94ab8bf4f1
|
init
|
2022-04-16 11:18:04 +08:00 |
|
reset
|
ed096261d3
|
!19 福利台账相关接口
Merge pull request !19 from reset/archive
|
2022-04-15 11:02:47 +00:00 |
|
Chengliang
|
9813012249
|
福利台账相关接口
|
2022-04-15 19:01:09 +08:00 |
|
钱涛
|
3d12b4bbd0
|
init
|
2022-04-15 17:13:01 +08:00 |
|
钱涛
|
fa5f8b7da0
|
Merge branch 'feature/acctV2' into develop
|
2022-04-15 13:55:16 +08:00 |
|
钱涛
|
7d440ce005
|
薪资项目分页
|
2022-04-15 13:54:47 +08:00 |
|
reset
|
5cb511bdc1
|
!18 社保档案详情-保存等接口
Merge pull request !18 from reset/archive
|
2022-04-15 05:18:56 +00:00 |
|
Chengliang
|
6ddf60a548
|
福利台账核算接口
|
2022-04-15 13:17:25 +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 |
|
reset
|
23388ef017
|
!17 台账保存核算
Merge pull request !17 from reset/archive
|
2022-04-14 03:56:10 +00:00 |
|
Chengliang
|
2eadc713e1
|
薪资台账保存核算
|
2022-04-14 11:54:16 +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 |
|
reset
|
ac86ad0d62
|
!16 台账
Merge pull request !16 from reset/archive
|
2022-04-12 11:31:07 +00:00 |
|
Chengliang
|
985456ed14
|
社保台账
|
2022-04-12 19:29:19 +08:00 |
|
钱涛
|
340fe4c38e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-12 19:25:29 +08:00 |
|
钱涛
|
692c2f5a79
|
核算
|
2022-04-12 19:25:19 +08:00 |
|
MustangDeng
|
897c98114f
|
工资单发放-工资单模板接口
|
2022-04-12 18:28:12 +08:00 |
|
reset
|
9b907a7a36
|
!15 福利台账
Merge pull request !15 from reset/archive
|
2022-04-12 02:25:50 +00:00 |
|
Chengliang
|
0dd6f4ae35
|
福利台账
|
2022-04-12 10:24:21 +08:00 |
|
MustangDeng
|
bd8305763e
|
工资单发放-编译
|
2022-04-12 10:11:53 +08:00 |