Harryxzy
|
0e601e3967
|
修改DBType的写法
|
2023-06-19 13:59:24 +08:00 |
|
Harryxzy
|
d9f57ac258
|
修复回算后无法发放第二次核算的工资单
|
2023-06-16 16:41:49 +08:00 |
 钱涛
|
8612f0e5b2
|
Merge branch 'release/2.8.4.2306.02' into feature/短信验证码
|
2023-06-16 14:54:24 +08:00 |
|
Harryxzy
|
512510c623
|
考勤引用校验能够否删除
|
2023-06-16 11:49:23 +08:00 |
sy
|
c87a754888
|
薪酬系统，薪资账套、个税扣缴义务人、薪资项目列表按照创建时间降序排列
|
2023-06-15 10:23:03 +08:00 |
|
钱涛
|
57798a8e3e
|
短信验证码功能
|
2023-06-14 15:51:26 +08:00 |
|
Harryxzy
|
c37750b538
|
撤回个税申报
|
2023-06-12 10:40:01 +08:00 |
|
Harryxzy
|
76977331af
|
暂存
|
2023-06-09 17:57:17 +08:00 |
|
Harryxzy
|
d013d14e31
|
系统薪资项目列表显示改造- 数据库适配
|
2023-06-08 11:38:53 +08:00 |
|
Harryxzy
|
dbb2a97be4
|
系统薪资项目列表显示改造
|
2023-06-08 11:10:40 +08:00 |
|
Harryxzy
|
94edee7f8c
|
Merge branch 'feature/taxAgentSorted' into release/2.8.3.2306.01
|
2023-06-08 09:03:21 +08:00 |
|
sy
|
5a54b83b4a
|
Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01
|
2023-06-07 18:41:22 +08:00 |
|
sy
|
054d880afa
|
薪酬系统-福利档案，likecondition条件取消mysql指定
|
2023-06-07 18:40:55 +08:00 |
|
钱涛
|
77e9b0a74b
|
Merge branch 'release/2.8.3.2306.01' into feature/短信邮件
|
2023-06-07 15:12:40 +08:00 |
|
Harryxzy
|
9e794c988a
|
Merge branch 'fix/balanceImportBUG_0511' into release/2.8.3.2306.01
|
2023-06-07 14:36:27 +08:00 |
|
钱涛
|
4358dc20a5
|
Merge branch 'release/2.8.3.2306.01' into feature/短信邮件
|
2023-06-06 14:24:23 +08:00 |
|
Harryxzy
|
0d3a48e7ea
|
个税扣缴义务人排序
|
2023-06-05 15:14:25 +08:00 |
|
钱涛
|
91e3b335dd
|
工资单通道
|
2023-06-05 13:35:17 +08:00 |
|
Harryxzy
|
30e2c489ea
|
Merge branch 'feature/salalryItemAndFieldSort' into release/2.8.3.2306.01
|
2023-06-05 09:52:57 +08:00 |
|
Harryxzy
|
74c5b4f19f
|
薪资项目 和 字段管理的排序
|
2023-06-01 17:52:31 +08:00 |
|
sy
|
007328476a
|
薪酬系统-薪资核算，薪资核算列表工号查询逻辑优化
|
2023-06-01 11:17:06 +08:00 |
|
sy
|
fb03cf98a7
|
薪酬系统，福利台账、薪资档案、薪资核算增加工号查询
|
2023-05-31 11:49:40 +08:00 |
|
Harryxzy
|
601b90d188
|
薪资档案薪资项目排序
|
2023-05-31 09:55:24 +08:00 |
|
钱涛
|
ec90e31695
|
Merge branch 'release/2.8.3.2306.01' into feature/短信邮件
|
2023-05-24 16:20:39 +08:00 |
|
Harryxzy
|
a916e061d8
|
Merge branch 'fix/deleteBackCalcRecordBUG' into release/2.8.2.2305.02
|
2023-05-22 14:03:22 +08:00 |
|
Harryxzy
|
c7bdbe7b85
|
Merge branch 'feature/V3-salaryAcctResultLog' into release/2.8.2.2305.02
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
|
2023-05-22 14:03:07 +08:00 |
|
Harryxzy
|
a3ee91db15
|
回算后不允许删除薪资核算记录
|
2023-05-16 15:05:02 +08:00 |
|
Harryxzy
|
4ff15ca651
|
薪资核算结果编辑导入 记录
|
2023-05-15 10:28:17 +08:00 |
|
钱涛
|
2941b5f304
|
删除报表同时删除项目
|
2023-05-09 17:37:05 +08:00 |
|
钱涛
|
8228fbf21c
|
短信邮件
|
2023-05-08 09:27:20 +08:00 |
|
Harryxzy
|
b905390623
|
修复社保福利台账，根据核算创建人过滤
|
2023-05-06 09:50:48 +08:00 |
|
钱涛
|
ae719ad65b
|
修复人员过多时bug
|
2023-05-04 11:56:34 +08:00 |
|
钱涛
|
2d8b4b07d0
|
Merge branch 'release/2.7.4.2304.02' into feature/报表
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
|
2023-04-28 10:49:33 +08:00 |
|
钱涛
|
d36cfe31b3
|
报表暂存
|
2023-04-27 16:05:03 +08:00 |
|
钱涛
|
14fca43e18
|
暂存
|
2023-04-26 15:17:08 +08:00 |
|
钱涛
|
24dfa57850
|
报表
|
2023-04-24 14:09:27 +08:00 |
|
钱涛
|
c94d5169f0
|
维护工具
|
2023-04-24 09:19:18 +08:00 |
|
钱涛
|
598ff0cf9a
|
Merge remote-tracking branch 'origin/feature/维护工具' into feature/维护工具
|
2023-04-23 18:00:41 +08:00 |
|
钱涛
|
5c936a0334
|
补算
|
2023-04-23 18:00:30 +08:00 |
|
Harryxzy
|
31235096bb
|
恢复往期累计数据
|
2023-04-23 17:37:06 +08:00 |
|
钱涛
|
36863c3695
|
报表
|
2023-04-23 10:14:32 +08:00 |
|
钱涛
|
d2b304e690
|
全量数据
|
2023-04-20 18:04:18 +08:00 |
|
钱涛
|
135530d3b7
|
全量数据
|
2023-04-20 17:55:37 +08:00 |
|
钱涛
|
2d8b538897
|
Merge remote-tracking branch 'origin/fix/employeeServiceFormat_0412' into feature/报表
|
2023-04-13 14:54:22 +08:00 |
|
钱涛
|
9549e75e00
|
Merge branch 'release/2.7.3.2304.01' into feature/外部人员
|
2023-04-13 14:48:43 +08:00 |
|
钱涛
|
59a38954bc
|
Merge branch 'feature/个人养老金' into release/2.7.3.2304.01
# Conflicts:
# src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java
|
2023-04-13 09:35:29 +08:00 |
|
钱涛
|
1cbb889748
|
报表删除
|
2023-04-11 18:43:33 +08:00 |
|
钱涛
|
a4a829d201
|
年终奖数据
|
2023-04-11 17:24:31 +08:00 |
|
Harryxzy
|
e21b53c2df
|
Merge branch 'fix/deleteSalarySobAddCheck_0414' into release/2.7.3.2304.01
|
2023-04-11 14:00:26 +08:00 |
|
钱涛
|
e8ae952f18
|
Merge branch 'release/2.7.3.2304.01' into feature/外部人员
# Conflicts:
# src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
|
2023-04-11 11:41:30 +08:00 |
|
Harryxzy
|
0ef8a2ae12
|
Merge branch 'fix/salaryItemHideDuplicateItem_0407' into release/2.7.3.2304.01
|
2023-04-11 10:16:28 +08:00 |
|
钱涛
|
09b2bf54e1
|
暂存
|
2023-04-11 09:22:09 +08:00 |
|
钱涛
|
ce0b8ce186
|
暂存
|
2023-04-10 12:43:48 +08:00 |
|
钱涛
|
739904d48f
|
暂存
|
2023-04-10 09:47:33 +08:00 |
|
Harryxzy
|
d9f041c9bb
|
账套删除前校验是否存在工资单模板
|
2023-04-07 16:06:47 +08:00 |
|
Harryxzy
|
207d338ec2
|
薪资账套重复薪资项目
|
2023-04-07 15:14:07 +08:00 |
|
钱涛
|
b30a58c1d9
|
报表功能
|
2023-04-07 14:38:38 +08:00 |
|
sy
|
add7051759
|
薪酬系统, 适配金仓-个税申报单逻辑优化、薪资部分发放逻辑优化、删除initserviceimpl文件
|
2023-04-04 16:28:15 +08:00 |
|
钱涛
|
44fe9203ab
|
个人养老金
|
2023-04-04 14:21:25 +08:00 |
|
Harryxzy
|
5847f3f449
|
Merge branch 'fix/salaryTemplateUpdateBug_0407' into release/2.7.3.2304.01
|
2023-04-03 11:31:49 +08:00 |
|
Harryxzy
|
c97407c2ac
|
工资单模板修复
|
2023-04-03 11:31:09 +08:00 |
|
Harryxzy
|
dcfe6479ed
|
Merge branch 'feature/cancelSuspend' into release/2.7.3.2304.01
|
2023-04-03 11:12:20 +08:00 |
|
Harryxzy
|
30660ce04b
|
工资单模板，无法修改薪资项为0时不显示
|
2023-03-30 13:33:52 +08:00 |
|
Harryxzy
|
ef3260085f
|
修复重新核算，往期累计删多数据
|
2023-03-28 14:18:01 +08:00 |
|
Harryxzy
|
2dc40a7b91
|
取消待办
|
2023-03-28 10:10:54 +08:00 |
|
钱涛
|
f79569fe4f
|
解决工资单人名缺失
|
2023-03-16 17:19:02 +08:00 |
|
钱涛
|
8430397d03
|
外部人员终极版
|
2023-03-16 16:10:29 +08:00 |
|
钱涛
|
62d124efb1
|
外部人员终极版
|
2023-03-15 22:48:01 +08:00 |
|
钱涛
|
ace15ca7a1
|
非系统人员
|
2023-03-15 18:03:46 +08:00 |
|
钱涛
|
c9f6b62b5a
|
Merge branch 'release/2.7.1.2303.02' into feature/外部人员
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java
|
2023-03-15 10:15:49 +08:00 |
|
钱涛
|
5b88cda35c
|
账套外部人员接入
|
2023-03-15 09:13:29 +08:00 |
|
钱涛
|
5f465aa914
|
外部人员范围列表和删除接口
|
2023-03-14 15:22:50 +08:00 |
|
钱涛
|
767fbe36f5
|
外部人员
|
2023-03-14 10:52:48 +08:00 |
|
Harryxzy
|
0c409c627c
|
employeeService查询外部 fixBug
|
2023-03-13 16:16:05 +08:00 |
|
Harryxzy
|
362f5abdf6
|
Merge remote-tracking branch 'origin/feature/外部人员' into feature/外部人员
|
2023-03-13 16:12:51 +08:00 |
|
Harryxzy
|
d5a97c8192
|
employeeService查询外部 fixBug
|
2023-03-13 16:12:10 +08:00 |
|
钱涛
|
a61b7ac7bc
|
外部人员
|
2023-03-13 16:04:19 +08:00 |
|
Harryxzy
|
32b1a2db48
|
employeeService查询外部
|
2023-03-13 15:53:56 +08:00 |
|
Harryxzy
|
7de5c1e175
|
Merge branch 'fix/V3_listShowChange_0309' into release/2.7.1.2303.02
|
2023-03-10 15:42:42 +08:00 |
|
钱涛
|
487dd9f972
|
非系统人员档案自动化
|
2023-03-08 16:36:47 +08:00 |
|
钱涛
|
2c13c138a6
|
校验每次只能申报一个扣缴义务人
|
2023-03-07 17:44:21 +08:00 |
|
钱涛
|
a423790a35
|
获取人员信息
|
2023-03-06 17:57:20 +08:00 |
|
钱涛
|
a5596d503f
|
外部人员基础信息
|
2023-03-03 16:57:52 +08:00 |
|
钱涛
|
ca20ed8ca2
|
Merge branch 'release/2.6.3.2303.01' into feature/外部人员
|
2023-03-02 19:48:40 +08:00 |
|
Harryxzy
|
3f0160ebe5
|
Merge remote-tracking branch 'origin/release/2.6.3.2303.01' into release/2.6.3.2303.01
|
2023-03-02 17:19:44 +08:00 |
|
Harryxzy
|
83d5a882b9
|
Merge branch 'fix/V3_addUpSituationShowAsMonth_0309' into release/2.6.3.2303.01
|
2023-03-02 17:18:39 +08:00 |
|
钱涛
|
6de22b142d
|
1、工资单模板
2、一键累计
|
2023-03-02 17:11:42 +08:00 |
|
Harryxzy
|
50d6cc4d9a
|
往期累计情况，按照税款所属期月份进行展示
|
2023-03-02 14:04:12 +08:00 |
|
Harryxzy
|
56399c127b
|
社保福利方案自定义福利列表改造
|
2023-03-02 10:46:53 +08:00 |
|
钱涛
|
14bee7f6d5
|
修复未分类无法保存
|
2023-03-01 09:58:55 +08:00 |
|
钱涛
|
1568b1e03d
|
外部人员基础类
|
2023-03-01 09:05:03 +08:00 |
|
钱涛
|
a8cb586358
|
公式删除校验
|
2023-02-23 15:48:18 +08:00 |
|
钱涛
|
1c2028f551
|
公式删除优化
|
2023-02-23 14:52:24 +08:00 |
|
sy
|
1a5afd6c6d
|
Merge branch 'feature/v4-siFunctionImprove2-0228' into release/2.6.2.2302.02
|
2023-02-22 14:10:46 +08:00 |
|
钱涛
|
dc24b03efd
|
薪资项目删除校验
|
2023-02-17 15:58:33 +08:00 |
|
钱涛
|
1d0a02554e
|
公式
|
2023-02-16 14:53:03 +08:00 |
|
sy
|
39cb3b0df1
|
薪酬系统-福利档案，方案明细中添加福利项上下限数据
|
2023-02-16 13:14:17 +08:00 |
|
钱涛
|
1bdc304ddf
|
清除公式
|
2023-02-16 09:16:00 +08:00 |
|
钱涛
|
8b594c1882
|
自发起调薪流程
|
2023-02-13 14:53:35 +08:00 |
|
钱涛
|
6792b4c5aa
|
Merge branch 'feature/通过userid查询工资单详情'
|
2023-02-10 16:45:45 +08:00 |
|
钱涛
|
d1b4ae4a0b
|
过滤
|
2023-02-10 16:38:43 +08:00 |
|
Harryxzy
|
3b657db52a
|
线下对比Oracle导入报错
|
2023-02-10 09:59:18 +08:00 |
|
钱涛
|
8d011d8d49
|
Merge branch 'feature/账套群组不变' into release/2.6.1.2301.02
|
2023-02-09 17:32:00 +08:00 |
|
钱涛
|
5feed81803
|
Merge branch 'feature/通过userid查询工资单详情' into release/2.6.1.2301.02
|
2023-02-09 17:31:34 +08:00 |
|
sy
|
ba267d9dce
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siSchemeAddPaymentCycle-0202' into release/2.6.1.2301.02
|
2023-02-09 17:24:29 +08:00 |
fcli
|
308a44a9a6
|
Merge remote-tracking branch 'origin/feature/SalaryItemAuth&FieldManage' into release/2.6.1.2301.02
|
2023-02-09 17:23:07 +08:00 |
|
钱涛
|
b6429eb41c
|
通过id查询工资单详情
|
2023-02-09 17:05:07 +08:00 |
|
钱涛
|
2c37086e70
|
账套群组保持不变
|
2023-02-09 15:33:35 +08:00 |
|
sy
|
6abc2068ea
|
薪酬系统-福利方案，福利方案新增、编辑、查看方法改进，福利核算加入福利方案中的缴纳周期因素
|
2023-01-31 17:40:34 +08:00 |
|
sy
|
ae6822dc91
|
薪酬系统-福利方案，福利方案对象的相关数据载体（po,dto）增加缴纳周期相关新字段，并对sql中的查询字段进行添加
|
2023-01-30 17:29:07 +08:00 |
|
Harryxzy
|
dc3bd34e0f
|
薪资回算sendStatus值update漏写
|
2023-01-14 13:59:13 +08:00 |
|
fcli
|
24e0e180be
|
feat: 薪资项目分权，修改查询
|
2023-01-12 14:20:09 +08:00 |
|
fcli
|
5aff04c834
|
feat: 薪资项目分权oracle异常问题
|
2023-01-12 14:19:54 +08:00 |
|
fcli
|
3ec5c34589
|
feat: 薪资项目分权oracle异常问题
|
2023-01-12 14:19:50 +08:00 |
|
fcli
|
f1bdd0ada9
|
feat: 薪资项目分权，修改落库
|
2023-01-12 14:19:46 +08:00 |
|
fcli
|
4bcd355254
|
feat: 薪资项目分权，修改查询
|
2023-01-12 14:19:43 +08:00 |
|
fcli
|
90b2edb96c
|
feat: 薪资项目分权代码合并
|
2023-01-12 14:19:39 +08:00 |
|
sy
|
b33771d9e4
|
薪酬系统-福利档案，列表数据展示添加入职日期、离职日期字段
|
2023-01-09 14:49:58 +08:00 |
|
sy
|
f1a123dfa4
|
Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siRepairCreate-1229
|
2023-01-05 16:12:47 +08:00 |
|
sy
|
f53d788583
|
薪酬系统-福利档案，高级搜索功能支持根据个税扣缴义务人检索
|
2023-01-03 17:58:14 +08:00 |
|
sy
|
494462092d
|
薪酬系统-福利台账，补缴方式选择指定月的缴纳基数获取功能
|
2022-12-27 17:34:46 +08:00 |
|
Harryxzy
|
6262f62292
|
薪资回算Excel导入BUG
|
2022-12-26 23:17:32 +08:00 |
|
sy
|
d2be8e86ea
|
Merge branch 'feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03
|
2022-12-22 09:09:00 +08:00 |
|
sy
|
28d1d16844
|
薪酬系统-福利台账，补差数据参与薪资核算
|
2022-12-21 11:12:14 +08:00 |
|
Harryxzy
|
ddea8c9066
|
回算工资单发放调整
|
2022-12-19 11:12:26 +08:00 |
|
Harryxzy
|
4fa7f9a5e7
|
回算-加解密开关
|
2022-12-14 14:45:24 +08:00 |
|
Harryxzy
|
0130b83f00
|
Merge branch 'feature/加密方法&分页merge' into feature/V3-backItem-1215
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2022-12-14 12:21:42 +08:00 |
|
sy
|
32cffdccf5
|
薪酬系统-福利档案，批量减员逻辑变更，自动减员逻辑变更，无福利方案时，不关注最终缴纳月
|
2022-12-12 17:53:05 +08:00 |
|
sy
|
1b376464c4
|
薪酬系统-福利档案，删除待办功能（待减员页面）
|
2022-12-12 15:43:12 +08:00 |
|
sy
|
ae72d25431
|
Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siAccountBalance-1208
|
2022-12-12 13:43:16 +08:00 |
|
fcli
|
8e2e85a986
|
Merge remote-tracking branch 'origin/release/2.3.2.2212.01' into release/2.3.2.2212.01
|
2022-12-08 16:43:06 +08:00 |
|
fcli
|
cc105ca051
|
Merge branch 'feat/SalarySendRange' into release/2.3.2.2212.01
|
2022-12-08 16:41:04 +08:00 |
|
sy
|
0399731b9b
|
Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountCompensation-1201' into release/2.3.2.2212.01
|
2022-12-08 16:25:28 +08:00 |
|
Harryxzy
|
8e573f8bd7
|
补发工资单详情查看
|
2022-12-08 15:25:16 +08:00 |
|
sy
|
c94e28e68c
|
薪酬系统-福利台账，核算功能相关临时表数据删除逻辑优化
|
2022-12-08 10:10:48 +08:00 |
|
Harryxzy
|
aed596523f
|
公司单发放详情报错
|
2022-12-07 18:00:31 +08:00 |
|
sy
|
f31e176cab
|
薪酬系统-福利台账，billBatch统计数据刷新方法优化（不需要统计补差数据中的人数信息）
|
2022-12-07 17:50:25 +08:00 |
|
sy
|
ccfffc200e
|
薪酬系统-福利台账，补差数据导入功能
|
2022-12-07 17:09:53 +08:00 |
|
Harryxzy
|
19022fc505
|
fix 编辑工资单模板，补发显示部分
|
2022-12-07 10:34:41 +08:00 |
|
Harryxzy
|
5078fa9b87
|
fix 工资单发放报错
|
2022-12-06 15:59:38 +08:00 |
|
Harryxzy
|
c0d916c286
|
薪资回算功能，工资单部分
|
2022-12-06 15:29:08 +08:00 |
|
fcli
|
2877d58a1f
|
feat: sqlserver bug修复
|
2022-12-05 17:51:28 +08:00 |
|
fcli
|
acab57aa36
|
feat: 撤回范围修复
|
2022-12-05 16:05:38 +08:00 |
|
sy
|
014190f6d0
|
薪酬系统-福利台账，补缴列表查询优化，增加缴纳状态筛选
|
2022-12-05 10:09:43 +08:00 |
|
fcli
|
4fa64c6a8f
|
feat: mapper异常修复
|
2022-12-05 09:52:05 +08:00 |
|
Harryxzy
|
3ff3fd8e44
|
薪资回算-薪资核算部分（剩余核算归档）
|
2022-12-02 17:35:14 +08:00 |
|
fcli
|
c7b3341a13
|
feat: 查询异常问题修改
|
2022-12-01 17:41:10 +08:00 |
|
钱涛
|
013f67469e
|
显示定制列的入职日期和离职日期
|
2022-12-01 14:33:21 +08:00 |
|
sy
|
e462992206
|
薪酬系统-福利台账，社保调差撤回功能优化
|
2022-12-01 11:50:37 +08:00 |
|
sy
|
119640e272
|
薪酬系统-福利台账，在福利台账重新核算时，删除调差数据时增加人员id筛选
|
2022-12-01 10:50:34 +08:00 |
|
sy
|
5436742c74
|
薪酬系统-福利台账，社保调差列表查询功能优化
|
2022-11-30 17:57:25 +08:00 |
|
sy
|
d3d2074aed
|
薪酬系统-福利台账，在社保核算月数据删除时，社保调差数据被删除
|
2022-11-30 15:55:23 +08:00 |
|
sy
|
ee7309ffd1
|
薪酬系统-福利台账，社保调差项公司支出费用统计功能优化，对于已存在调差项，给出提示，并且不进行计算
|
2022-11-30 14:07:28 +08:00 |
|
sy
|
2ceeeb165f
|
薪酬系统-福利台账，社保调差列表v1
|
2022-11-29 15:33:57 +08:00 |
|
sy
|
5486d3f849
|
薪酬系统-福利台账，社保调差字段类型调整
|
2022-11-28 16:25:52 +08:00 |
|
sy
|
d9c7a6c0e3
|
薪酬系统-福利台账，社保调差撤回v2
|
2022-11-28 15:50:52 +08:00 |
|
sy
|
8bc16ae470
|
Merge branch 'master' into feature/v3-siAccountCompensation-1201
|
2022-11-28 14:58:23 +08:00 |
|
sy
|
1747a613dd
|
薪酬系统-福利台账，社保调差撤回v1
|
2022-11-28 14:57:29 +08:00 |
|
sy
|
49466f9f3b
|
薪酬系统-福利台账，社保调差默认配置保存v1
|
2022-11-28 13:42:53 +08:00 |
|
sy
|
8d211c7db0
|
薪酬系统-福利台账，社保调差保存v1
|
2022-11-28 11:35:05 +08:00 |
|
Harryxzy
|
85fef5c5f8
|
Merge branch 'master' into feature/V3-backItem-1215
|
2022-11-28 09:26:59 +08:00 |
|
钱涛
|
0b2c01fb4c
|
人员信息获取
|
2022-11-25 15:54:31 +08:00 |
|
sy
|
75a7497a07
|
Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountRecession-1117' into release/2.3.1.2211.04
# Conflicts:
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
|
2022-11-25 13:55:29 +08:00 |
|
sy
|
58c7374a64
|
薪酬系统-福利台账，退差数据导出，添加个税扣缴义务人筛选
|
2022-11-25 11:14:11 +08:00 |
|
fcli
|
fc81955b15
|
feat: 全部范围部分发放撤回功能
|
2022-11-25 10:53:23 +08:00 |
|
sy
|
e736cee6fd
|
Merge branch 'feature/v2-addWelfareArchives-1117' into feature/v3-siAccountRecession-1117
# Conflicts:
# src/com/engine/salary/service/SIAccountService.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
|
2022-11-24 09:39:13 +08:00 |
|
钱涛
|
264edf1bf2
|
同步人员范围
|
2022-11-22 15:37:07 +08:00 |
|
Harryxzy
|
a53fa14a3d
|
Merge branch 'master' into feature/V3-backItem-MMdd
|
2022-11-22 14:37:15 +08:00 |
|
Harryxzy
|
036d2d540b
|
薪资回算-薪资账套部分
|
2022-11-22 14:36:59 +08:00 |
|
sy
|
2b29813f6b
|
薪酬系统-福利台账，退差数据导出
|
2022-11-22 13:35:09 +08:00 |
|
sy
|
d7a4b30185
|
薪酬系统-福利台账，退差数据不参与薪资核算
|
2022-11-22 10:26:34 +08:00 |
|
sy
|
7c299e6199
|
薪酬系统-福利台账，退差数据新增v4
|
2022-11-22 09:46:37 +08:00 |
|
sy
|
15477cc8d5
|
薪酬系统-福利台账，退差数据新增v3
|
2022-11-21 17:52:28 +08:00 |
|
sy
|
96a440a9a7
|
薪酬系统-福利台账，退差数据新增时的可选择人员列表v1
|
2022-11-21 15:27:15 +08:00 |
|
sy
|
9c897c87dd
|
Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siAccountRecession-1117
|
2022-11-21 09:54:44 +08:00 |
|
sy
|
e2a4a7157b
|
Merge remote-tracking branch 'remotes/origin/master' into feature/v2-addWelfareArchives-1117
|
2022-11-21 09:48:46 +08:00 |
|
sy
|
df76d24a39
|
薪酬系统-福利台账，退差数据编辑v1
|
2022-11-18 17:56:21 +08:00 |
|
sy
|
746ab58ed3
|
薪酬系统-福利台账，退差数据单条查看v2
|
2022-11-18 16:07:20 +08:00 |
|
Harryxzy
|
a5ae8c8ea6
|
回算薪资项（薪资账套部分），剩余处理历史数据
|
2022-11-18 14:20:18 +08:00 |
|
fcli
|
0aabfcd68a
|
feat: 薪资范围需求
|
2022-11-17 14:25:10 +08:00 |
|
sy
|
57300125cd
|
薪酬系统-福利台账，正常缴纳/补缴导入时候，刷新台账统计
|
2022-11-17 13:39:50 +08:00 |
|
fcli
|
e8347b88cc
|
feat: 薪资范围问题
|
2022-11-17 11:11:58 +08:00 |
|
钱涛
|
271daf29be
|
批量锁定功能
|
2022-11-17 09:28:40 +08:00 |
|
sy
|
7be9424f73
|
薪酬系统-福利台账，退差数据列表功能v2
|
2022-11-16 15:45:36 +08:00 |
|
Harryxzy
|
94f3c9720a
|
回算功能-fix mybatis报错
|
2022-11-16 14:13:50 +08:00 |
|
Harryxzy
|
00357cd9d8
|
回算功能-新建薪资账套默认
|
2022-11-16 10:32:05 +08:00 |
|
sy
|
b647089eaf
|
薪酬系统-福利台账，退差数据新增功能v1
|
2022-11-15 17:58:37 +08:00 |
|
fcli
|
daa3d4ca9f
|
feat: 薪资发放范围
|
2022-11-15 09:19:57 +08:00 |
|
Harryxzy
|
15749ecc10
|
Merge branch 'feature/V2-taxDeclarationSwitch-11-10' into release/2.1.3.2211.03
# Conflicts:
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
|
2022-11-10 11:25:01 +08:00 |
|
Harryxzy
|
c786dc2d14
|
个税申报功能-重启时间和薪资核算创建时间比较
|
2022-11-10 11:11:41 +08:00 |
|
Harryxzy
|
3d4be3265e
|
个税申报功能-重启
|
2022-11-10 09:46:30 +08:00 |
|
fcli
|
815e37e50b
|
fix: 一键累计添加日期与校验
|
2022-11-09 16:55:00 +08:00 |
|
fcli
|
07f9976d63
|
fix: 加解密处理
|
2022-11-09 14:32:04 +08:00 |
|
fcli
|
0b26eeec7e
|
fix: 加解密处理
|
2022-11-09 14:32:00 +08:00 |
|
fcli
|
e3b7f7c732
|
fix: sql优化
|
2022-11-09 10:41:06 +08:00 |
|
fcli
|
dd5c2ba4ce
|
fix: 管理员可以编辑该扣缴义务人数据，其他人可以编辑本人数据&一键累计所有个税扣缴义务人下的人员
|
2022-11-09 10:41:00 +08:00 |
|
fcli
|
07a07d2be8
|
feat: 专项附加扣除模块, 权限限制，导入导出优化，添加一键累计
|
2022-11-09 10:40:48 +08:00 |
|
fcli
|
9b77bf7139
|
feat: 专项附加扣除模块, 一键清空、分页bug等
|
2022-11-09 10:40:38 +08:00 |
|
fcli
|
92a6512dc8
|
feat: 专项附加扣除模块,去除月份，添加普通用户登录查看本人记录功能
|
2022-11-09 10:40:28 +08:00 |
|
fcli
|
fafc157e63
|
feat: 专项附加扣除模块
|
2022-11-09 10:40:19 +08:00 |