Harryxzy
|
b63e4250be
|
艾志--薪资档案-往期累计档案页面调整
|
2023-10-09 14:05:39 +08:00 |
sy
|
5720db4517
|
Merge branch 'feature/231001-福利档案详情列表接口' into custom/艾志工业-个税申报
# Conflicts:
# src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
|
2023-09-27 15:39:53 +08:00 |
|
sy
|
7f841ea86b
|
薪酬系统-福利档案，档案明细信息接口（社保、公积金、其他福利），增加返回个税扣缴义务人名称
|
2023-09-27 15:37:13 +08:00 |
|
sy
|
1409045b68
|
薪酬系统-福利档案，艾志二开-薪资档案全量发薪、全量停薪、取消停薪、删除档案、删除待办等功能改造，适配登录人可查阅部门相关人员档案逻辑
|
2023-09-27 15:03:24 +08:00 |
|
sy
|
a753a0fb0a
|
薪酬系统-福利档案，艾志二开-薪资档案列表、导入、导出相关功能改造，适配登录人可查阅部门相关人员档案逻辑
|
2023-09-27 11:19:29 +08:00 |
|
sy
|
98e732e210
|
薪酬系统-福利档案，艾志二开-福利档案全量增员、全量减员、取消停缴、删除档案改造
|
2023-09-26 16:08:43 +08:00 |
|
sy
|
0d81e815e5
|
Merge remote-tracking branch 'origin/custom/艾志工业-个税申报' into custom/艾志工业-个税申报
|
2023-09-26 12:59:05 +08:00 |
|
Harryxzy
|
f90aef0bc8
|
Merge branch 'feature/231001-福利档案详情列表接口' into custom/艾志工业-个税申报
|
2023-09-26 11:42:46 +08:00 |
|
sy
|
36e5b153cc
|
薪酬系统-福利档案，档案明细信息接口（社保、公积金、其他福利），接口类型调整为get
|
2023-09-26 11:40:34 +08:00 |
|
sy
|
b9ef568c05
|
薪酬系统-福利档案，艾志二开-福利档案导入模板下载、导出、导入功能改造，页面权限增加部门查看权限
|
2023-09-26 11:27:34 +08:00 |
|
sy
|
d8550d3040
|
Merge remote-tracking branch 'origin/custom/艾志工业-个税申报' into custom/艾志工业-个税申报
|
2023-09-25 15:47:43 +08:00 |
|
Harryxzy
|
2e4d9034cf
|
Merge branch 'feature/231001-福利档案详情列表接口' into custom/艾志工业-个税申报
|
2023-09-25 15:42:41 +08:00 |
|
sy
|
f7b30cfbf6
|
薪酬系统-福利档案，档案明细信息接口（社保、公积金、其他福利）
|
2023-09-25 15:38:15 +08:00 |
|
sy
|
2d14dbcda3
|
Merge remote-tracking branch 'origin/custom/艾志工业-个税申报' into custom/艾志工业-个税申报
|
2023-09-25 10:37:15 +08:00 |
|
sy
|
6d74b0cec4
|
薪酬系统-福利档案，艾志二开-福利档案tab页签统计数量功能改动，增加可查阅部门人员档案数统计
|
2023-09-25 10:18:38 +08:00 |
 钱涛
|
89d38005cd
|
Merge branch 'release/2.9.5.2309.01' into custom/艾志工业-个税申报
# Conflicts:
# resource/WEB-INF/prop/hrmSalaryCustom.properties
|
2023-09-22 17:59:27 +08:00 |
|
钱涛
|
7c5af2166e
|
日期格式自定义配置
|
2023-09-22 17:57:47 +08:00 |
|
sy
|
f944fd13d1
|
薪酬系统-福利档案，艾志二开-登录人拥有查看权限的部门下人员的档案列表展示，开发中20230922
|
2023-09-22 16:41:11 +08:00 |
|
钱涛
|
0656ea612d
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
# Conflicts:
# src/com/engine/salary/service/impl/SISchemeServiceImpl.java
|
2023-09-22 11:51:12 +08:00 |
|
钱涛
|
a5d019799c
|
账套复制
|
2023-09-22 11:47:51 +08:00 |
|
钱涛
|
0545c6eb8c
|
Merge branch 'release/2.9.5.2309.01' into release/个税版本
|
2023-09-21 16:58:15 +08:00 |
|
Harryxzy
|
bf8ae9fd09
|
Merge branch 'fix/230902-导出报表为数值类型' into release/2.9.5.2309.01
|
2023-09-21 16:03:38 +08:00 |
|
Harryxzy
|
bc7d7b3326
|
Merge branch 'feature/230902_报表共享' into release/2.9.5.2309.01
|
2023-09-21 15:06:04 +08:00 |
|
Harryxzy
|
7a57849a25
|
报表fixbug
|
2023-09-21 15:05:39 +08:00 |
|
sy
|
f4883ad87c
|
Merge remote-tracking branch 'remotes/origin/feature/230901-社保福利方案搜索功能' into release/2.9.5.2309.01
|
2023-09-21 14:10:06 +08:00 |
|
sy
|
5f84ed451b
|
Merge remote-tracking branch 'remotes/origin/feature/230901-福利台账-调差，支持一个人存在多个调差记录' into release/2.9.5.2309.01
|
2023-09-21 14:09:54 +08:00 |
|
Harryxzy
|
efa818f8b9
|
核算结果导出数值项excel格式为数值
|
2023-09-21 13:36:23 +08:00 |
|
Harryxzy
|
cdefb1d310
|
Merge branch 'feature/230902_报表共享' into release/2.9.5.2309.01
|
2023-09-21 11:45:34 +08:00 |
|
Harryxzy
|
443368bdb3
|
Merge branch 'fix/230902-账套中从公式改为输入，核算公式展示错误' into release/2.9.5.2309.01
|
2023-09-21 11:44:23 +08:00 |
|
Harryxzy
|
ad6587b9b2
|
Merge branch 'fix/230902-能够重复反馈' into release/2.9.5.2309.01
|
2023-09-21 11:44:12 +08:00 |
|
钱涛
|
c86151225d
|
流程获取档案信息v2
|
2023-09-21 11:43:41 +08:00 |
|
Harryxzy
|
9e95e3402b
|
删除多余注释
|
2023-09-21 11:02:48 +08:00 |
|
钱涛
|
3609045de2
|
流程获取档案信息
|
2023-09-21 10:58:19 +08:00 |
|
Harryxzy
|
dfc8a1c578
|
报表共享
|
2023-09-21 09:38:38 +08:00 |
|
钱涛
|
3f3089369b
|
修复返回异常
|
2023-09-20 18:49:19 +08:00 |
|
sy
|
3167aaab63
|
薪酬系统-福利方案，修改查询参数
|
2023-09-20 17:29:44 +08:00 |
|
sy
|
05507180eb
|
薪酬系统-福利台账，调差保存时判断调差到对象是否为统计范围内福利项
|
2023-09-20 15:40:31 +08:00 |
|
Harryxzy
|
c40c31845c
|
账套中修改公式为输入，核算的公式页面展示为空字符串不是”输入“
|
2023-09-20 15:26:18 +08:00 |
|
Harryxzy
|
74e4d39b83
|
报表fix
|
2023-09-20 15:02:44 +08:00 |
|
sy
|
dc93a96c8d
|
薪酬系统-薪资核算，获取福利核算数据逻辑优化
|
2023-09-20 14:13:00 +08:00 |
|
Harryxzy
|
38e5d04529
|
复制账套时缺少字段
|
2023-09-20 09:27:57 +08:00 |
|
Harryxzy
|
0eafc0ce94
|
报表temp
|
2023-09-20 09:10:47 +08:00 |
|
Harryxzy
|
5bd66b626f
|
查看工资单后能够继续反馈、确认
|
2023-09-19 16:21:23 +08:00 |
|
sy
|
bf6918264f
|
薪酬系统-福利方案，福利方案修改action
|
2023-09-19 15:24:44 +08:00 |
|
Harryxzy
|
897a7731bf
|
报表fixbug
|
2023-09-19 13:59:08 +08:00 |
|
Harryxzy
|
c7713353dd
|
报表fixbug
|
2023-09-19 13:34:51 +08:00 |
|
Harryxzy
|
5d4231c241
|
报表共享fix
|
2023-09-19 13:11:24 +08:00 |
|
钱涛
|
d9c56a0da4
|
修复switchs函数数据问题
|
2023-09-19 11:24:41 +08:00 |
|
sy
|
2afa94e3a4
|
Merge remote-tracking branch 'remotes/origin/release/2.9.5.2309.01' into feature/230901-福利台账-调差，支持一个人存在多个调差记录
|
2023-09-19 10:47:13 +08:00 |
|
Harryxzy
|
c95098a22b
|
报表共享fix
|
2023-09-18 19:14:06 +08:00 |