Harryxzy
|
a9fb24145d
|
修复往期累计情况，无法导入编辑
|
2023-03-15 14:14:53 +08:00 |
|
Harryxzy
|
6418e4ad6e
|
往期累计情况，获取当月税款所属期数据无法导入bug，
|
2023-03-15 13:38:13 +08:00 |
 钱涛
|
db09f8047e
|
注释
|
2023-03-15 11:04:54 +08:00 |
sy
|
3059829619
|
Merge remote-tracking branch 'remotes/origin/release/2.7.1.2303.02' into feature/v4-salaryExcelFormat-0328
|
2023-03-15 10:22:37 +08:00 |
|
sy
|
acc382b835
|
薪酬系统-薪资核算，核算导出excel格式改造
|
2023-03-15 10:20:46 +08:00 |
|
钱涛
|
6f9769bae2
|
手机号
|
2023-03-15 10:07:40 +08:00 |
|
钱涛
|
5c75b3cf8e
|
去除无用代码
|
2023-03-14 14:22:45 +08:00 |
|
钱涛
|
b54d754c4b
|
删除个税扣缴义务人人员范围改异步
|
2023-03-14 11:04:25 +08:00 |
|
钱涛
|
2d091dbd33
|
异步同步人员校验
|
2023-03-10 17:15:15 +08:00 |
|
Harryxzy
|
351d892281
|
Merge branch 'fix/CancelSetPayEndDate' into release/2.7.1.2303.02
|
2023-03-10 15:43:24 +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 |
|
Harryxzy
|
8dabfb28b9
|
个税扣缴义务人删除人员范围时，不设置最后发薪日期
|
2023-03-10 13:50:52 +08:00 |
|
钱涛
|
cb6b53c6af
|
Merge remote-tracking branch 'origin/release/2.7.1.2303.02' into release/2.7.1.2303.02
|
2023-03-08 17:53:20 +08:00 |
|
钱涛
|
ff4dfe4dad
|
fix日期转换，申报表所属月不显示
|
2023-03-08 17:53:13 +08:00 |
|
sy
|
dbf9e878e5
|
Merge remote-tracking branch 'remotes/origin/feature/v4-addSiAcctLog-0309' into release/2.7.1.2303.02
|
2023-03-08 17:52:09 +08:00 |
|
Harryxzy
|
401947fabc
|
Merge branch 'fix/mySalaryBillNoWorkCode' into release/2.7.1.2303.02
|
2023-03-08 17:50:01 +08:00 |
|
钱涛
|
2c13c138a6
|
校验每次只能申报一个扣缴义务人
|
2023-03-07 17:44:21 +08:00 |
|
Harryxzy
|
4ce79438e6
|
工资单没有工号BUG
|
2023-03-07 17:43:51 +08:00 |
|
sy
|
3e03b5d920
|
薪酬系统-社保福利，福利核算进度条逻辑优化
|
2023-03-07 16:52:09 +08:00 |
|
sy
|
b6ee197fe6
|
薪酬系统,梳理Mapper类使用方式
|
2023-03-07 14:21:01 +08:00 |
|
Harryxzy
|
b702286995
|
考勤数据，详情数据 前端渲染方式改变
|
2023-03-07 11:36:45 +08:00 |
|
钱涛
|
890ff64215
|
mock接口
|
2023-03-06 19:45:48 +08:00 |
|
Harryxzy
|
762c484d36
|
个税扣缴义务人名称扩充至40
|
2023-03-03 15:47:30 +08:00 |
|
钱涛
|
9b8e89bf9f
|
去除lang3
|
2023-03-03 14:55:26 +08:00 |
|
Harryxzy
|
1cbd1d2958
|
自定义福利调整
|
2023-03-03 09:24:44 +08:00 |
|
sy
|
7f0d87a017
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siArchivesChangeByTaxRange-0302' into release/2.6.3.2303.01
|
2023-03-02 18:14:19 +08:00 |
|
钱涛
|
26b8996d42
|
公司名
|
2023-03-02 17:59:58 +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
|
6fe6dd6043
|
Merge remote-tracking branch 'origin/fix/V3_replenSalaryTemplateItemChange_0309' into release/2.6.3.2303.01
|
2023-03-02 17:19:04 +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 |
|
Harryxzy
|
50e1f2c432
|
Merge branch 'fix/V3_exportAddWorkCode' into release/2.6.3.2303.01
|
2023-03-02 17:18:10 +08:00 |
|
钱涛
|
6de22b142d
|
1、工资单模板
2、一键累计
|
2023-03-02 17:11:42 +08:00 |
|
Harryxzy
|
f48e98cb11
|
补发工资单模块，薪资项目名称修改时，展示同步修改
|
2023-03-02 14:51:51 +08:00 |
|
Harryxzy
|
50d6cc4d9a
|
往期累计情况，按照税款所属期月份进行展示
|
2023-03-02 14:04:12 +08:00 |
|
钱涛
|
e73ed7142f
|
正常核算工资单模板同步项目名称
|
2023-03-02 13:37:28 +08:00 |
|
钱涛
|
fd9b592384
|
修复核算未分类项目不显示
|
2023-03-02 11:25:25 +08:00 |
|
Harryxzy
|
fdb5774ae4
|
考勤引用列表改造
|
2023-03-02 11:23:57 +08:00 |
|
Harryxzy
|
56399c127b
|
社保福利方案自定义福利列表改造
|
2023-03-02 10:46:53 +08:00 |
|
钱涛
|
a37e874614
|
修复工资单模板显示问题
|
2023-03-02 10:41:21 +08:00 |
|
钱涛
|
a8fc666e79
|
fix json转换问题
|
2023-03-02 10:12:00 +08:00 |
|
Harryxzy
|
5455bc739a
|
Merge branch 'fix/V3_exportAddWorkCode' into develop
|
2023-03-01 16:20:25 +08:00 |
|
Harryxzy
|
e7f2d7b496
|
薪资档案导出，添加工号
|
2023-03-01 16:19:09 +08:00 |
|
钱涛
|
14bee7f6d5
|
修复未分类无法保存
|
2023-03-01 09:58:55 +08:00 |
|
钱涛
|
8c8d79aba3
|
档案字段删除
|
2023-02-27 18:27:11 +08:00 |
|
钱涛
|
0138351665
|
修复账套项目可删除
|
2023-02-27 17:51:26 +08:00 |
|
sy
|
3e2cf917ae
|
Merge branch 'feature/v4-siArchivesChangeByTaxRange-0302' into develop
|
2023-02-24 14:01:56 +08:00 |
|
sy
|
0e164b7989
|
薪酬系统-社保福利，福利档案增量数据处理直接在个税扣缴义务人人员范围变更时触发，不需打开福利档案列表触发
|
2023-02-24 13:53:57 +08:00 |
|
钱涛
|
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 |