 钱涛
|
26a6327d44
|
调薪bug
|
2023-02-23 18:09:05 +08:00 |
|
钱涛
|
a8cb586358
|
公式删除校验
|
2023-02-23 15:48:18 +08:00 |
|
钱涛
|
affa437506
|
加密显示配置
|
2023-02-23 15:18:33 +08:00 |
|
钱涛
|
1c2028f551
|
公式删除优化
|
2023-02-23 14:52:24 +08:00 |
|
钱涛
|
245803cfe8
|
获取人员状态
|
2023-02-23 10:28:27 +08:00 |
|
钱涛
|
e3c1efcc47
|
sql操作的扩展
|
2023-02-23 09:19:34 +08:00 |
|
钱涛
|
ee5e5fa127
|
调薪说明
|
2023-02-22 19:12:53 +08:00 |
|
钱涛
|
41c56b1bd4
|
调薪说明
|
2023-02-22 19:07:13 +08:00 |
|
钱涛
|
5f9a7af0fa
|
修复数据采集按部门搜索
|
2023-02-22 17:58:19 +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 |
|
钱涛
|
49cd56e359
|
档案列表重构
|
2023-02-21 18:05:58 +08:00 |
|
钱涛
|
cb484b8ff9
|
回算项公式使用不可删除
|
2023-02-21 17:19:32 +08:00 |
|
钱涛
|
eac70e7cde
|
薪资项目和社保福利方案分权
|
2023-02-21 17:02:39 +08:00 |
|
钱涛
|
187e60ec15
|
薪资项目分权
|
2023-02-21 16:39:17 +08:00 |
|
钱涛
|
8e31cec138
|
Merge branch 'feature/公式改造' into release/2.6.2.2302.02
|
2023-02-21 14:48:43 +08:00 |
|
钱涛
|
eee39ae972
|
jar引用变更
|
2023-02-21 14:33:15 +08:00 |
|
钱涛
|
84e63d4d40
|
加密日志
|
2023-02-21 13:58:30 +08:00 |
|
钱涛
|
4f22df09f0
|
支持6位小数
|
2023-02-20 14:40:18 +08:00 |
|
钱涛
|
73dcd3a53a
|
fix账套删除人员信息字段
|
2023-02-20 11:54:44 +08:00 |
|
钱涛
|
77cff0ba24
|
档案字段被公式引用不允许删除
|
2023-02-17 18:03:46 +08:00 |
|
钱涛
|
bccdd07ba0
|
修改名称对应修改公式
|
2023-02-17 17:52:29 +08:00 |
|
钱涛
|
c7d1bbfa35
|
更新名称
|
2023-02-17 17:19:17 +08:00 |
|
钱涛
|
dc24b03efd
|
薪资项目删除校验
|
2023-02-17 15:58:33 +08:00 |
|
钱涛
|
abeb4d891d
|
薪资项目删除校验
|
2023-02-17 14:37:59 +08:00 |
|
钱涛
|
da9b548480
|
公式
|
2023-02-17 10:54:18 +08:00 |
|
钱涛
|
1d0a02554e
|
公式
|
2023-02-16 14:53:03 +08:00 |
|
sy
|
39cb3b0df1
|
薪酬系统-福利档案，方案明细中添加福利项上下限数据
|
2023-02-16 13:14:17 +08:00 |
|
钱涛
|
b57bdcc7eb
|
接口报错时打印参数
|
2023-02-16 10:47:30 +08:00 |
|
钱涛
|
91bd28d21a
|
清除公式
|
2023-02-16 10:44:13 +08:00 |
|
钱涛
|
1bdc304ddf
|
清除公式
|
2023-02-16 09:16:00 +08:00 |
|
钱涛
|
53c767b239
|
还原脚本
|
2023-02-15 17:36:29 +08:00 |
|
钱涛
|
a2e9c482a4
|
修复账套根据名称查询bug
去除调整前后值的限制
|
2023-02-15 16:38:54 +08:00 |
|
sy
|
6b34c0e916
|
薪酬系统-福利档案，修改福利方案传参对象
|
2023-02-15 15:52:49 +08:00 |
|
sy
|
7da1bfff6b
|
薪酬系统-福利台账，核算明细导出时企业年金单位数值有误相关问题修复
|
2023-02-15 09:55:33 +08:00 |
|
钱涛
|
4f0dc060ee
|
Merge branch 'feature/档案调整为空时不生效' into release/2.6.2.2302.02
|
2023-02-14 16:00:05 +08:00 |
|
钱涛
|
1c93dab9f0
|
获取人员档案
|
2023-02-14 15:41:03 +08:00 |
|
钱涛
|
0337db02df
|
Merge branch 'feature/通过扣缴义务人和uid获取人员档案' into release/2.6.2.2302.02
|
2023-02-14 15:37:17 +08:00 |
|
钱涛
|
dee7c11eda
|
修复账套新增异常
|
2023-02-14 10:53:58 +08:00 |
|
钱涛
|
44819a0903
|
工资单后台校验
|
2023-02-13 17:25:13 +08:00 |
|
钱涛
|
2748f04d0a
|
档案为空不生效
|
2023-02-13 17:23:05 +08:00 |
|
钱涛
|
8b594c1882
|
自发起调薪流程
|
2023-02-13 14:53:35 +08:00 |
|
钱涛
|
78cb59f07f
|
暂存
|
2023-02-13 13:27:44 +08:00 |
|
钱涛
|
602051e1ed
|
Merge branch 'release/2.6.1.2301.02' into release/2.6.2.2302.02
|
2023-02-13 11:02:00 +08:00 |
|
钱涛
|
49894ad6a2
|
修复申报表总数
|
2023-02-13 10:59:09 +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 |
|
Harryxzy
|
510a2e7d29
|
处理工资单发放历史数据执行时间提前
|
2023-02-09 19:43:43 +08:00 |
|
Harryxzy
|
d30870e28d
|
调薪不支持字符
|
2023-02-09 19:24:25 +08:00 |
|
钱涛
|
4186526743
|
Merge remote-tracking branch 'origin/release/2.6.1.2301.02' into release/2.6.1.2301.02
|
2023-02-09 19:04:02 +08:00 |
|
钱涛
|
0f9222e1e4
|
fix年终奖申报备注为0
|
2023-02-09 19:03:53 +08:00 |
fcli
|
5b50903b55
|
Merge branch 'feature/SalaryItemAuth&FieldManage' into release/2.6.1.2301.02
|
2023-02-09 18:48:35 +08:00 |
|
fcli
|
e99abfddcd
|
feat: 保存更新判断薪资档案引用
|
2023-02-09 18:47:48 +08:00 |
|
Harryxzy
|
cbc1c13e4d
|
Merge branch 'feature/V3-TaxAgentImport_AddState-0209' into release/2.6.1.2301.02
|
2023-02-09 17:40:49 +08:00 |
|
钱涛
|
8d011d8d49
|
Merge branch 'feature/账套群组不变' into release/2.6.1.2301.02
|
2023-02-09 17:32:00 +08:00 |
|
钱涛
|
995689bb1d
|
Merge branch 'feature/考勤引用本身报表' into release/2.6.1.2301.02
|
2023-02-09 17:31:42 +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 |
|
fcli
|
5ee8097b3e
|
Merge branch 'feat/salaryBillSaveItem042' into release/2.6.1.2301.02
|
2023-02-09 17:22:53 +08:00 |
|
钱涛
|
b6429eb41c
|
通过id查询工资单详情
|
2023-02-09 17:05:07 +08:00 |
|
钱涛
|
2c37086e70
|
账套群组保持不变
|
2023-02-09 15:33:35 +08:00 |
|
fcli
|
fdf343dbbd
|
fix: 字段管理可以切换薪资引用
|
2023-02-09 11:08:03 +08:00 |
|
Harryxzy
|
69dd9cc61c
|
个税扣缴义务人、薪资账套 导入添加员工状态导入功能
|
2023-02-08 17:48:14 +08:00 |
|
sy
|
390d2d7851
|
薪酬系统-福利台账，补缴起始缴纳月之前的福利默认为空
|
2023-02-08 14:50:45 +08:00 |
|
sy
|
5657d5cc64
|
薪酬系统-福利台账，福利补缴方式一和二不允许补缴起始缴纳月之前的月份
|
2023-02-08 13:04:23 +08:00 |
|
Harryxzy
|
22027cde6b
|
Merge branch 'fix/MySalaryPageBug' into release/2.6.1.2301.02
|
2023-02-08 12:14:39 +08:00 |
|
Harryxzy
|
091221d0d4
|
我的薪资福利分页BUG
|
2023-02-08 12:12:45 +08:00 |
|
sy
|
de5b5d4c19
|
薪酬系统-福利台账，福利缴纳周期核算时考虑起始缴纳月相关逻辑，福利补缴不允许补缴起始缴纳月之前的月份
|
2023-02-08 11:33:17 +08:00 |
|
fcli
|
0a1198f17d
|
fix: 个税扣缴义务人范围非空判断
|
2023-02-06 17:16:11 +08:00 |
|
钱涛
|
2ff5ff0dce
|
考勤列表和导出
|
2023-02-06 16:28:56 +08:00 |
|
钱涛
|
0fb9fb51a0
|
修复调薪记录显示问题
|
2023-02-06 11:08:59 +08:00 |
|
钱涛
|
a3775babd3
|
考勤引用
|
2023-02-06 10:33:12 +08:00 |
|
sy
|
45d9fa4c12
|
薪酬系统-福利台账，补缴核算时按照补缴月份考虑缴纳周期
|
2023-02-03 17:04:30 +08:00 |
|
sy
|
9a4b58b2ee
|
薪酬系统-福利台账，只勾选医疗保险和养老保险时的补缴核算过程加入福利方案缴纳周期逻辑
|
2023-02-03 13:38:12 +08:00 |
|
钱涛
|
cdfced412f
|
Merge branch 'feature/年终奖' into release/2.6.1.2301.02
|
2023-02-02 16:13:05 +08:00 |
|
钱涛
|
abdd85effd
|
Merge branch 'feature/考勤引用本身报表' into release/2.6.1.2301.02
|
2023-02-02 16:12:41 +08:00 |
|
fcli
|
003dfe0d35
|
feat: 请求方式修改
|
2023-02-02 15:47:17 +08:00 |
|
sy
|
2e7ea046f2
|
薪酬系统-福利台账，补缴核算过程加入福利方案缴纳周期逻辑
|
2023-02-02 14:47:39 +08:00 |
|
钱涛
|
810cfe7f5e
|
考勤引用本身报表
|
2023-02-01 14:03:13 +08:00 |
|
fcli
|
3f145e133b
|
feat: 添加是否补发参数
|
2023-02-01 13:39:14 +08:00 |
|
fcli
|
5851ea20be
|
feat: 发放模板获取可用分组或项目
|
2023-02-01 13:10:05 +08:00 |
|
fcli
|
78f8630465
|
feat: 薪资账套项目列表分权
|
2023-02-01 11:23:43 +08:00 |
|
fcli
|
dec7c89856
|
feat: 发放模板获取可用分组或项目
|
2023-02-01 11:22:38 +08:00 |
|
钱涛
|
f76ac415ba
|
修复年终奖备注字符不对应
|
2023-02-01 10:05:02 +08:00 |
|
sy
|
6abc2068ea
|
薪酬系统-福利方案，福利方案新增、编辑、查看方法改进，福利核算加入福利方案中的缴纳周期因素
|
2023-01-31 17:40:34 +08:00 |
|
fcli
|
e92ea00b02
|
fix: 薪资项目公式按分权处理。
薪资项目管理列表取出薪资档案引用列
|
2023-01-31 14:31:46 +08:00 |
|
钱涛
|
9bedcf6d38
|
年终奖
|
2023-01-31 14:15:27 +08:00 |
|
fcli
|
da47210b22
|
fix: 薪资档案根据薪资项目分权展示
|
2023-01-31 14:05:40 +08:00 |
|
钱涛
|
857c39bd2d
|
年终奖
|
2023-01-30 17:32:58 +08:00 |
|
sy
|
ae6822dc91
|
薪酬系统-福利方案，福利方案对象的相关数据载体（po,dto）增加缴纳周期相关新字段，并对sql中的查询字段进行添加
|
2023-01-30 17:29:07 +08:00 |
|
sy
|
63ae86978f
|
薪酬系统-福利档案，导出excel文件名添加日期信息
|
2023-01-30 09:31:31 +08:00 |
|
钱涛
|
d881b63327
|
年终奖
|
2023-01-29 14:58:51 +08:00 |
|
fcli
|
80019a029c
|
feat: 获取部分字段
|
2023-01-28 13:56:02 +08:00 |
|
Harryxzy
|
5bdb3ca0fe
|
Merge branch 'fix/setSendStatusBUG' into release/2.6.1.2301.02
|
2023-01-18 10:20:19 +08:00 |
|
钱涛
|
570065330b
|
修复考勤导入异常
|
2023-01-18 10:02:23 +08:00 |
|
fcli
|
bd2597541d
|
feat: 字段管理
|
2023-01-18 09:38:43 +08:00 |
|
Harryxzy
|
dc3bd34e0f
|
薪资回算sendStatus值update漏写
|
2023-01-14 13:59:13 +08:00 |
|
sy
|
57753bfb4a
|
Merge branch 'feature/v3-siFunctionImprove-0112' into release/2.5.3.2301.01
|
2023-01-12 18:32:11 +08:00 |
|
sy
|
3ed6c43a93
|
薪酬系统-福利台账，补缴原方式新增时，未设置基数情况下的逻辑优化
|
2023-01-12 18:31:36 +08:00 |
|
sy
|
3abffc2ee9
|
Merge branch 'feature/v3-siFunctionImprove-0112' into release/2.5.3.2301.01
|
2023-01-12 17:24:55 +08:00 |
|
sy
|
28d515b41a
|
薪酬系统-福利台账，补缴导入空值时处理逻辑优化
|
2023-01-12 17:23:26 +08:00 |
|
钱涛
|
2a52671451
|
支持钉钉打开工资单
|
2023-01-12 15:47:20 +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 |
|
钱涛
|
77dadfab4d
|
账套项目去重
|
2023-01-12 14:09:04 +08:00 |
|
sy
|
0feacffa11
|
Merge remote-tracking branch 'remotes/origin/feature/v3-siFunctionImprove-0112' into release/2.5.3.2301.01
|
2023-01-12 13:44:30 +08:00 |
|
Harryxzy
|
2b3752a554
|
Merge branch 'feature/V3-taxAgentsAddImport-0112' into release/2.5.3.2301.01
|
2023-01-12 09:25:06 +08:00 |
|
Harryxzy
|
6460edc013
|
去重
|
2023-01-11 09:47:57 +08:00 |
|
sy
|
197dbd8c8a
|
薪酬系统-福利档案，导入模板下载功能入参调整
|
2023-01-10 15:42:24 +08:00 |
|
sy
|
884da3dfb3
|
薪酬系统-福利档案，导入模板下载接口优化
|
2023-01-09 17:51:54 +08:00 |
|
sy
|
97230052b3
|
薪酬系统-福利档案，导入和导出的excel表头添加导入或导出，并且后缀添加tab页标签
|
2023-01-09 17:30:49 +08:00 |
|
Harryxzy
|
fd5048bd2d
|
fixBug
|
2023-01-09 15:20:26 +08:00 |
|
Harryxzy
|
fd470c56aa
|
薪资账套人员范围导入
|
2023-01-09 15:12:44 +08:00 |
|
sy
|
b33771d9e4
|
薪酬系统-福利档案，列表数据展示添加入职日期、离职日期字段
|
2023-01-09 14:49:58 +08:00 |
|
钱涛
|
830304fabb
|
系统配置
|
2023-01-09 14:41:10 +08:00 |
|
Harryxzy
|
c47d3f4ade
|
下载模板改为get请求
|
2023-01-09 10:30:26 +08:00 |
|
Harryxzy
|
09ba495bf3
|
个税扣缴义务人批量导入功能
|
2023-01-09 10:01:47 +08:00 |
|
钱涛
|
9dac777d5f
|
Merge branch 'feature/sql检查方法' into release/2.5.3.2301.01
# Conflicts:
# src/com/engine/salary/wrapper/SalaryFormulaWrapper.java
|
2023-01-06 14:41:42 +08:00 |
|
sy
|
25ee041638
|
Merge branch 'feature/v3-siRepairCreate-1229' into release/2.5.3.2301.01
|
2023-01-06 14:07:53 +08:00 |
|
sy
|
f722535ba1
|
薪酬系统-福利台账，补缴新增仅缴纳部分福利项时的台账统计逻辑优化
|
2023-01-06 11:20:44 +08:00 |
|
fcli
|
d1f62e8b49
|
Merge remote-tracking branch 'origin/release/2.5.3.2301.01' into release/2.5.3.2301.01
|
2023-01-06 09:06:41 +08:00 |
|
fcli
|
d700d7a300
|
Merge branch 'fix/addSpecialDeduction' into release/2.5.3.2301.01
|
2023-01-06 09:06:20 +08:00 |
|
sy
|
b0436236eb
|
Merge branch 'feature/v3-siRepairCreate-1229' into release/2.5.3.2301.01
|
2023-01-05 17:24:33 +08:00 |
|
sy
|
6c730669c7
|
薪酬系统-福利台账，补缴新增方式二，按照指定核算月获取缴纳基数功能问题修复
|
2023-01-05 17:21:31 +08:00 |
|
钱涛
|
6d3c2ca856
|
Merge remote-tracking branch 'origin/release/2.5.3.2301.01' into release/2.5.3.2301.01
|
2023-01-05 16:24:51 +08:00 |
|
钱涛
|
dfd8f90df1
|
考勤同步日志控制
|
2023-01-05 16:24:40 +08:00 |
|
sy
|
d807b72ee7
|
Merge branch 'feature/v3-siRepairCreate-1229' into release/2.5.3.2301.01
|
2023-01-05 16:16:17 +08:00 |
|
sy
|
f1a123dfa4
|
Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siRepairCreate-1229
|
2023-01-05 16:12:47 +08:00 |
|
Harryxzy
|
708f1c396a
|
Merge branch 'fix/V3-can'tReCalcBug-0105' into release/2.5.3.2301.01
|
2023-01-05 15:44:21 +08:00 |
|
fcli
|
143de10689
|
Merge remote-tracking branch 'origin/fix/addUpSituationValidation' into release/2.5.3.2301.01
|
2023-01-05 15:42:39 +08:00 |
|
Harryxzy
|
dc08340c73
|
fix个税申报后无法重新核算bug
|
2023-01-05 11:50:01 +08:00 |
|
sy
|
ac99625e29
|
薪酬系统-福利台账，补缴新增社保缴纳明细保存问题修复
|
2023-01-05 09:53:26 +08:00 |
|
fcli
|
2d9ce61d5d
|
feat: 往期累计一键清空校验bug修复,分页解密时机修改
|
2023-01-05 09:49:25 +08:00 |
|
fcli
|
eb3c75197b
|
feat: 往期累计一键清空校验bug修复
|
2023-01-05 09:40:43 +08:00 |
|
fcli
|
8e0bf2b693
|
feat: 往期累计一键清空校验bug修复
|
2023-01-05 09:25:07 +08:00 |
|
sy
|
d25fc4a579
|
薪酬系统-福利台账，调差默认配置数据获取逻辑优化
|
2023-01-04 17:41:09 +08:00 |
|
sy
|
b786de5e4d
|
薪酬系统-福利档案，列表查询逻辑优化
|
2023-01-04 16:30:37 +08:00 |
|
sy
|
5f59ff399d
|
薪酬系统-福利台账，补缴功能优化只选社保或养老保险时的单位缴纳逻辑
|
2023-01-04 16:05:19 +08:00 |
|
fcli
|
3863a10c27
|
fix: 一月份不累计上年数据
|
2023-01-04 14:15:59 +08:00 |
|
sy
|
f53d788583
|
薪酬系统-福利档案，高级搜索功能支持根据个税扣缴义务人检索
|
2023-01-03 17:58:14 +08:00 |
|
钱涛
|
4a0a18bb07
|
修复考勤引用超出人员范围异常
|
2023-01-03 10:22:42 +08:00 |
|
sy
|
17e6e9d934
|
薪酬系统-福利台账，补缴获取指定月的缴纳基数，增加技术字符串判空，增加所属社保类字段
|
2023-01-03 10:09:14 +08:00 |
|
sy
|
19cca7a156
|
薪酬系统-福利台账，补缴获取指定月的缴纳基数，优化空数据处理
|
2022-12-30 18:20:10 +08:00 |
|
sy
|
e6e1637119
|
薪酬系统-福利台账，调差新增增加时判断是否已有调差数据的
|
2022-12-29 17:35:58 +08:00 |
|
Harryxzy
|
4726b9560c
|
Merge branch 'fix/V3-backItemImportBug-1229' into release/2.5.2.22.12.04
|
2022-12-29 15:05:40 +08:00 |
|
Harryxzy
|
dd03efaf9e
|
Merge branch 'feature/V3-salaryArchiveAddWorkCode-1229' into release/2.5.2.22.12.04
|
2022-12-29 15:04:18 +08:00 |
|
sy
|
ee72dcd3f0
|
薪酬系统-福利台账，调差列表展示默认数据时，处理核算人员外的默认人员数据逻辑优化
|
2022-12-29 14:43:54 +08:00 |
|
sy
|
ea763bd20c
|
Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountProcessDeal-1229' into release/2.5.2.22.12.04
|
2022-12-29 10:19:49 +08:00 |
|
sy
|
a9168afe58
|
薪酬系统-福利台账，初次核算前为台账项设置基础数值（socialPay,fundPay,otherPay）
|
2022-12-29 10:17:54 +08:00 |
|
sy
|
e4df660cd9
|
Merge branch 'feature/v3-siAccountProcessDeal-1229' into release/2.5.2.22.12.04
|
2022-12-29 10:07:22 +08:00 |
|
sy
|
42d57163a9
|
薪酬系统-福利台账，福利核算无核算人员时，直接进度完成
|
2022-12-29 10:05:52 +08:00 |
|
sy
|
7fba73d3f4
|
薪酬系统-福利台账，福利核算无核算人员时，直接进度完成
|
2022-12-29 09:24:07 +08:00 |
|
sy
|
84aeb5059f
|
薪酬系统-福利台账，调差方式3时的福利项
|
2022-12-28 17:01:15 +08:00 |
|
fcli
|
8ccc1a0ec3
|
Merge branch 'feature/加密方法&分页merge' into release/2.5.2.22.12.04
|
2022-12-28 15:43:33 +08:00 |
|
sy
|
2f4d580793
|
薪酬系统-福利台账，调差列表优化，默认配置带出单位缴费数据
|
2022-12-28 11:58:38 +08:00 |
|
sy
|
494462092d
|
薪酬系统-福利台账，补缴方式选择指定月的缴纳基数获取功能
|
2022-12-27 17:34:46 +08:00 |
|
sy
|
af15ffcc23
|
薪酬系统-福利台账，补缴新增功能改造v1
|
2022-12-27 14:01:08 +08:00 |
|
fcli
|
45292dfc4f
|
feat: null处理
|
2022-12-27 11:39:52 +08:00 |
|
Harryxzy
|
6262f62292
|
薪资回算Excel导入BUG
|
2022-12-26 23:17:32 +08:00 |
|
Harryxzy
|
d7127e29e4
|
薪资档案中默认显示工号
|
2022-12-26 14:58:41 +08:00 |
|
sy
|
c49017f63b
|
Merge branch 'feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03
|
2022-12-23 18:45:48 +08:00 |
|
sy
|
011d66e298
|
薪酬系统-福利台账，补差数据导入，过滤未启用福利项
|
2022-12-23 18:45:10 +08:00 |
|
sy
|
fe5847aed6
|
Merge branch 'feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03
|
2022-12-23 17:51:30 +08:00 |
|
sy
|
df2ac4754d
|
薪酬系统-福利台账，补差数据导入，缴纳费用非有效数值型数据，直接跳过
|
2022-12-23 17:50:12 +08:00 |
|
sy
|
cea78e6594
|
Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03
|
2022-12-23 16:35:33 +08:00 |
|
sy
|
5f4ddeabd4
|
薪酬系统-福利台账，补差数据待编辑数据过滤空值字段
|
2022-12-23 16:34:12 +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 |
|
Harryxzy
|
43511f7922
|
Merge branch 'feature/V3-backItem-1215' into release/2.4.2.2212.03
|
2022-12-21 16:39:55 +08:00 |
|
sy
|
28d1d16844
|
薪酬系统-福利台账，补差数据参与薪资核算
|
2022-12-21 11:12:14 +08:00 |
|
钱涛
|
85739933a5
|
单次核算5000
|
2022-12-20 16:45:09 +08:00 |
|
sy
|
e75d0c5872
|
薪酬系统-福利台账，补差数据导入逻辑问题修复,福利类合计为0时，不允许补差其包含的福利项
|
2022-12-20 15:20:42 +08:00 |
|
sy
|
cd671b5ae2
|
薪酬系统-福利台账，补差数据导入逻辑问题修复
|
2022-12-20 09:25:55 +08:00 |
|
Harryxzy
|
07292531db
|
重新回算提示
|
2022-12-19 18:03:17 +08:00 |
|
sy
|
547e7cd662
|
薪酬系统-福利台账，补差数据导入时，拒绝对于未设置社保、公积金、其他福利的正常缴纳项进行补差
|
2022-12-19 17:26:44 +08:00 |
|
sy
|
2f10986e2b
|
薪酬系统-福利台账，重新核算时，保留已有补差数据，但是bill_batch统计信息只统计补差相关缴费数额，不统计补差相关人数信息
|
2022-12-19 14:47:49 +08:00 |
|
sy
|
53d48d63b0
|
薪酬系统-福利台账，补差新增数据时，过滤重复数据
|
2022-12-19 11:43:20 +08:00 |
|
Harryxzy
|
ddea8c9066
|
回算工资单发放调整
|
2022-12-19 11:12:26 +08:00 |
|
sy
|
8157cafc98
|
薪酬系统-福利档案，取消停缴功能，添加人员是否在对应的个税扣缴义务人下的判断
|
2022-12-19 10:01:32 +08:00 |
|
钱涛
|
6ce7ef0b7e
|
Merge branch 'hotfix/处理流程操作者' into release/2.4.2.2212.03
|
2022-12-16 17:58:03 +08:00 |
|
fcli
|
4b2549f420
|
Merge branch 'feature/加密方法&分页merge' into release/2.4.2.2212.03
|
2022-12-16 17:57:17 +08:00 |
|
Harryxzy
|
eaa9b7515f
|
工资单发放详情模板名称调整
|
2022-12-16 15:53:34 +08:00 |
|
Harryxzy
|
0ace75ab06
|
工资单发放模板展示
|
2022-12-16 14:55:11 +08:00 |
|
Harryxzy
|
82577f97e0
|
舍入规则保存错误
|
2022-12-16 11:22:43 +08:00 |
|
sy
|
69e0d7e441
|
薪酬系统-福利台账，补差tab添加
|
2022-12-16 11:13:28 +08:00 |
|
钱涛
|
2fbd66ac19
|
操作者
|
2022-12-16 10:32:45 +08:00 |
|
fcli
|
c70964a8e2
|
feat: 继承类问题修改
|
2022-12-16 10:18:26 +08:00 |
|
fcli
|
bf870cc9aa
|
feat: 继承类问题修改
|
2022-12-16 10:11:41 +08:00 |
|
fcli
|
8f39d5d12a
|
Merge branch 'feature/加密方法' into feature/加密方法&分页merge
|
2022-12-16 10:01:09 +08:00 |
|
fcli
|
78447c002b
|
feat: 继承类问题修改
|
2022-12-16 10:01:00 +08:00 |
|
fcli
|
5295821dc1
|
Merge branch 'feature/加密方法' into feature/加密方法&分页merge
|
2022-12-16 09:46:55 +08:00 |
|
fcli
|
68f9c8b9db
|
feat: 继承类问题修改
|
2022-12-16 09:46:39 +08:00 |
|
sy
|
237f42f2ae
|
薪酬系统-福利台账，核算进度条逻辑优化
|
2022-12-15 18:03:28 +08:00 |
|
sy
|
cf08bbd842
|
薪酬系统-福利台账，补差相关加解密替换为新方法
|
2022-12-15 17:11:38 +08:00 |
|
sy
|
0787fb4d05
|
Merge remote-tracking branch 'remotes/origin/release/2.4.1.2212.02' into feature/v3-siAccountBalance-1208
# Conflicts:
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
|
2022-12-15 17:08:21 +08:00 |
|
钱涛
|
b59ba320df
|
人员去重
|
2022-12-15 16:59:00 +08:00 |
|
Harryxzy
|
b9b0a6f1c5
|
回算批量更新
|
2022-12-15 11:32:32 +08:00 |
|
Harryxzy
|
41a3583d61
|
修复回算按钮
|
2022-12-15 11:12:36 +08:00 |
|
Harryxzy
|
4ed3f47b36
|
薪资账套修改回算公式后不生效问题
|
2022-12-14 22:34:12 +08:00 |
|
Harryxzy
|
5f37281757
|
添加backcalctype
|
2022-12-14 18:21:25 +08:00 |
|
fcli
|
7f7f4442ca
|
Merge branch 'feature/加密方法' into feature/加密方法&分页merge
|
2022-12-14 14:56:24 +08:00 |
|
fcli
|
beeadfc35c
|
feat: 加解密处理
|
2022-12-14 14:55:57 +08:00 |
|
Harryxzy
|
4fa7f9a5e7
|
回算-加解密开关
|
2022-12-14 14:45:24 +08:00 |
|
Harryxzy
|
2136bbbd7f
|
Merge branch 'feature/加密方法&分页merge' into feature/V3-backItem-1215
|
2022-12-14 13:57:21 +08:00 |
|
Harryxzy
|
27602626cf
|
回算加密
|
2022-12-14 13:57:03 +08:00 |
|
fcli
|
b162afcbdd
|
Merge branch 'feature/加密方法' into feature/加密方法&分页merge
|
2022-12-14 13:51:22 +08:00 |
|
fcli
|
ad3f7595bd
|
feat: 空指针处理
|
2022-12-14 13:51:01 +08:00 |
|
Harryxzy
|
75220416bc
|
merge new解密
|
2022-12-14 12:32:42 +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 |
|
fcli
|
d039781b74
|
feat: develop处理合并
|
2022-12-14 11:03:33 +08:00 |
|
fcli
|
dea2353ef2
|
Merge branch 'feature/变更分页' into feature/加密方法&分页merge
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/biz/SalaryArchiveItemBiz.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
# src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
|
2022-12-14 10:57:41 +08:00 |
|
fcli
|
d3de862d11
|
feat: 加密统一,薪资项目&社保档案详情...
|
2022-12-13 17:14:27 +08:00 |
|
sy
|
1e31dad7ad
|
薪酬系统-福利档案，待减员页面删除待办功能优化
|
2022-12-13 16:58:35 +08:00 |
|
Harryxzy
|
3b6418263f
|
薪资账套复制-薪资回算
薪资核算-回算部分四舍五入
|
2022-12-13 16:39:39 +08:00 |
|
钱涛
|
4d677b4d58
|
mock公式运行
|
2022-12-13 16:13:45 +08:00 |
|
钱涛
|
c3cb3105fd
|
暂存
|
2022-12-13 10:53:43 +08:00 |
|
fcli
|
1c6acb497c
|
feat: 加密统一，累计附加扣除详细
|
2022-12-13 10:49:51 +08:00 |
|
fcli
|
eabc983100
|
feat: 加密统一，社保福利档案&薪资核算结果
|
2022-12-13 10:15:31 +08:00 |
|
sy
|
32cffdccf5
|
薪酬系统-福利档案，批量减员逻辑变更，自动减员逻辑变更，无福利方案时，不关注最终缴纳月
|
2022-12-12 17:53:05 +08:00 |
|
sy
|
1fb706b7da
|
薪酬系统-福利档案，删除待办功能添加批量处理逻辑
|
2022-12-12 16:55:22 +08:00 |
|
fcli
|
1431308cc5
|
feat: 加密统一，薪资核算结果
|
2022-12-12 16:42:44 +08:00 |
|
sy
|
1b376464c4
|
薪酬系统-福利档案，删除待办功能（待减员页面）
|
2022-12-12 15:43:12 +08:00 |
|
fcli
|
93db32b758
|
feat: 加密统一，累计附加扣除&社保福利模块
|
2022-12-12 15:40:01 +08:00 |
|
sy
|
ae72d25431
|
Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siAccountBalance-1208
|
2022-12-12 13:43:16 +08:00 |
|
钱涛
|
5e893160b4
|
加密方法
|
2022-12-12 10:36:06 +08:00 |
|
fcli
|
b58e71989d
|
feat: 统一修改到内存分页
|
2022-12-12 10:25:55 +08:00 |
|
钱涛
|
8dc2ddc3c8
|
加密方法
|
2022-12-12 09:37:15 +08:00 |
|
钱涛
|
309cb2047d
|
配置文件
|
2022-12-09 15:28:29 +08:00 |
|
sy
|
43157d25e3
|
薪酬系统-福利台账，补差列表v1
|
2022-12-09 14:50:29 +08:00 |
|
钱涛
|
77d3046966
|
所有个税扣缴义务人的树形
|
2022-12-08 17:48:46 +08:00 |
|
钱涛
|
30e8fd3733
|
流程中个税扣缴义务人已处理
|
2022-12-08 16:48:37 +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 |
|
fcli
|
269bfeee18
|
feat: 查询列表加快
|
2022-12-08 16:39:57 +08:00 |
|
fcli
|
89574f278b
|
feat: 查询列表加快
|
2022-12-08 16:31:16 +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 |
|
sy
|
0210f6542f
|
薪酬系统-福利台账，补差数据删除v1
|
2022-12-08 16:23:18 +08:00 |
|
fcli
|
fcca6950ac
|
feat: 修复bug
|
2022-12-08 15:45:15 +08:00 |
|
Harryxzy
|
ce76bc8b43
|
薪资账套list返回个税扣缴义务人id
|
2022-12-08 15:42:21 +08:00 |
|
Harryxzy
|
8e573f8bd7
|
补发工资单详情查看
|
2022-12-08 15:25:16 +08:00 |
|
sy
|
ab6c0940c2
|
薪酬系统-福利台账，补差数据导出功能
|
2022-12-08 14:51:23 +08:00 |
|
钱涛
|
2c1421999b
|
Merge branch 'feature/扩展sql字符' into release/2.3.2.2212.01
|
2022-12-08 11:32:03 +08:00 |
|
钱涛
|
ea20dfb9ff
|
fix调薪action
|
2022-12-08 10:53:51 +08:00 |
|
钱涛
|
399563088d
|
流程生成人员范围
|
2022-12-08 10:49:51 +08:00 |
|
sy
|
979bb82661
|
薪酬系统-福利台账，调差数据保存时，增加新数据id信息的返回
|
2022-12-08 10:18:27 +08:00 |
|
sy
|
c94e28e68c
|
薪酬系统-福利台账，核算功能相关临时表数据删除逻辑优化
|
2022-12-08 10:10:48 +08:00 |
|
钱涛
|
fb39dbe0c4
|
流程生成人员范围
|
2022-12-07 20:16:14 +08:00 |
|
钱涛
|
0d417f1e49
|
流程生成人员范围
|
2022-12-07 20:15:52 +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 |
|
钱涛
|
5079753c34
|
sql测试
|
2022-12-07 16:19:22 +08:00 |
|
钱涛
|
f20cecf042
|
sql测试
|
2022-12-07 16:17:29 +08:00 |
|
钱涛
|
cdb7f3a0a2
|
sql测试
|
2022-12-07 15:47:35 +08:00 |
|
Harryxzy
|
ecda5027de
|
fix 回算归档
|
2022-12-07 15:27:20 +08:00 |
|
Harryxzy
|
c4b17974ae
|
fix 归档，薪资核算不存在BUG
|
2022-12-07 15:21:29 +08:00 |
|
Harryxzy
|
f89c5d2970
|
工资单模板编辑补发模板
|
2022-12-07 15:03:39 +08:00 |
|
Harryxzy
|
19022fc505
|
fix 编辑工资单模板，补发显示部分
|
2022-12-07 10:34:41 +08:00 |
|
钱涛
|
1e03eca738
|
单独调薪检查action
|
2022-12-07 09:17:31 +08:00 |
|
钱涛
|
b39587e19d
|
单独调薪action
|
2022-12-06 18:08:50 +08:00 |
|
Harryxzy
|
5078fa9b87
|
fix 工资单发放报错
|
2022-12-06 15:59:38 +08:00 |
|
sy
|
70a5854dc7
|
薪酬系统-福利台账，调差数据保存时，增加公司费用数值字段的校验
|
2022-12-06 15:40:40 +08:00 |
|
Harryxzy
|
c0d916c286
|
薪资回算功能，工资单部分
|
2022-12-06 15:29:08 +08:00 |
|
sy
|
3fa017b13a
|
薪酬系统-福利台账，补差福利项列表功能和补差模板导出功能
|
2022-12-06 11:44:04 +08:00 |
|
钱涛
|
11d1ee1a21
|
批量调薪action
|
2022-12-06 10:26:36 +08:00 |
|
钱涛
|
2f8f5f299e
|
批量调薪action
|
2022-12-06 09:52:55 +08:00 |
|
钱涛
|
5b1615675d
|
批量调薪action
|
2022-12-06 09:41:26 +08:00 |
|
fcli
|
2877d58a1f
|
feat: sqlserver bug修复
|
2022-12-05 17:51:28 +08:00 |
|
sy
|
bea06f1d88
|
薪酬系统-福利台账，可调差人员列表功能返回格式增加target字段
|
2022-12-05 16:56:05 +08:00 |
|
fcli
|
acab57aa36
|
feat: 撤回范围修复
|
2022-12-05 16:05:38 +08:00 |
|
钱涛
|
23dd15a568
|
批量调薪action
|
2022-12-05 16:01:08 +08:00 |
|
sy
|
a04f4a915f
|
薪酬系统-福利台账，可调差人员列表功能取消分页逻辑
|
2022-12-05 15:42:49 +08:00 |
|
fcli
|
ff7b1047bc
|
feat: 发放异常拦截
|
2022-12-05 14:06:22 +08:00 |
|
Harryxzy
|
fa6e41d62e
|
Merge branch 'fix/intSalaryArchiveFLOWOpenPermissions' into release/2.3.2.2212.01
|
2022-12-05 10:43:09 +08:00 |
|
Harryxzy
|
1b570fe1aa
|
放开管理员限制
|
2022-12-05 10:34:25 +08:00 |
|
Harryxzy
|
012d8dfb07
|
社保福利流程，放开个税扣缴义务人限制
|
2022-12-05 10:13:16 +08:00 |
|
sy
|
014190f6d0
|
薪酬系统-福利台账，补缴列表查询优化，增加缴纳状态筛选
|
2022-12-05 10:09:43 +08:00 |
|
Harryxzy
|
6fe28ec41c
|
定薪流程，放开个税扣缴义务人限制
|
2022-12-05 09:57:27 +08:00 |
|
fcli
|
4fa64c6a8f
|
feat: mapper异常修复
|
2022-12-05 09:52:05 +08:00 |
|
sy
|
33aa8ea507
|
薪酬系统-福利档案，档案数据通过导入excel入库前，根据人员id和个税扣缴义务人进行去重
|
2022-12-02 17:57:09 +08:00 |
|
Harryxzy
|
3ff3fd8e44
|
薪资回算-薪资核算部分（剩余核算归档）
|
2022-12-02 17:35:14 +08:00 |
|
sy
|
22a7258229
|
薪酬系统-福利台账，福利核算添加核算进度查询逻辑
|
2022-12-02 17:08:35 +08:00 |
|
钱涛
|
991338a10e
|
合计行异步处理
|
2022-12-02 16:58:19 +08:00 |
|
fcli
|
c7b3341a13
|
feat: 查询异常问题修改
|
2022-12-01 17:41:10 +08:00 |
|
钱涛
|
013f67469e
|
显示定制列的入职日期和离职日期
|
2022-12-01 14:33:21 +08:00 |
|
钱涛
|
ac0b0a7e25
|
公式提醒
|
2022-12-01 13:59:38 +08:00 |
|
sy
|
e462992206
|
薪酬系统-福利台账，社保调差撤回功能优化
|
2022-12-01 11:50:37 +08:00 |
|
sy
|
119640e272
|
薪酬系统-福利台账，在福利台账重新核算时，删除调差数据时增加人员id筛选
|
2022-12-01 10:50:34 +08:00 |
|
sy
|
da7b9d8e6a
|
薪酬系统-福利台账，社保调差数据删除逻辑，在福利台账重新核算时，删除已有调查记录
|
2022-12-01 10:22:47 +08:00 |
|
sy
|
5436742c74
|
薪酬系统-福利台账，社保调差列表查询功能优化
|
2022-11-30 17:57:25 +08:00 |
|
钱涛
|
6cffbf4db7
|
取消安全级别
|
2022-11-30 16:59:58 +08:00 |
|
sy
|
d3d2074aed
|
薪酬系统-福利台账，在社保核算月数据删除时，社保调差数据被删除
|
2022-11-30 15:55:23 +08:00 |
|
sy
|
4d01c324e0
|
薪酬系统-福利台账，社保调差保存功能优化
|
2022-11-30 15:05:24 +08:00 |
|
sy
|
ee7309ffd1
|
薪酬系统-福利台账，社保调差项公司支出费用统计功能优化，对于已存在调差项，给出提示，并且不进行计算
|
2022-11-30 14:07:28 +08:00 |
|
钱涛
|
a2ab9471be
|
核算记录id
|
2022-11-30 14:06:01 +08:00 |
|
钱涛
|
d8f99abb18
|
调薪，调薪校验流程接口
|
2022-11-30 11:23:58 +08:00 |
|
sy
|
a0bda933a1
|
薪酬系统-福利台账，社保调差项公司支出费用统计功能
|
2022-11-29 17:36:18 +08:00 |
|
sy
|
2ceeeb165f
|
薪酬系统-福利台账，社保调差列表v1
|
2022-11-29 15:33:57 +08:00 |
|
fcli
|
4f9e2d8f80
|
feat: 路径修改接近e10
|
2022-11-29 14:36:37 +08:00 |
|
sy
|
f68219ff87
|
薪酬系统-福利档案，高级搜索分部逻辑优化
|
2022-11-28 16:58:20 +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 |
|
钱涛
|
8f75380f67
|
扩展sql字符
|
2022-11-28 10:39:46 +08:00 |
|
sy
|
ff20acd15a
|
薪酬系统-福利台账，调差记录表po和配置表po
|
2022-11-28 09:55:29 +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 |
|
钱涛
|
4b75ba67e9
|
人员分片
|
2022-11-25 14:48:49 +08:00 |
|
sy
|
dc69a479ec
|
Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountRecession-1117' into release/2.3.1.2211.04
|
2022-11-25 14:44:45 +08:00 |
|
sy
|
366c1a8367
|
薪酬系统-福利台账，退差数据保存优化，分批查询
|
2022-11-25 14:43:45 +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 |
|
钱涛
|
8d43e20c84
|
Merge branch 'feature/同步人员' into release/2.3.1.2211.04
|
2022-11-25 10:44:21 +08:00 |
|
sy
|
eeea00a408
|
薪酬系统-福利台账，退差保存数据功能优化
|
2022-11-25 10:17:35 +08:00 |
|
sy
|
bc20d37797
|
薪酬系统-福利台账，退差保存数据来源增加个税扣缴义务人筛选
|
2022-11-24 20:35:51 +08:00 |
|
钱涛
|
7808019c43
|
新增核算时间变量
|
2022-11-24 17:33:48 +08:00 |
|
钱涛
|
832b40e40a
|
新增核算时间变量
|
2022-11-24 17:21:16 +08:00 |
|
sy
|
e412be8d5e
|
薪酬系统-福利台账，退差数据编辑、删除后，刷新bill_batch表中统计数据
|
2022-11-24 14:19:58 +08:00 |
|
sy
|
bbc58281f3
|
薪酬系统-福利台账，调差保存v2
|
2022-11-24 13:29:40 +08:00 |
|
sy
|
931b3d8a82
|
薪酬系统-福利台账，修改退差数据单条查看返回格式v2
|
2022-11-24 11:04:12 +08:00 |
|
sy
|
dfcd7d88b0
|
薪酬系统-福利台账，修改退差数据单条查看返回格式
|
2022-11-24 10:43:20 +08:00 |
|
钱涛
|
c2371ffcb3
|
取消缓冲时间
|
2022-11-24 10:30:00 +08:00 |
|
sy
|
a631ecc3d9
|
Merge branch 'feature/v3-siAccountRecession-1117' into feature/v3-siAccountCompensation-1201
|
2022-11-24 09:48:30 +08:00 |
|
sy
|
d976ede775
|
薪酬系统-福利台账，退差数据新增后，刷新bill_batch表中统计数据
|
2022-11-24 09:46:06 +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 |
|
sy
|
0f50520aa9
|
薪酬系统-福利台账，抽取bill_batch表中统计数据刷新方法
|
2022-11-24 09:31:44 +08:00 |
|
sy
|
27dd8b4450
|
薪酬系统-福利台账，调差保存v1
|
2022-11-24 09:17:08 +08:00 |
|
钱涛
|
c5aa1aded7
|
缓存类
|
2022-11-23 18:36:33 +08:00 |
|
钱涛
|
2ab7049fa0
|
单个核算
|
2022-11-23 18:30:53 +08:00 |
|
钱涛
|
5221c22b5c
|
优化公式选择档案项目和薪资项目
|
2022-11-23 17:02:17 +08:00 |
|
sy
|
f1bd574c81
|
薪酬系统-福利台账，调差v2
|
2022-11-23 15:39:42 +08:00 |
|
钱涛
|
6405610456
|
计划任务日志
|
2022-11-23 15:24:29 +08:00 |
|
sy
|
edf9e22d22
|
薪酬系统-福利台账，福利核算接口添加返回当前核算人id
|
2022-11-23 15:01:28 +08:00 |
|
sy
|
d81883e3d2
|
薪酬系统-福利台账，调差v1
|
2022-11-23 14:49:44 +08:00 |
|
钱涛
|
829375d314
|
同步人员范围定时任务
|
2022-11-22 16:14:54 +08:00 |
|
钱涛
|
1307f485eb
|
同步人员范围
|
2022-11-22 15:53:05 +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 |