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

1136 Commits

Author SHA1 Message Date
Harryxzy 40fc4ea13c 工资单定时发送 调整周期类型 2023-07-05 11:39:54 +08:00
Harryxzy 896e0c9e34 工资单定时发送 添加 发放周期 2023-07-05 09:59:45 +08:00
Harryxzy c78839d8c0 工资单定时发送 添加 发放周期 2023-07-04 18:03:57 +08:00
Harryxzy c8cf6090ff 系统薪资项目可配置删除、工资单模板默认没有隐藏项目 2023-07-04 13:21:19 +08:00
钱涛 82ab6c1e11 非系统算税功能 2023-07-04 09:32:12 +08:00
钱涛 a37d6758bb 核算状态标识 2023-07-03 14:27:20 +08:00
钱涛 1403b22cf7 修复邮件保存 2023-07-03 14:02:34 +08:00
Harryxzy 11c416601d 工资单定时发送渲染bug 2023-07-03 11:21:49 +08:00
Harryxzy faa2b9c16e 工资单模板信息 2023-07-03 09:44:10 +08:00
Harryxzy 9842784297 工资单定时发送 - 模板保存 2023-06-30 15:58:55 +08:00
sy 041303275b Merge remote-tracking branch 'remotes/origin/release/2.8.4.2306.02' into feature/230602-数据库适配-PG 2023-06-27 15:09:12 +08:00
sy d65a792076 Merge remote-tracking branch 'remotes/origin/release/2.8.4.2306.02' into feature/230602-数据库适配-PG 2023-06-27 15:05:22 +08:00
sy 1ed02f4d07 薪酬系统-福利台账，(修改台账列表返回台账状态值返回逻辑)——暂时取消 2023-06-27 15:05:07 +08:00
钱涛 6f3593f44b Merge branch 'feature/短信验证码' into release/2.8.4.2306.02 
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
#	src/com/engine/salary/sys/constant/SalarySysConstant.java
 2023-06-26 13:54:56 +08:00
Harryxzy ca248ded98 发送邮件修复bug 2023-06-26 13:32:14 +08:00
Harryxzy 7c44a2ad6b Merge branch 'feature/waterMark' into release/2.8.4.2306.02 
# Conflicts:
#	src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
#	src/com/engine/salary/web/SalaryBillController.java
 2023-06-26 13:28:21 +08:00
Harryxzy a43123efc0 Merge branch 'fix/DBType修改' into release/2.8.4.2306.02 2023-06-26 13:26:27 +08:00
Harryxzy 0117624dc4 Merge branch 'fix/回算后无法发放第二次工资单' into release/2.8.4.2306.02 2023-06-26 13:25:36 +08:00
Harryxzy 5ecba7fa3e Merge branch 'feature/taxDeclarationWithdraw' into release/2.8.4.2306.02 2023-06-26 13:25:01 +08:00
sy cbcd53d92d 薪酬系统-福利台账，修改台账列表返回台账状态值返回逻辑 2023-06-26 10:56:03 +08:00
sy f2cca4cfd7 Merge remote-tracking branch 'remotes/origin/fix/DBType修改' into feature/230602-数据库适配-PG 2023-06-26 10:15:24 +08:00
钱涛 50fa724756 采用线程池发送邮件 2023-06-26 10:11:54 +08:00
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
钱涛 57798a8e3e 短信验证码功能 2023-06-14 15:51:26 +08:00
Harryxzy b544c5e2c1 水印预览 2023-06-13 10:02:11 +08:00
Harryxzy b60904cc03 水印 - 邮件水印不支持图片 2023-06-12 18:55:27 +08:00
Harryxzy 7a40a31d6f 水印 - 暂存2 2023-06-12 15:19:24 +08:00
Harryxzy c37750b538 撤回个税申报 2023-06-12 10:40:01 +08:00
Harryxzy 76977331af 暂存 2023-06-09 17:57:17 +08:00
Harryxzy b2f39f56e2 Merge branch 'fix/sysSalaryItemSearchBUG' into release/2.8.3.2306.01 2023-06-09 09:50:25 +08:00
Harryxzy 5bee0f3b4d Merge branch 'feature/salalryItemAndFieldSort' into release/2.8.3.2306.01 2023-06-09 09:48:56 +08:00
Harryxzy e24579f363 Merge branch 'feature/statisticDataPerspective' into release/2.8.3.2306.01 2023-06-09 09:48:27 +08:00
Harryxzy e464ca8ba6 薪资账套中薪资项目可以删除 2023-06-08 15:30:52 +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
钱涛 7701420430 邮件去除图片 2023-06-07 17:19:00 +08:00
Harryxzy deaa9acfa0 Merge branch 'release/2.8.3.2306.01' into feature/statisticDataPerspective 2023-06-07 15:44:51 +08:00
Harryxzy 4617005e1f 数据透视功能 2023-06-07 15:43:23 +08:00
钱涛 77e9b0a74b Merge branch 'release/2.8.3.2306.01' into feature/短信邮件 2023-06-07 15:12:40 +08:00
Harryxzy a6356a7d3d Merge branch 'feature/salalryItemAndFieldSort' into release/2.8.3.2306.01 2023-06-07 12:27:29 +08:00
Harryxzy f4627b53f9 fix没有公式id内容bug 2023-06-07 12:23:05 +08:00
钱涛 d4c8a66fcf 注释优化 2023-06-07 09:31:46 +08:00
Harryxzy 1584a27fe8 个税扣缴义务人排序 2023-06-06 14:44:00 +08:00
钱涛 4358dc20a5 Merge branch 'release/2.8.3.2306.01' into feature/短信邮件 2023-06-06 14:24:23 +08:00
钱涛 993db67601 公共进度条功能 2023-06-06 10:30:49 +08:00
钱涛 4582ab1e51 邮件审批方法 2023-06-06 09:51:07 +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
sy f8e9e8513d Merge remote-tracking branch 'remotes/origin/feature/v4-addWorkcodeQuery-0601' into release/2.8.3.2306.01 2023-06-05 09:17:54 +08:00
钱涛 0da2bfa55a 邮件暂存 2023-06-02 14:38:56 +08:00
Harryxzy 74c5b4f19f 薪资项目 和 字段管理的排序 2023-06-01 17:52:31 +08:00
钱涛 4be4acc5d8 Merge branch 'release/2.8.3.2306.01' into feature/短信邮件 
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
 2023-06-01 11:49:16 +08:00
钱涛 0472c7b757 显示字段管理默认使用列 
报表空数据处理
 2023-06-01 11:05:15 +08:00
sy fb03cf98a7 薪酬系统，福利台账、薪资档案、薪资核算增加工号查询 2023-05-31 11:49:40 +08:00
Harryxzy 601b90d188 薪资档案薪资项目排序 2023-05-31 09:55:24 +08:00
Harryxzy af07cfd930 Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01 2023-05-25 17:12:15 +08:00
Harryxzy 25ffd06dd4 修复编辑薪资核算没有未分类 2023-05-25 17:06:03 +08:00
钱涛 399a615be6 人员明细 2023-05-25 13:51:27 +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 20262169c9 Merge branch 'fix/salaryAcctResutAutoLock' into release/2.8.2.2305.02 2023-05-22 14:02:28 +08:00
钱涛 1534b0257d Merge branch 'feature/公式v2' into release/2.8.2.2305.02 2023-05-17 15:08:16 +08:00
钱涛 7ccf8cf607 字段管理不显示默认使用列 2023-05-17 14:59:12 +08:00
钱涛 a7cc99fdd3 公式异常信息 2023-05-16 18:01:38 +08:00
Harryxzy 083916eb0c 薪资核算编辑 带上公式 2023-05-16 15:41:11 +08:00
Harryxzy a3ee91db15 回算后不允许删除薪资核算记录 2023-05-16 15:05:02 +08:00
Harryxzy a6fc40a084 薪资核算 编辑列改造 2023-05-16 14:12:49 +08:00
Harryxzy 7c74149184 薪资核算导入 选择字段根据分类分组 2023-05-15 18:02:22 +08:00
Harryxzy 4ff15ca651 薪资核算结果编辑导入 记录 2023-05-15 10:28:17 +08:00
Harryxzy b0084cad9c 薪资核算编辑 手动编辑后自动锁定 2023-05-11 14:40:10 +08:00
Harryxzy 54ca46c653 薪资核算导入项自动锁定 2023-05-11 10:51:43 +08:00
钱涛 c87db92ee8 公式扩展核算基本信息和核算日期 2023-05-10 14:26:39 +08:00
钱涛 6b19445a1a Merge branch 'release/2.8.2.2305.02' into feature/公式 
# Conflicts:
#	src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
 2023-05-08 11:22:23 +08:00
钱涛 8228fbf21c 短信邮件 2023-05-08 09:27:20 +08:00
钱涛 7e940b4db4 减少单次核算的人员 2023-05-05 17:15:25 +08:00
钱涛 41e95ceadf 字段管理不显示id 2023-05-05 15:32:55 +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
钱涛 40cd70e2a3 Merge branch 'release/2.7.4.2304.02' into feature/公式 2023-04-25 17:39:33 +08:00
钱涛 77ce806b37 sysadmin不显示申报记录 2023-04-25 10:43:40 +08:00
钱涛 24dfa57850 报表 2023-04-24 14:09:27 +08:00
钱涛 36863c3695 报表 2023-04-23 10:14:32 +08:00
钱涛 a19b19e23d 公式 2023-04-19 10:15:01 +08:00
sy 62af02522c 薪酬系统-福利台账，线下对比（列表、导入、导出）福利项字段根据正常缴纳中的核算字段获得 2023-04-18 14:21:05 +08:00
钱涛 4c41b35b2b 外部人员档案优化 2023-04-17 15:31:56 +08:00
钱涛 f619878f2c 暂存 2023-04-17 10:10:39 +08:00
钱涛 5cb6752c4c Merge branch 'release/2.7.3.2304.01' into feature/外部人员 2023-04-13 17:32:17 +08:00
钱涛 a87c344581 个人养老金 2023-04-13 17:14:58 +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
钱涛 58dbdb0d05 养老金 2023-04-12 09:39:53 +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 a286ac6f44 Merge branch 'fix/salaryArchiveImportByRuleBug_0407' into release/2.7.3.2304.01 2023-04-11 10:18:54 +08:00
钱涛 ce0b8ce186 暂存 2023-04-10 12:43:48 +08:00
Harryxzy d9f041c9bb 账套删除前校验是否存在工资单模板 2023-04-07 16:06:47 +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 295331d1a5 按照工号导入，支持不输入姓名 2023-03-30 09:49:49 +08:00
Harryxzy 2fc4560488 薪资档案按照工号导入无效 2023-03-29 16:46:10 +08:00
钱涛 052eebe83a 解决工资单人名缺失 2023-03-16 19:17:33 +08:00
钱涛 f79569fe4f 解决工资单人名缺失 2023-03-16 17:19:02 +08:00
Harryxzy 3304ffdbd5 薪资核算导入，添加表头字段缓存功能 2023-03-16 16:19:23 +08:00
钱涛 8430397d03 外部人员终极版 2023-03-16 16:10:29 +08:00
钱涛 62d124efb1 外部人员终极版 2023-03-15 22:48:01 +08:00
钱涛 81650888c7 非系统人员 2023-03-15 18:21:04 +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
钱涛 6f9769bae2 手机号 2023-03-15 10:07:40 +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
钱涛 a61b7ac7bc 外部人员 2023-03-13 16:04:19 +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
钱涛 ff4dfe4dad fix日期转换，申报表所属月不显示 2023-03-08 17:53:13 +08:00
钱涛 487dd9f972 非系统人员档案自动化 2023-03-08 16:36:47 +08:00
钱涛 890ff64215 mock接口 2023-03-06 19:45:48 +08:00
钱涛 88de36f260 Merge branch 'release/2.7.1.2303.02' into feature/外部人员 2023-03-06 13:59:36 +08:00
钱涛 a5596d503f 外部人员基础信息 2023-03-03 16:57:52 +08:00
Harryxzy 762c484d36 个税扣缴义务人名称扩充至40 2023-03-03 15:47:30 +08:00
钱涛 79a29df0de 暂存 2023-03-03 14:40:17 +08:00
Harryxzy 1cbd1d2958 自定义福利调整 2023-03-03 09:24:44 +08:00
钱涛 ca20ed8ca2 Merge branch 'release/2.6.3.2303.01' into feature/外部人员 2023-03-02 19:48:40 +08:00
钱涛 6de22b142d 1、工资单模板 
2、一键累计
 2023-03-02 17:11:42 +08:00
Harryxzy fdb5774ae4 考勤引用列表改造 2023-03-02 11:23:57 +08:00
钱涛 a37e874614 修复工资单模板显示问题 2023-03-02 10:41:21 +08:00
钱涛 1568b1e03d 外部人员基础类 2023-03-01 09:05:03 +08:00
钱涛 0138351665 修复账套项目可删除 2023-02-27 17:51:26 +08:00
钱涛 26a6327d44 调薪bug 2023-02-23 18:09:05 +08:00
钱涛 245803cfe8 获取人员状态 2023-02-23 10:28:27 +08:00
钱涛 ee5e5fa127 调薪说明 2023-02-22 19:12:53 +08:00
钱涛 41c56b1bd4 调薪说明 2023-02-22 19:07:13 +08:00
钱涛 49cd56e359 档案列表重构 2023-02-21 18:05:58 +08:00
钱涛 8e31cec138 Merge branch 'feature/公式改造' into release/2.6.2.2302.02 2023-02-21 14:48:43 +08:00
钱涛 4f22df09f0 支持6位小数 2023-02-20 14:40:18 +08:00
钱涛 dc24b03efd 薪资项目删除校验 2023-02-17 15:58:33 +08:00
钱涛 da9b548480 公式 2023-02-17 10:54:18 +08:00
钱涛 1d0a02554e 公式 2023-02-16 14:53:03 +08:00
钱涛 a2e9c482a4 修复账套根据名称查询bug 
去除调整前后值的限制
 2023-02-15 16:38:54 +08:00
钱涛 4f0dc060ee Merge branch 'feature/档案调整为空时不生效' into release/2.6.2.2302.02 2023-02-14 16:00:05 +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
钱涛 0f9222e1e4 fix年终奖申报备注为0 2023-02-09 19:03:53 +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
钱涛 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
Harryxzy 69dd9cc61c 个税扣缴义务人、薪资账套 导入添加员工状态导入功能 2023-02-08 17:48:14 +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 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
钱涛 857c39bd2d 年终奖 2023-01-30 17:32:58 +08:00
sy ae6822dc91 薪酬系统-福利方案，福利方案对象的相关数据载体（po,dto）增加缴纳周期相关新字段，并对sql中的查询字段进行添加 2023-01-30 17:29:07 +08:00
钱涛 d881b63327 年终奖 2023-01-29 14:58:51 +08:00
fcli 80019a029c feat: 获取部分字段 2023-01-28 13:56:02 +08:00
fcli bd2597541d feat: 字段管理 2023-01-18 09:38:43 +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 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 fd470c56aa 薪资账套人员范围导入 2023-01-09 15:12:44 +08:00
sy b33771d9e4 薪酬系统-福利档案，列表数据展示添加入职日期、离职日期字段 2023-01-09 14:49:58 +08:00
Harryxzy 09ba495bf3 个税扣缴义务人批量导入功能 2023-01-09 10:01:47 +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 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 af15ffcc23 薪酬系统-福利台账，补缴新增功能改造v1 2022-12-27 14:01:08 +08:00
Harryxzy d7127e29e4 薪资档案中默认显示工号 2022-12-26 14:58:41 +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 ddea8c9066 回算工资单发放调整 2022-12-19 11:12:26 +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
Harryxzy 4ed3f47b36 薪资账套修改回算公式后不生效问题 2022-12-14 22:34:12 +08:00
Harryxzy 5f37281757 添加backcalctype 2022-12-14 18:21:25 +08:00
Harryxzy 27602626cf 回算加密 2022-12-14 13:57:03 +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 d3de862d11 feat: 加密统一,薪资项目&社保档案详情... 2022-12-13 17:14:27 +08:00
Harryxzy 3b6418263f 薪资账套复制-薪资回算 
薪资核算-回算部分四舍五入
 2022-12-13 16:39:39 +08:00
fcli 1c6acb497c feat: 加密统一，累计附加扣除详细 2022-12-13 10:49:51 +08:00
fcli eabc983100 feat: 加密统一，社保福利档案&薪资核算结果 2022-12-13 10:15:31 +08:00
fcli 1431308cc5 feat: 加密统一，薪资核算结果 2022-12-12 16:42:44 +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
钱涛 8dc2ddc3c8 加密方法 2022-12-12 09:37:15 +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
fcli fcca6950ac feat: 修复bug 2022-12-08 15:45:15 +08:00
Harryxzy ce76bc8b43 薪资账套list返回个税扣缴义务人id 2022-12-08 15:42:21 +08:00
钱涛 0d417f1e49 流程生成人员范围 2022-12-07 20:15:52 +08:00
Harryxzy aed596523f 公司单发放详情报错 2022-12-07 18:00:31 +08:00
sy ccfffc200e 薪酬系统-福利台账，补差数据导入功能 2022-12-07 17:09:53 +08:00
钱涛 b39587e19d 单独调薪action 2022-12-06 18:08:50 +08:00
Harryxzy c0d916c286 薪资回算功能，工资单部分 2022-12-06 15:29:08 +08:00
sy bea06f1d88 薪酬系统-福利台账，可调差人员列表功能返回格式增加target字段 2022-12-05 16:56:05 +08:00
钱涛 23dd15a568 批量调薪action 2022-12-05 16:01:08 +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
钱涛 ac0b0a7e25 公式提醒 2022-12-01 13:59:38 +08:00
sy 119640e272 薪酬系统-福利台账，在福利台账重新核算时，删除调差数据时增加人员id筛选 2022-12-01 10:50:34 +08:00
sy 5436742c74 薪酬系统-福利台账，社保调差列表查询功能优化 2022-11-30 17:57:25 +08:00
钱涛 6cffbf4db7 取消安全级别 2022-11-30 16:59:58 +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 8bc16ae470 Merge branch 'master' into feature/v3-siAccountCompensation-1201 2022-11-28 14:58:23 +08:00
sy 8d211c7db0 薪酬系统-福利台账，社保调差保存v1 2022-11-28 11:35:05 +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
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
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
钱涛 7808019c43 新增核算时间变量 2022-11-24 17:33:48 +08:00
钱涛 832b40e40a 新增核算时间变量 2022-11-24 17:21:16 +08:00
sy a631ecc3d9 Merge branch 'feature/v3-siAccountRecession-1117' into feature/v3-siAccountCompensation-1201 2022-11-24 09:48:30 +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 27dd8b4450 薪酬系统-福利台账，调差保存v1 2022-11-24 09:17:08 +08:00
钱涛 2ab7049fa0 单个核算 2022-11-23 18:30:53 +08:00
sy d81883e3d2 薪酬系统-福利台账，调差v1 2022-11-23 14:49:44 +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
Harryxzy 5a3f035a41 修复定薪流程姓名重复BUG 2022-11-21 17:19:12 +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
Harryxzy a5ae8c8ea6 回算薪资项（薪资账套部分），剩余处理历史数据 2022-11-18 14:20:18 +08:00
钱涛 9a9a9cdaf3 Merge branch 'feature/加锁221117' into release/2.2.2.2211.03 2022-11-17 19:05:55 +08:00
Harryxzy 188096f931 Merge branch 'fix/salaryArchiveNoDataNEW' into release/2.2.2.2211.03 2022-11-17 19:04:58 +08:00
Harryxzy f19e4c2569 fix发薪日期为一个月最后一天时，薪资档案不显示NEW 2022-11-17 19:03:59 +08:00
钱涛 d07ded883f 修复加锁顺序 2022-11-17 18:53:22 +08:00
钱涛 10ffe88810 核算锁定 2022-11-17 15:17:49 +08:00
fcli 0f51d44cd4 Merge remote-tracking branch 'origin/release/2.2.2.2211.03' into release/2.2.2.2211.03 2022-11-17 14:43:59 +08:00
fcli 5743fa2162 feat: 其他附加扣除沿用上月功能完成 2022-11-17 14:28:10 +08:00
钱涛 271daf29be 批量锁定功能 2022-11-17 09:28:40 +08:00
Harryxzy 9f17c6e99a fixBUG 2022-11-16 17:22:22 +08:00
sy 7be9424f73 薪酬系统-福利台账，退差数据列表功能v2 2022-11-16 15:45:36 +08:00
Harryxzy 1e307e2f87 薪资回算，薪资账套中薪资回算项目展示 2022-11-16 15:18:43 +08:00
Harryxzy 94f3c9720a 回算功能-fix mybatis报错 2022-11-16 14:13:50 +08:00
sy a4924c19ee 薪酬系统-福利台账，退差数据列表功能v1 2022-11-16 14:05:43 +08:00
Harryxzy 00357cd9d8 回算功能-新建薪资账套默认 2022-11-16 10:32:05 +08:00
sy c339798dc8 薪酬系统-福利台账，退差数据导出功能v1 2022-11-16 09:48:17 +08:00
sy b647089eaf 薪酬系统-福利台账，退差数据新增功能v1 2022-11-15 17:58:37 +08:00
Harryxzy a3705c67a4 修改查看编辑调薪 2022-11-15 11:37:55 +08:00
fcli daa3d4ca9f feat: 薪资发放范围 2022-11-15 09:19:57 +08:00
Harryxzy 9dc6c61ed2 编辑调薪 2022-11-14 21:03:24 +08:00
sy 451968f122 Merge remote-tracking branch 'remotes/origin/master' into feature/v2-addWelfareArchives-1117 2022-11-11 08:56:30 +08:00
sy 647dd80a20 薪酬系统-福利档案，福利档案新增接口v1 2022-11-11 08:56:05 +08:00
fcli 459f7e5053 Merge branch 'feature/SpecialAddUpMerge' into release/2.1.3.2211.03 2022-11-10 09:33:22 +08:00
Harryxzy 095a0665b8 Merge branch 'feature/V2-taxDeclarationSwitch-11-10' into release/2.1.3.2211.03 2022-11-09 16:12:35 +08:00
fcli bf75c3831f fix: 一键累计添加日期 2022-11-09 15:39: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
fcli 5e69d07b7c feat: 专项附加扣除模块 2022-11-09 10:39:55 +08:00
Harryxzy 775580f994 --- 2022-11-09 10:20:46 +08:00
钱涛 f1f8ae53af 档案项目默认生效时间取起始缴纳日期 2022-11-03 19:32:51 +08:00
sy 3f6b549789 薪酬系统-福利模块基数保存问题 2022-11-02 20:08:04 +08:00
fcli 8873224123 Merge remote-tracking branch 'origin/release/2.1.2.2211.01' into release/2.1.2.2211.01 2022-11-02 17:33:26 +08:00
fcli 11f0a2c418 Merge branch 'fix/089' into release/2.1.2.2211.01 2022-11-02 17:32:49 +08:00
sy d3a9d71942 Merge remote-tracking branch 'remotes/origin/feature/v2-welfareBaseLimit-1104' into release/2.1.2.2211.01 2022-11-02 17:30:37 +08:00
sy 3cbf9b10e5 Merge branch 'feature/v2-oneToMoreBaseInfo-1104' into release/2.1.2.2211.01 2022-11-02 17:30:21 +08:00
sy ac241262f8 薪酬系统-福利档案展示问题修复 2022-11-02 14:14:12 +08:00
sy 51412603e5 薪酬系统-福利档案基数上下限相关逻辑 2022-11-01 17:17:33 +08:00
Harryxzy 5d97954e48 往期累计情况一键清空和删除所选 2022-10-31 19:21:13 +08:00
Harryxzy e8ac395300 fix-专项附加扣除taxAgentId为空 2022-10-31 16:04:06 +08:00
sy 60652dfbde 薪酬系统-福利档案高级搜索增加分部字段及相关逻辑 2022-10-31 16:00:46 +08:00
sy 9c54d1872f Merge remote-tracking branch 'remotes/origin/feature/v2-baseInfoOneToMore' into feature/v2-oneToMoreBaseInfo-1104 2022-10-31 09:56:58 +08:00
Harryxzy d525c59d6d Merge branch 'feature/V2-editDataCollection-11-03-tempDev' into feature/V2-editDataCollection-11-03 2022-10-28 16:38:17 +08:00
Harryxzy e046b7e3fe fix 一键清空 2022-10-28 16:35:51 +08:00
Harryxzy 09d85bdab3 考勤引用=编辑 2022-10-28 16:15:51 +08:00
sy d6ec6ca25d 薪酬系统-福利台账核算一对多改造，在正常缴纳和补缴核算功能中，获取带核算数据增加筛选项（个税扣缴义务人） 2022-10-28 15:25:58 +08:00
sy ab6811b818 薪酬系统-福利台账线下对比，数据对比逻辑优化 2022-10-28 15:23:03 +08:00
Harryxzy 1f29ac67eb 累计、其他免税、往期 新增、删除、一键清空、编辑功能 2022-10-28 14:08:27 +08:00
钱涛 e4200ee9f2 定薪流程 2022-10-28 10:19:06 +08:00
fcli 31982fc1db fix: 工资单发放页高级搜索功能不生效 2022-10-28 09:39:31 +08:00
钱涛 104213fc04 1、提示优化 
2、导入模板
3、定薪流程
 2022-10-27 15:17:22 +08:00
Harryxzy a406eed4b9 累计专项附加扣除-新增、删除所选、一键清空功能 2022-10-27 13:59:11 +08:00
sy 5daf7a1aff Merge remote-tracking branch 'remotes/origin/develop' into feature/v2-baseInfoOneToMore 2022-10-26 20:02:54 +08:00
sy 47220181ec 薪酬系统-福利档案一对多改造v2 2022-10-26 18:51:36 +08:00
Harryxzy c0bb94bf71 editDataCollection-2 2022-10-26 18:35:23 +08:00
钱涛 d72362f7b7 档案模板注释 2022-10-26 18:05:04 +08:00
sy 5a408e8bfc 薪酬系统-福利档案一对多改造v1,档案删除逻辑修改，档案id获取逻辑修改 2022-10-26 15:08:17 +08:00
钱涛 7a817af154 档案导入 2022-10-26 13:46:36 +08:00
sy 7279cfae05 薪酬系统-福利档案改造，增量逻辑调整，已有待增员档案直接删除，已有待减员档案不处理 2022-10-24 15:48:34 +08:00
sy 0000e52433 薪酬系统-福利档案改造，增量数据处理逻辑调整，对已有其他个税扣缴义务人的员工福利档案，不进行增量处理 2022-10-24 14:12:28 +08:00
sy b1122ae391 薪酬系统-福利档案改造，增量数据处理逻辑修复（待增员转换到停止缴纳） 2022-10-21 15:51:08 +08:00
sy 3ad40774dd 薪酬系统-福利档案,编辑栏字段显示null问题修复 2022-10-21 10:27:32 +08:00
sy 2a7c6cac42 薪酬系统-福利档案改造，福利台账线下对比列表仅展示处于在缴人员的数据 2022-10-20 16:08:48 +08:00
sy 99e0c22b4b 薪酬系统-福利档案改造，添加个税扣缴义务人删除人员时，待增员转为停止缴纳的逻辑 2022-10-20 14:09:36 +08:00
钱涛 6edd65a77e Merge branch 'feature/archive' into develop 2022-10-18 15:04:45 +08:00
钱涛 4b37775f78 档案发薪设置 2022-10-18 09:43:58 +08:00
sy 21fa422350 薪酬系统-福利档案结构改造，取消停缴功能优化和导入功能添加runStatus条件 2022-10-17 17:24:40 +08:00
钱涛 5102d51b09 Merge branch 'feature/archive' into develop 2022-10-17 10:03:58 +08:00
sy 3d714c2b8d Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy 2022-10-14 16:34:25 +08:00
sy 8a0e72f99c 薪酬系统-福利档案结构改造，档案列表接口返回结果优化 2022-10-14 16:34:10 +08:00
钱涛 77fc944491 获取保存档案配置表单 
保存档案配置
 2022-10-14 16:18:55 +08:00
Harryxzy 5233c85c81 Merge branch 'origin/feature/updateAndDeleteCustomCategory_xzy' into develop 2022-10-14 15:32:30 +08:00
Harryxzy 989dd13216 xzy-修改自定义福利名称 2022-10-14 15:17:56 +08:00
sy 0e6520f838 薪酬系统-福利档案结构改造，批量更改福利档案状态功能和取消停缴功能 2022-10-13 17:36:15 +08:00
sy 1aaa8ce43e Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy 2022-10-13 14:58:42 +08:00
钱涛 68076fc724 fix sqlserver增量数据空 2022-10-13 14:57:52 +08:00
sy fd63c16b93 薪酬系统-福利档案结构改造，福利档案中增量数据自动处理功能 2022-10-13 14:45:18 +08:00
sy 8d26f2ac46 薪酬系统-福利档案结构改造，福利档案中待减员数据自动处理功能 2022-10-12 17:17:06 +08:00
钱涛 a18b008581 Merge branch 'develop' into feature/archive 2022-10-11 14:43:21 +08:00
sy b2284d6669 Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy 2022-10-11 09:03:46 +08:00
sy b24c08474c 薪酬系统-福利档案结构改造，档案列表接口入参将runStatus调整为runStatuses，并修改对应逻辑 2022-10-10 16:58:43 +08:00
钱涛 9781b67ddb Merge branch 'develop' into feature/archive 2022-10-10 15:41:31 +08:00
Harryxzy 5c4380cbe0 xzy-fix-薪资档案中人员范围更新时bug 2022-10-10 10:53:51 +08:00
钱涛 5431ed9506 历史数据处理 2022-10-10 09:47:09 +08:00
sy 9b1c6222ed Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy 2022-10-10 09:37:03 +08:00
sy 85d46938da 薪酬系统-福利档案导入改造，增加基础信息表数据插入逻辑 2022-10-10 09:36:34 +08:00
Harryxzy 8c4050fe73 xzy-fix-薪资账套人员状态传参问题 2022-10-09 15:20:04 +08:00
sy 7ac7d58a5f 薪酬系统-福利档案列表查询改造 2022-10-09 15:12:54 +08:00
Harryxzy e3a2a52ab8 xzy-fix-薪资账套人员错误问题 2022-10-09 13:32:05 +08:00
sy ad16c96910 薪酬系统-福利档案基础信息表实体和mapper 2022-10-09 09:22:37 +08:00
Harryxzy b2b0abcaf5 xzy-fix-处理Employee_statuses历史数据 2022-10-08 17:21:38 +08:00
Harryxzy 6dcecfb1c1 xzy-fix-薪资账套 2022-10-08 16:00:08 +08:00
钱涛 4a20105260 Merge branch 'develop' into feature/archive 2022-10-08 11:42:54 +08:00
sy 44e4afbf72 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 
# Conflicts:
#	src/com/engine/salary/mapper/InsuranceExportMapper.java
#	src/com/engine/salary/mapper/InsuranceExportMapper.xml
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
 2022-09-29 11:29:17 +08:00
sy cec887a214 薪酬系统-福利台账，线下对比结果列表开发 2022-09-29 11:13:49 +08:00
钱涛 f8bb262906 档案 2022-09-29 09:32:29 +08:00
钱涛 e0d68d6417 档案状态 2022-09-28 15:11:15 +08:00
sy 78ce712116 薪酬系统-福利台账，线下对比excel数据导入功能 2022-09-27 17:36:06 +08:00
sy bd3e44442d 薪酬系统-福利台账，正常缴纳导出添加工号信息 2022-09-27 11:39:57 +08:00
钱涛 08ac0e8b84 fix离职日期 2022-09-27 10:57:02 +08:00
钱涛 66a39a07a3 Merge branch 'feature/order' into develop 
# Conflicts:
#	src/com/engine/salary/biz/SIAccountBiz.java
 2022-09-27 10:25:12 +08:00
钱涛 e2db30c816 排序 2022-09-27 10:19:09 +08:00
钱涛 6e726366ad 排序 2022-09-26 18:51:17 +08:00
sy 2d11bad723 薪酬系统-社保福利台账-核算-补缴项删除功能bug修复 2022-09-23 16:07:10 +08:00
Harryxzy d647f9fcc3 xzy-复制薪资账套时，复制薪资项目隐藏选项 2022-09-22 09:06:53 +08:00
Harryxzy 06175bfa82 xzy-fix-社保福利台账中总览人数不正确问题 2022-09-21 15:52:36 +08:00
钱涛 90c18ec201 定薪 2022-09-20 18:02:45 +08:00
sy 5b74873a6e Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-20 10:34:43 +08:00
Harryxzy 5866136334 Merge branch 'origin/fix/archivePower' into develop 2022-09-20 09:41:04 +08:00
Harryxzy 2c795fe94a xzy-fix-社保福利中社保方案、公积金方案等选择权限问题 2022-09-20 09:20:17 +08:00
钱涛 f678aa46d6 薪资档案排序 2022-09-19 18:21:34 +08:00
sy 7120d80689 薪酬系统-福利台账-补缴导入模板开发 2022-09-19 17:59:12 +08:00
钱涛 a7bd4a43d6 排序规则 2022-09-19 13:41:09 +08:00
sy a3ec7caf44 薪酬系统导入方式配置-薪资档案调薪/初始化-导入,添加导入人员筛选配置化处理 2022-09-15 17:54:59 +08:00
钱涛 8c0b9038d6 1、系统配置列表 
2、修复调薪周期对于核算的结果不准确
 2022-09-14 11:28:17 +08:00
钱涛 28551918c2 修复部门id和岗位id不显示 2022-09-08 10:13:57 +08:00
钱涛 06f6dcf8f2 Merge remote-tracking branch 'origin/develop' into develop 2022-09-07 09:46:02 +08:00
钱涛 8ff4e9e231 停薪操作 2022-09-07 09:45:37 +08:00
sy 5a6df5a257 福利核算结果干预功能，福利核算项列表接口、福利核算导入模板下载接口、福利核算干预数据导入接口 2022-09-06 17:13:33 +08:00
sy 85566329d9 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-02 12:47:36 +08:00
Harryxzy 0269506f78 xzy-fix当用户发薪日期为一个月最后一天时，薪资核算无数据bug 2022-09-02 12:41:58 +08:00
sy 79cab3629e 福利核算干预功能开发v1 2022-09-02 11:53:38 +08:00
钱涛 cc24406319 向上求偶 2022-09-01 16:17:27 +08:00
Harryxzy 387b6a2897 xzy-在薪资档案以及薪资核算的高级搜索中,增加分部搜索条件 2022-08-31 15:06:49 +08:00
钱涛 a13d56063b fix累计已预扣预缴税额，带入个税调差 2022-08-29 16:06:56 +08:00
Harryxzy e1239d3018 xzy-核算自定义列表添加分部 2022-08-29 14:50:26 +08:00
Harryxzy 6809839a2c Merge branch 'feature/addSalaryShowSwitch_xzy' into develop 2022-08-25 09:38:59 +08:00
Harryxzy 9244440a0d xzy-薪资项目显隐控制(修改传参itemHide为字符串) 2022-08-25 09:20:51 +08:00
钱涛 a4e6042adf 调薪流程按钮 2022-08-24 20:00:57 +08:00
钱涛 7dfe9ee732 福利方案分权 2022-08-24 12:03:04 +08:00
Harryxzy 289e685e09 xzy-薪资项目显隐控制 2022-08-24 10:31:42 +08:00
钱涛 b2704a84a4 Merge remote-tracking branch 'origin/develop' into develop 2022-08-18 15:05:46 +08:00
钱涛 e0a031e197 oracle异常 2022-08-18 15:02:04 +08:00
Harryxzy 4d0a73e030 xzy-解决社保福利方案删除时校验问题 2022-08-18 12:26:53 +08:00
钱涛 1969b44804 见分进角规则 2022-08-17 18:33:46 +08:00
钱涛 ddccbb0d78 导入核算结果时，添加sql项 2022-08-15 17:16:48 +08:00
钱涛 65cfe6c28a 去除无效代码 2022-08-09 16:54:29 +08:00
钱涛 deffd8e41f 薪资档案增加分部列 2022-08-09 10:09:55 +08:00
钱涛 24806d67f5 删除福利的扣缴义务人 2022-08-08 09:28:58 +08:00
钱涛 1eba64edd6 1、福利列表统一为个税扣缴义务人 
2、补缴导出无数据
 2022-08-04 15:09:40 +08:00
钱涛 d9bfd4d617 1、档案接口增强 
2、sql支持大写
3、合并计税搜索
 2022-08-04 11:45:26 +08:00
钱涛 a340f1aaaf 1、薪资核算时取账套下的人员范围，且这个人需要再账套所属的扣缴义务人下由档案，且起始发薪和最后发薪日期在这个薪资周期内 
2、福利核算的范围需要在扣缴义务人下，且三个起始结束日期在核算周期内
 2022-08-03 17:02:03 +08:00
钱涛 e9c95918eb 1、核算表头带上公式 
2、修复核算时取福利台账人员信息不准确
 2022-08-02 14:58:18 +08:00
钱涛 ab87e5cf08 劳务申报表列表 2022-08-02 10:59:12 +08:00
liuliang 28cc6e67f4 Merge branch 'feature_liuliang_20220726' into develop 2022-07-28 16:31:02 +08:00
liuliang f8c0f1b59d Merge branch 'fixbug_liuliang_recalculate' into develop 2022-07-28 16:30:27 +08:00
liuliang 1effdf42aa liuliang 2022-07-28 16:28:53 +08:00
钱涛 b6f8e857d2 1、档案导入初始化修复 
2、核算档案
3、取消入职、离职日期作为核算人员的筛选条件
 2022-07-28 15:42:25 +08:00
钱涛 259c40758f 1、薪资项目增加系统名 
2、薪资项目增加申报项目名
3、账套对应字段
 2022-07-27 16:56:13 +08:00
钱涛 e7968f2545 1、公共枚举接口 
2、薪资档案封存标识
 2022-07-26 18:01:39 +08:00
liuliang eb6f0b81ca 删除社保方案福利功能 2022-07-26 16:14:24 +08:00
钱涛 3ced92cfc5 修复福利核算 2022-07-21 17:28:47 +08:00
钱涛 77ca4c2848 Merge branch 'develop' into feature/personIn2taxAgent 
# Conflicts:
#	src/com/engine/salary/service/SalaryArchiveService.java
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
#	src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
 2022-07-21 09:43:02 +08:00
liuliang 32c15c1c35 Merge branch 'feature_liuliang_20220705' into develop 2022-07-20 15:58:49 +08:00
liuliang 6b2c5ba314 社保福利台账重新核算 2022-07-20 15:40:51 +08:00
钱涛 a721898d3d 薪资档案增加起始发薪和最后发薪 2022-07-18 18:08:59 +08:00
钱涛 c8aa08fc9f 档案列表显示扣缴义务人 2022-07-14 14:32:59 +08:00
钱涛 01bd6fefd4 支持人员可在多个扣缴单位 2022-07-14 10:36:51 +08:00
liuliang 758a78996d 导入薪酬档案对接流程功能 2022-07-13 18:59:30 +08:00
钱涛 1d5c69278f 描述异常 2022-07-13 11:45:16 +08:00
钱涛 91f1fda342 核算档案项不可编辑 2022-07-11 18:24:12 +08:00
钱涛 bf31d993a7 薪酬报表-薪酬核算完成，将数据存储到非加密表，删除人员信息，补充：分部、部门、岗位等其他字段，供数据中心引用 2022-07-11 17:31:33 +08:00
钱涛 12917f4f8b 去除无用todo 2022-07-08 11:30:10 +08:00
钱涛 eab3e9a6a9 1、福利列表显示扣税扣缴义务人 
2、导入限制
3、修改福利查询异常
4、核算人员范围限制
 2022-07-07 18:29:52 +08:00
钱涛 9bd1074258 1、档案限制应为个税扣缴义务人下的人员 
2、个税扣缴义务人未开启分权的情况下显示管理员
 2022-07-06 10:13:06 +08:00
钱涛 48d70400e5 薪资档案验证人员是否在义务扣缴人下 2022-07-05 19:19:17 +08:00
钱涛 4fe3a61d5d 修复核算工号不显示的问题 2022-07-04 18:58:49 +08:00
钱涛 c2c4149442 报表接口 2022-07-04 15:34:04 +08:00
钱涛 6262aeeb01 1、合并计税处理 
2、考勤引用不生成空记录
 2022-06-30 16:15:19 +08:00
钱涛 3e300e62eb 修复福利台账补缴功能异常 2022-06-29 14:13:23 +08:00
钱涛 f34eaa7c6f 修复福利台账总览数据 2022-06-28 18:21:44 +08:00
钱涛 4be0d70c4d fix 2022-06-28 16:46:42 +08:00
钱涛 e7dc9e1a57 限制个税扣缴名字个备注字符数量 2022-06-27 13:17:15 +08:00
钱涛 abdd87a005 fix 2022-06-24 18:05:08 +08:00
钱涛 3682ebd4f2 fix 2022-06-24 15:18:00 +08:00
钱涛 f680aa27d9 fix 2022-06-23 18:05:48 +08:00
钱涛 31a8b4bff9 fix 2022-06-23 17:15:39 +08:00
钱涛 e1a075cab3 fix 2022-06-22 19:26:05 +08:00
钱涛 5cea57d477 fix bug 2022-06-17 17:22:48 +08:00
MustangDeng c701314f15 fix bug 福利方案删除多余的编辑 2022-06-16 22:09:50 +08:00
钱涛 dfe8fdf57c fixbug 2022-06-16 19:06:45 +08:00
钱涛 17dbef3ef2 sql 2022-06-15 17:53:12 +08:00
钱涛 b42586600a fix申报表 2022-06-15 12:03:17 +08:00
钱涛 cfe2d3c1dc fix申报表 2022-06-15 11:02:44 +08:00
钱涛 7955d67da6 fix申报表 2022-06-15 10:24:46 +08:00
钱涛 0e8c916262 保存 2022-06-14 16:05:47 +08:00
钱涛 811a90f50d 账套项目的顺序性 2022-06-14 11:13:31 +08:00
钱涛 1aee6f7ef0 往期累计 2022-06-10 18:16:11 +08:00
钱涛 33914eae1d 解密 2022-06-10 18:07:25 +08:00
钱涛 e6c6b8eb57 Merge branch 'auth-fl' into release 
# Conflicts:
#	resource/sql/分权.sql
#	src/com/engine/salary/biz/SIAccountBiz.java
#	src/com/engine/salary/mapper/taxagent/TaxAgentMapper.xml
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
#	src/com/engine/salary/service/impl/SIExportServiceImpl.java
 2022-06-10 16:58:45 +08:00
钱涛 6ddf483767 加解密 2022-06-10 16:43:38 +08:00
钱涛 e83714ba4f Merge branch 'feature/encrypt' into release 
# Conflicts:
#	src/com/engine/salary/biz/AddUpSituationBiz.java
#	src/com/engine/salary/biz/SIArchivesBiz.java
#	src/com/engine/salary/cmd/datacollection/OtherDeductionGetDetailListCmd.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java
#	src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java
#	src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java
#	src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.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/SISchemeServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
#	src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
#	src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
 2022-06-10 15:26:43 +08:00
钱涛 ec3838a292 申报表 2022-06-10 13:33:48 +08:00
钱涛 382620c589 申报表 2022-06-09 19:02:18 +08:00
MustangDeng 85f0b1164c 福利台账分权 2022-06-09 18:31:36 +08:00
钱涛 b8972bcd43 分权v3 2022-06-09 17:45:28 +08:00
MustangDeng 2d2c993f2a 累计附加扣除详情列表没有解密 fix 2022-06-09 15:22:49 +08:00
MustangDeng 2fe1613868 台账核算 2022-06-09 15:16:33 +08:00
钱涛 61346f139b 申报和往期异常 2022-06-08 17:59:30 +08:00