qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,832 Commits 293 Branches 39 Tags 49 MiB
Commit Graph

2707 Commits

Author SHA1 Message Date
sy 1c0b00d163 薪酬系统-福利档案，福利档案基数调整记录列表查询入参调整 2023-10-23 18:07:37 +08:00
Harryxzy 8499c8ee1b Merge branch 'release/个税版本' into custom/艾志工业-个税申报 2023-10-23 17:32:58 +08:00
钱涛 fe4e138317 个税调差累计字段对应 2023-10-23 14:44:26 +08:00
钱涛 026fa54a0e Merge branch 'release/2.9.6.2310.01' into release/个税版本 2023-10-23 10:07:24 +08:00
钱涛 328158204d 个税调差累计字段对应 2023-10-23 10:03:04 +08:00
钱涛 05b9a2a57e Merge branch 'feature/公式短路' into release/2.9.6.2310.01 2023-10-20 14:19:54 +08:00
钱涛 35550aa788 假期余额 2023-10-20 13:26:25 +08:00
钱涛 1f5edd039a Merge branch 'release/2.9.6.2310.01' into release/个税版本 2023-10-20 10:56:07 +08:00
钱涛 a19f86c624 一键累计bug修复 2023-10-20 10:29:46 +08:00
sy 1db16d6fa6 Merge remote-tracking branch 'remotes/origin/fix/231001-福利档案导入bug修复，档案主表查询人员ids分片' into release/2.9.6.2310.01 2023-10-20 09:51:39 +08:00
sy f8f5ea7782 薪酬系统-福利档案，薪资核算时调用福利核算数据查询时人员ids分片 2023-10-20 09:50:44 +08:00
钱涛 e19f00c44d Merge branch 'release/2.9.6.2310.01' into release/个税版本 2023-10-20 09:43:24 +08:00
钱涛 83e16cedf6 一键累计bug修复 2023-10-20 09:43:04 +08:00
钱涛 0dd9040408 一键累计bug修复 2023-10-19 17:35:33 +08:00
钱涛 81b9d65a22 过滤== 2023-10-19 16:26:23 +08:00
钱涛 6bbfc10c34 过滤== 2023-10-19 16:25:30 +08:00
钱涛 3745be2c5c 状态编码 2023-10-19 15:52:52 +08:00
sy d247353530 Merge remote-tracking branch 'remotes/origin/fix/231001-福利档案导入bug修复，档案主表查询人员ids分片' into release/2.9.6.2310.01 2023-10-19 14:31:49 +08:00
sy d0e0195709 薪酬系统-福利档案，导入时档案主表查询时人员ids分片 2023-10-19 14:30:58 +08:00
钱涛 18527f745e 修复自定义核算条件 2023-10-19 14:21:22 +08:00
钱涛 0d5f1ce6c7 Merge branch 'release/2.9.6.2310.01' into feature/公式短路 2023-10-18 17:12:22 +08:00
钱涛 213deb731c 调薪记录bug 2023-10-18 17:01:37 +08:00
钱涛 0ecb3a3977 短路处理 2023-10-18 16:01:37 +08:00
sy 96bc325b43 薪酬系统-福利档案，福利档案基数调整记录列表查询入参和返回数据调整 2023-10-18 15:13:08 +08:00
钱涛 dafde8451e 调薪记录bug 2023-10-18 14:20:32 +08:00
sy b9a681a791 薪酬系统-福利台账，线下对比中数值是否存在差异相关逻辑优化 2023-10-18 14:14:05 +08:00
sy 9ac549c06a 薪酬系统-福利档案，福利档案基数调整记录列表查询 2023-10-18 13:34:05 +08:00
sy e68359ef50 Merge branch 'fix/231001-福利台账，导入模板下载接口由get改为post' into release/2.9.6.2310.01 2023-10-18 09:48:19 +08:00
钱涛 5d7a6bc241 调薪记录 2023-10-17 18:04:47 +08:00
sy 0225e40e57 薪酬系统-福利档案，福利档案编辑保存逻辑中增加基数调整记录 2023-10-17 17:46:54 +08:00
Harryxzy 89715c8072 Merge branch 'release/2.9.6.2310.01' into custom/艾志工业-个税申报 2023-10-17 17:16:58 +08:00
钱涛 cf1e1395f7 拓扑图 2023-10-17 14:24:52 +08:00
sy e80a3497d9 薪酬系统-福利档案，福利档案导入逻辑中增加基数调整记录 2023-10-17 11:40:28 +08:00
钱涛 e8f124d58c Merge branch 'release/2.9.6.2310.01' into release/个税版本 2023-10-17 10:25:02 +08:00
钱涛 3443cd0dff 拓扑图 2023-10-17 10:24:30 +08:00
Harryxzy a34a5b9aa6 同步义务人人员范围到账套人员范围 2023-10-16 16:59:18 +08:00
钱涛 7e22c9836f 调整原因接口 2023-10-16 15:01:29 +08:00
钱涛 72fbd5f336 拓扑图暂存 2023-10-16 15:00:54 +08:00
Harryxzy 3c08916c84 Merge branch 'release/个税版本' into custom/艾志工业-个税申报 2023-10-16 11:38:43 +08:00
Harryxzy bfb03a36ed 艾志需求变更 2023-10-16 11:38:19 +08:00
钱涛 895d3065e9 账套拓扑图 2023-10-16 10:45:19 +08:00
钱涛 5d3e2928c9 Merge branch 'release/2.9.6.2310.01' into release/个税版本 2023-10-13 16:54:46 +08:00
钱涛 4a59859fa8 调薪记录 2023-10-12 17:34:09 +08:00
Harryxzy f70a7e6c96 Merge branch 'fix/231002_变量返回双引号或0' into release/2.9.6.2310.01 2023-10-12 14:28:10 +08:00
Harryxzy 07c1785714 Merge remote-tracking branch 'origin/release/2.9.6.2310.01' into release/2.9.6.2310.01 2023-10-12 14:27:57 +08:00
钱涛 db71ba0e5f fix null 2023-10-12 14:13:25 +08:00
Harryxzy fbc49bff98 公式变量为文本时返回””number返回0 2023-10-12 13:47:18 +08:00
sy 6ae953c723 薪酬系统-福利台账，补缴、补差导入模板下载接口改为post类型 2023-10-12 11:45:21 +08:00
钱涛 665dc7b36a fix重新核算bug 2023-10-11 19:55:09 +08:00
钱涛 7368363631 人员服务客户端 2023-10-11 18:24:02 +08:00
Harryxzy 575fb5ea10 Merge branch 'release/个税版本' into custom/艾志工业-个税申报 2023-10-11 16:53:44 +08:00
Harryxzy c83539460c 薪酬token 2023-10-11 15:54:08 +08:00
Harryxzy b71633d744 token 2023-10-11 15:28:58 +08:00
Harryxzy 03d3befbdd token 2023-10-11 14:07:23 +08:00
sy 28790c3ab0 薪酬系统-福利档案，艾志二开-档案编辑页中其他福利相关字段部分更换为劳务固定费 2023-10-10 17:51:47 +08:00
sy 92a7daa9fa 薪酬系统-福利台账，正常缴纳导入模板下载接口改为post类型 2023-10-10 16:17:44 +08:00
sy 79d28f751c 薪酬系统-福利方案、档案、台账，艾志二开-其他福利相关表述更换为劳务固定费 2023-10-10 13:46:06 +08:00
钱涛 59f24d3a14 Merge branch 'release/2.9.6.2310.01' into release/个税版本 2023-10-09 16:15:21 +08:00
钱涛 e570c1879e 账套保存异常 2023-10-09 15:35:20 +08:00
Harryxzy e25ea296e8 Merge remote-tracking branch 'origin/release/2.9.6.2310.01' into release/2.9.6.2310.01 2023-10-09 14:34:32 +08:00
Harryxzy 2766ceb276 自动同步考勤定时任务 2023-10-09 14:34:18 +08:00
钱涛 61b80e3ad1 Merge remote-tracking branch 'origin/release/2.9.6.2310.01' into release/2.9.6.2310.01 2023-10-09 14:17:25 +08:00
钱涛 39520346dc 解密 2023-10-09 14:17:15 +08:00
Harryxzy d69aa46e33 自动同步考勤定时任务 2023-10-09 14:10:09 +08:00
Harryxzy b63e4250be 艾志--薪资档案-往期累计档案页面调整 2023-10-09 14:05:39 +08:00
钱涛 dada3a0633 去除objectuutil 2023-10-09 10:43:43 +08:00
钱涛 d5f5cb07ba Merge branch 'release/2.9.6.2310.01' into release/个税版本 2023-10-08 16:21:12 +08:00
钱涛 5f152a991b 核算自定义其他搜索条件 2023-10-08 15:44:09 +08:00
钱涛 182e90676c Merge branch 'feature/自定义筛选条件' into release/2.9.6.2310.01 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
 2023-10-08 14:24:33 +08:00
钱涛 26bbc9c0ee Merge branch 'release/2.9.6.2310.01' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
 2023-10-08 14:21:25 +08:00
钱涛 8166e76081 账套增加状态字段 2023-10-08 13:38:37 +08:00
sy 26e9fc90e1 薪酬系统-福利台账，修复未设置基数情况下存在的核算失败问题 2023-10-08 11:12:16 +08:00
钱涛 138f832537 时效性过滤 2023-10-08 10:11:07 +08:00
钱涛 b6508067f1 过滤枚举 2023-10-08 09:16:54 +08:00
钱涛 37e9b3c33c sql可以使用薪资项目作为变量 2023-10-07 17:00:02 +08:00
钱涛 d98933832a Merge branch 'feature/生成签名pdf' into release/2.9.6.2310.01 
# Conflicts:
#	src/com/engine/salary/web/SalaryBillController.java
 2023-10-07 15:19:38 +08:00
钱涛 67a9d45630 工资单时效设置 2023-10-07 14:47:32 +08:00
钱涛 5241972151 工资单时效设置 2023-10-07 14:46:28 +08:00
钱涛 6fe4b855ec Merge branch 'fix/核算效率' into release/2.9.6.2310.01 2023-10-07 10:05:49 +08:00
钱涛 4c5bc5dda7 增加状态 2023-09-28 17:05:42 +08:00
钱涛 6e889ccc70 同步字段名称到项目公式 2023-09-27 17:17:56 +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
钱涛 4ed4edc9ed pdf按钮控制 2023-09-27 14:19:52 +08:00
钱涛 7562b4e4a3 Merge branch 'feature/生成签名pdf' into feature/自定义筛选条件 2023-09-27 14:01:32 +08:00
sy a753a0fb0a 薪酬系统-福利档案，艾志二开-薪资档案列表、导入、导出相关功能改造，适配登录人可查阅部门相关人员档案逻辑 2023-09-27 11:19:29 +08:00
钱涛 07291fb20a 取消sqlserver自动分片 2023-09-27 10:50:05 +08:00
钱涛 568c62122a 取消sqlserver自动分片 2023-09-27 10:49:55 +08:00
钱涛 763393983c 工资单pdf 2023-09-26 17:52:46 +08:00
钱涛 309e89ceaa 异步处理核算报表数据 2023-09-26 17:35:23 +08:00
钱涛 a7e8498b98 取消核算报表数据 2023-09-26 17:18:27 +08:00
sy 98e732e210 薪酬系统-福利档案，艾志二开-福利档案全量增员、全量减员、取消停缴、删除档案改造 2023-09-26 16:08:43 +08:00
钱涛 f99bb21bab 修复核算效率 2023-09-26 14:29:12 +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
钱涛 e37922c52f 工资单pdf 2023-09-26 10:26:12 +08:00
钱涛 1de83a57c2 工资单pdf 2023-09-26 10:00:00 +08:00
钱涛 5d203b0783 自定义搜索 2023-09-25 16:53:01 +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
钱涛 faeafbe5ad 暂存 2023-09-25 15:38:14 +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
钱涛 5602d65ed8 Merge branch 'release/2.9.5.2309.01' into release/个税版本 
# Conflicts:
#	resource/WEB-INF/prop/hrmSalaryCustom.properties
 2023-09-22 17:59:06 +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
钱涛 9ab80de441 工资单pdf和签名 2023-09-20 14:45: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
钱涛 12480f8306 生成工资单pdf签名 2023-09-18 18:45:59 +08:00
Harryxzy 5f1ef51892 报表共享temp 2023-09-18 18:20:53 +08:00
sy 5538a7d01e 薪酬系统-福利方案，增加查询功能 2023-09-18 16:30:52 +08:00
钱涛 6b97efde4d 往期累计新增字段的加解密 2023-09-18 14:43:02 +08:00
钱涛 88a59d3d01 处理空指针 2023-09-18 13:49:25 +08:00
钱涛 7b3f7b2e39 签名 2023-09-18 10:25:43 +08:00
sy 3826e89a72 薪酬系统-福利台账，福利核算逻辑优化，支持未设置基数，仅设置固定值的福利档案的核算 2023-09-15 15:38:20 +08:00
Harryxzy 7db0a475ff Merge branch 'fix/230902-薪资账套复制缺少字段' into release/2.9.5.2309.01 2023-09-14 17:35:05 +08:00
Harryxzy 0675de75ed 修复复制账套时少复制 2023-09-14 17:32:01 +08:00
钱涛 2b13d0c7ef 定薪账套 2023-09-14 11:56:00 +08:00
sy 38bffb2a8b 薪酬系统-福利台账、档案，细化调差报错信息，编辑action修复新增个税扣缴义务人人员范围 2023-09-13 10:09:32 +08:00
sy 0ad4a63a6b Merge remote-tracking branch 'remotes/origin/fix/230901-福利档案编辑问题修复' into feature/230901-福利台账-调差，支持一个人存在多个调差记录 2023-09-12 11:30:12 +08:00
Harryxzy 489cfa9536 Merge branch 'release/2.9.5.2309.01' into custom/艾志工业-个税申报 2023-09-12 11:27:23 +08:00
sy eb1966b703 薪酬系统-福利档案，编辑后保存功能，校验档案人员是否为非系统人员逻辑问题修复 2023-09-12 11:21:48 +08:00
Harryxzy 59d3aa758d Merge branch 'release/个税版本' into custom/艾志工业-个税申报 
# Conflicts:
#	src/com/engine/salary/service/SalaryArchiveService.java
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
 2023-09-12 11:19:30 +08:00
Harryxzy 8c81fa6da1 Merge branch 'release/2.9.5.2309.01' into custom/艾志工业-个税申报 2023-09-12 11:12:00 +08:00
sy b276066b52 薪酬系统-福利台账，导入模板带出核算数据 2023-09-12 11:05:46 +08:00
sy 39971f726d Merge remote-tracking branch 'remotes/origin/feature/230901-福利档案-非系统人员tab' into release/2.9.5.2309.01 2023-09-08 17:02:03 +08:00
sy 3e7180a25e Merge remote-tracking branch 'remotes/origin/feature/230901-福利档案-非系统人员tab' into feature/230901-福利台账-调差，支持一个人存在多个调差记录 2023-09-08 16:57:32 +08:00
sy ec406b7f8a 薪酬系统-福利档案，福利档案编辑并减员、编辑并增员action 2023-09-08 16:57:09 +08:00
sy 9bd270e77d 薪酬系统-福利台账，调差支持一人多条记录 2023-09-08 13:24:27 +08:00
钱涛 83e0b1668e 往期累计 2023-09-07 18:21:22 +08:00
钱涛 02100c2ee3 有向无环拓扑排序 2023-09-07 15:15:59 +08:00
sy a8e118b33a 薪酬系统-非系统人员管理，导入时增加对多级部门的识别 2023-09-07 15:11:10 +08:00
Harryxzy 8ec5def53d Merge branch 'feature/230901-同步薪资项目至账套' into release/2.9.5.2309.01 2023-09-07 10:05:14 +08:00
sy a672c71e5a 薪酬系统-福利档案，导入初始、最后缴纳月取值逻辑优化 2023-09-06 17:39:09 +08:00
钱涛 464bb9d623 Merge branch 'release/个税二期' into release/个税版本 2023-09-06 17:06:07 +08:00
钱涛 34406cf843 Merge branch 'release/个税一期' into release/个税二期 2023-09-06 16:22:54 +08:00
钱涛 2ff2e8d48b Merge branch 'release/2.9.5.2309.01' into release/个税一期 2023-09-06 16:21:13 +08:00
钱涛 d0382ca239 核算优先级 2023-09-06 16:20:25 +08:00
钱涛 43cdf98411 核算优先级 2023-09-06 15:48:43 +08:00
Harryxzy e48f64e814 Merge branch 'fix/230801-修改jackson解析方法' into release/2.9.5.2309.01 
# Conflicts:
#	src/com/engine/salary/service/impl/FormulaRunServiceImpl.java
 2023-09-06 15:42:53 +08:00
钱涛 d03aed1d1b 核算优先级 2023-09-06 14:01:56 +08:00
钱涛 d49b33c66f Merge branch 'release/个税一期' into release/个税版本 2023-09-06 11:40:34 +08:00
钱涛 f9611212d4 个税解析 2023-09-06 11:40:22 +08:00
sy eb6fed2079 Merge remote-tracking branch 'remotes/origin/release/2.9.4.2308.02' into fix/230901-福利核算中处理核算结果逻辑中，查询sql分片 2023-09-06 10:17:41 +08:00
sy d7b9485d18 薪酬系统-福利台账，核算数据中间表查询分片 2023-09-06 10:17:20 +08:00
钱涛 1451c4b192 定位解析异常 2023-09-06 10:14:52 +08:00
钱涛 8de418b28b 定位解析异常 2023-09-06 10:13:22 +08:00
sy f6094cbc7a 薪酬系统-福利档案，非系统人员tab页列表 2023-09-06 10:04:58 +08:00
钱涛 6059174e7c 往期累计的在线获取 2023-09-06 09:40:50 +08:00
钱涛 f245bd2f49 新增往期累计字段 2023-09-05 11:04:53 +08:00
Harryxzy 6438558e7d Merge branch 'release/2.9.4.2308.02' into custom/艾志工业-个税申报 2023-09-04 17:44:45 +08:00
Harryxzy 6f2436d808 新建调薪调整返回数据，为null时不返回“null” 2023-09-04 16:38:18 +08:00
钱涛 9867728d2e 在线获取累计专项附加扣除 2023-09-04 16:18:02 +08:00
钱涛 96bfdf05ed 在线获取累计专项附加扣除 2023-09-04 14:20:42 +08:00
Harryxzy 887280c763 Merge branch 'release/个税一期' into custom/艾志工业-个税申报 2023-09-04 14:16:11 +08:00
Harryxzy 32716cb504 Merge branch 'release/2.9.4.2308.02' into custom/艾志工业-个税申报 
# Conflicts:
#	src/com/engine/salary/service/SalaryArchiveService.java
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
 2023-09-04 13:06:33 +08:00
钱涛 552eaa4589 Merge branch 'release/个税一期' into release/个税二期 2023-09-04 09:30:55 +08:00
钱涛 6871316f98 Merge branch 'release/2.9.4.2308.02' into release/个税一期 
# Conflicts:
#	resource/WEB-INF/prop/hrmSalaryCustom.properties
#	src/com/engine/salary/service/SalaryEmployeeService.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
 2023-09-04 09:30:24 +08:00
钱涛 c0c29b7472 在线获取累计专项附加扣除 2023-09-04 09:29:00 +08:00
钱涛 7c5e373b01 2 2023-09-01 09:23:43 +08:00
钱涛 0ac2fd248e 慢sql提醒 2023-08-31 16:22:02 +08:00
钱涛 2fad3c6c7c Merge branch 'feature/慢sql检测' into release/2.9.4.2308.02 2023-08-31 15:46:29 +08:00
钱涛 283485929f 超时提醒 2023-08-31 15:31:34 +08:00
钱涛 feeb3d21f2 公式检测 2023-08-31 14:39:58 +08:00
sy fac2bc21e0 Merge remote-tracking branch 'remotes/origin/feature/230802-ST数据库适配' into release/2.9.4.2308.02 2023-08-31 14:18:46 +08:00
sy bc21cc7a2e 薪酬系统-福利档案，导入模板带出数据时，参考当前搜索条件 2023-08-31 14:18:00 +08:00
Harryxzy f16f62304c Merge branch 'feature/230901-自动同步结束发薪日期' into release/2.9.4.2308.02 2023-08-31 13:57:49 +08:00
Harryxzy b90066e8b7 fixbug 2023-08-31 13:03:04 +08:00
Harryxzy 6ca1c6eae3 Merge branch 'fix/230802-薪资核算编辑时保留小数位数' into release/2.9.4.2308.02 2023-08-31 11:13:46 +08:00
Harryxzy dbe659d81d Merge branch 'fix/2309101-工资单模板给无分类项目重命名bug' into release/2.9.4.2308.02 2023-08-31 10:39:58 +08:00
钱涛 f7f1a85441 流量不足提醒 2023-08-31 10:34:26 +08:00
Harryxzy 2934a88cc2 同步薪资项目至账套 2023-08-31 10:23:14 +08:00
sy a23e62052c Merge remote-tracking branch 'remotes/origin/feature/230802-福利档案-档案相关action' into release/2.9.4.2308.02 2023-08-31 09:34:39 +08:00
Harryxzy 190bbe0875 同步薪资项目至账套 2023-08-31 09:24:41 +08:00
Harryxzy 64f64c4f89 自动同步离职人员结束发薪日期 2023-08-30 15:34:54 +08:00
钱涛 8564f2e6d6 显示提醒人信息 2023-08-30 15:21:17 +08:00
sy bf48341655 薪酬系统-福利档案，全量增减员过滤掉非系统人员 2023-08-30 15:10:25 +08:00
Harryxzy 4467f57928 工资单模板新建时重命名无分类名字消失bug 2023-08-30 13:26:25 +08:00
Harryxzy bd75ef8d3b 自动同步离职人员社保档案、薪资档案最后缴纳日期 2023-08-30 13:09:56 +08:00
钱涛 7a06fc73f4 fix操作记录创建人 2023-08-30 10:47:41 +08:00
Harryxzy c2ae65ff79 Merge branch 'fix/230802-添加非系统人员时误删除taxagentEmp数据' into release/2.9.4.2308.02 2023-08-30 10:44:52 +08:00
Harryxzy c1893f9152 自动同步结束发薪日期temp 2023-08-30 10:41:00 +08:00
sy 8966730267 Merge remote-tracking branch 'remotes/origin/fix/230802-函数中增加福利项基数信息' into release/2.9.4.2308.02 2023-08-30 10:27:51 +08:00
sy 92d33534a0 Merge remote-tracking branch 'remotes/origin/feature/230802-福利档案-档案相关action' into release/2.9.4.2308.02 2023-08-30 10:26:56 +08:00
钱涛 cbafca9aab 1、邮件提醒 
2、em提醒
 2023-08-29 19:24:56 +08:00
钱涛 1c9cc632d3 智能算薪导出 2023-08-29 13:55:36 +08:00
sy 28fff1f519 薪酬系统-薪资档案，非系统人员导入模板带出数据中部门为null处理为空字符串 2023-08-29 11:46:06 +08:00
Harryxzy bd1a6b7a9a 在个税扣缴义务人非系统人员添加人员时，会误删除正常人员范围在hrsa_tax_agent_emp中的数据 2023-08-28 22:22:00 +08:00
钱涛 4644f34bbb 人员和在线申报流量使用 2023-08-28 16:48:52 +08:00
钱涛 d633386bbf 保存流量使用记录 2023-08-28 15:46:56 +08:00
钱涛 1b4c9ce7a7 流量不足提醒 2023-08-28 15:19:57 +08:00
钱涛 b5f9477c90 流量监控 2023-08-28 13:31:11 +08:00
钱涛 c1db3883b0 核算时暴露日期解析异常 2023-08-27 20:10:31 +08:00
Harryxzy 355403a6b6 Merge remote-tracking branch 'origin/release/230803对接个税' into custom/艾志工业-个税申报 2023-08-25 17:55:57 +08:00
钱涛 c29c032ef5 申报表加解密 2023-08-25 17:37:39 +08:00
钱涛 9caf8126f2 重新核算校验 2023-08-25 17:17:51 +08:00
Harryxzy e83db15bc7 薪资档案、薪资核算编辑前端控制保留位数 2023-08-25 15:09:12 +08:00
Harryxzy 9a25668829 艾志修改社保福利方案信息 2023-08-25 14:35:41 +08:00
钱涛 3bc0f59d0a 去除为空校验 2023-08-24 18:20:17 +08:00
Harryxzy bc3cddfe38 Merge branch 'feature/230802-福利方案-修改方案明细接口' into custom/艾志工业 2023-08-24 16:51:16 +08:00
钱涛 45e69cd6c8 导出 2023-08-24 11:36:17 +08:00
sy d94ee07de6 薪酬系统-福利方案，处理合并冲突 2023-08-24 09:17:39 +08:00
sy f925943b31 Merge remote-tracking branches 'remotes/origin/feature/230802-福利方案-修改方案明细接口' and 'remotes/origin/fix/230802-优化福利台账导出合计列' into feature/230802-福利档案-档案相关action 2023-08-24 09:15:48 +08:00
sy a3b67ab091 薪酬系统-福利方案，福利方案明细数据修改接口，明细表更细sql优化 2023-08-23 18:39:02 +08:00
钱涛 2f2727c4b9 导出 2023-08-23 18:13:31 +08:00
sy 770074ba23 薪酬系统-薪资核算，非系统人员查询问题修复 2023-08-23 17:48:52 +08:00
sy 2048e9c489 薪酬系统-福利档案，福利档案减员、增员action 2023-08-23 16:52:32 +08:00
钱涛 9e416123dd 账套薪资项目添加code 2023-08-23 16:49:45 +08:00
钱涛 7e7615bf4a 账套薪资项目添加code 2023-08-23 16:20:45 +08:00
钱涛 0040580b51 个税对接v7 2023-08-23 15:46:18 +08:00
钱涛 fdc1df3dba 个税对接v6 2023-08-22 17:48:23 +08:00
sy c94f1b24a4 薪酬系统-福利档案，新增和编辑福利档案action、福利档案导入逻辑优化（仅修改设置值的数据） 2023-08-22 14:47:48 +08:00
钱涛 bb2d2d64e6 在线申报接口 2023-08-21 19:35:14 +08:00
sy 5f9fbde35a 薪酬系统-福利方案，福利方案明细数据修改接口，更新明细修改时间 2023-08-21 16:48:17 +08:00