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

2083 Commits

Author SHA1 Message Date
Harryxzy d53d7a33d7 删除锁定多余代码 2023-06-02 14:47:15 +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
sy 007328476a 薪酬系统-薪资核算，薪资核算列表工号查询逻辑优化 2023-06-01 11:17:06 +08:00
钱涛 3ce388a935 Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01 2023-06-01 11:05:26 +08:00
钱涛 0472c7b757 显示字段管理默认使用列 
报表空数据处理
 2023-06-01 11:05:15 +08:00
Harryxzy 4e04b6e268 薪资核算导入，选择表单字段获取未分类 2023-06-01 10:30:33 +08:00
sy fb03cf98a7 薪酬系统，福利台账、薪资档案、薪资核算增加工号查询 2023-05-31 11:49:40 +08:00
Harryxzy 601b90d188 薪资档案薪资项目排序 2023-05-31 09:55:24 +08:00
Harryxzy 0ec6e740d3 Merge branch 'fix/backCalcSumRow' into release/2.8.3.2306.01 2023-05-29 16:48:18 +08:00
Harryxzy a2f4653411 当薪资档案列表为0时，由于查询了全量数据，导致速度慢 2023-05-29 16:17:13 +08:00
钱涛 65849f99b1 人员明细自定义列 2023-05-26 16:45:05 +08:00
钱涛 0734b5ce01 公式des 2023-05-26 15:40:08 +08:00
Harryxzy 7e841f6fd3 修复回算工资单合计列 2023-05-26 15:13:56 +08:00
钱涛 39ee8d9d35 人员明细列表展示账套和核算记录信息、自定义列功能 2023-05-26 14:45:04 +08:00
钱涛 fef828ef1d 人员明细列表展示账套和核算记录信息、自定义列功能 2023-05-26 11:17:25 +08:00
钱涛 ecdfc0c957 Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01 2023-05-26 11:15:49 +08:00
钱涛 220848e92d 档案项目正序排列 2023-05-26 11:15:40 +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 b26e6069ad Merge branch 'fix/salaryAcctResultEdit' into release/2.8.3.2306.01 2023-05-25 17:11:58 +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 32e7959745 维度统计管理判断能否删除和编辑-2 2023-05-24 14:49:39 +08:00
Harryxzy 33a8ecb4f7 维度统计管理判断能否删除和编辑 2023-05-24 14:17:31 +08:00
sy 91a06a93a3 Merge remote-tracking branch 'remotes/origin/feature/v4-siTermDateRename-0525' into release/2.8.3.2306.01 2023-05-24 10:04:47 +08:00
sy a44f6bf3af 薪酬系统-福利档案，列表表头中的离职日期改为合同到期日期 2023-05-24 10:02:49 +08:00
钱涛 74c4305b9d 优化核算异常提示 2023-05-23 15:15:55 +08:00
Harryxzy 5768da7099 Merge remote-tracking branch 'origin/release/2.8.2.2305.02' into release/2.8.2.2305.02 2023-05-22 14:03:51 +08:00
Harryxzy 1525cf89c7 Merge branch 'feature/initSalaryArchiveAction' into release/2.8.2.2305.02 2023-05-22 14:03:32 +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
钱涛 64be49c61c 工资单适配微信 2023-05-22 10:12:23 +08:00
Harryxzy ebf966517b 修复保存日志获取不到id 2023-05-18 14:28:31 +08:00
钱涛 ff8dcf1769 核算异常信息 2023-05-17 17:38:12 +08:00
钱涛 404db31695 薪资项目系统项目排序靠后 2023-05-17 16:57:37 +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
Harryxzy 72f2ca4439 修复核算编辑保存 2023-05-17 14:49:53 +08:00
钱涛 df07a8c9d1 Merge remote-tracking branch 'origin/release/2.8.2.2305.02' into release/2.8.2.2305.02 2023-05-17 14:10:25 +08:00
钱涛 8ad88b1e97 我的工资接口修改 2023-05-17 14:10: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 6fcfc2db9b 定薪action 2023-05-15 16:47:00 +08:00
sy e28ca6a2d0 薪酬系统-福利档案，生成福利档案列表表头过程中，过滤源数据中人员id为空的数据v2 2023-05-15 14:45:06 +08:00
sy cf6b35f6a0 薪酬系统-福利档案，生成福利档案列表表头过程中，过滤源数据中人员id为空的数据 2023-05-15 13:58:06 +08:00
Harryxzy 4ff15ca651 薪资核算结果编辑导入 记录 2023-05-15 10:28:17 +08:00
钱涛 fb271f435a 公式方法改造 2023-05-15 10:00:59 +08:00
钱涛 d0e5a3a643 Merge branch 'feature/报表v2' into release/2.8.2.2305.02 2023-05-15 09:29:00 +08:00
钱涛 d51c89bb82 公式方法改造 2023-05-15 09:28:22 +08:00
钱涛 f848b74f28 薪酬流程日志 2023-05-12 11:51:42 +08:00
钱涛 eaaf6359af Merge branch 'feature/公式' into release/2.8.2.2305.02 2023-05-12 09:16:54 +08:00
Harryxzy b0084cad9c 薪资核算编辑 手动编辑后自动锁定 2023-05-11 14:40:10 +08:00
Harryxzy 54ca46c653 薪资核算导入项自动锁定 2023-05-11 10:51:43 +08:00
钱涛 53f2c1ebb6 修复提示行号 2023-05-11 10:21:21 +08:00
Harryxzy d08a329000 Merge branch 'feature/维护工具' into release/2.8.2.2305.02 2023-05-11 10:09:10 +08:00
钱涛 6ec0b53fe5 默认档案起始发薪是入职时间 2023-05-11 10:00:21 +08:00
钱涛 3840f26464 公式异常处理 2023-05-10 18:55:23 +08:00
钱涛 c87db92ee8 公式扩展核算基本信息和核算日期 2023-05-10 14:26:39 +08:00
钱涛 2941b5f304 删除报表同时删除项目 2023-05-09 17:37:05 +08:00
钱涛 ecd037424b 去除异常分页 2023-05-09 14:28:46 +08:00
钱涛 797d5095eb 适配if 2023-05-09 10:43:51 +08:00
sy bbba7f314d 薪酬系统-福利，福利档案、核算明细列表获取员工状态逻辑调整 2023-05-08 17:58:17 +08:00
钱涛 197506b72b 适配if 2023-05-08 14:12:33 +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
钱涛 ccec800a75 公式升级 2023-05-08 11:21:09 +08:00
钱涛 8228fbf21c 短信邮件 2023-05-08 09:27:20 +08:00
Harryxzy b905390623 修复社保福利台账，根据核算创建人过滤 2023-05-06 09:50:48 +08:00
钱涛 7e940b4db4 减少单次核算的人员 2023-05-05 17:15:25 +08:00
钱涛 41e95ceadf 字段管理不显示id 2023-05-05 15:32:55 +08:00
钱涛 aa8f46e84f 删除sql，修改签名 2023-05-05 14:08:37 +08:00
钱涛 159b5811f6 Merge branch 'feature/报表' into release/2.7.4.2304.02 2023-05-05 09:26:29 +08:00
钱涛 0f38b6cbaa 去除mock校验 2023-05-04 19:43:35 +08:00
钱涛 3e8ac01049 公式描述 2023-05-04 18:07:35 +08:00
sy 02e0d5a089 Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02 2023-05-04 16:42:26 +08:00
sy 59b64b48ae 薪酬系统-福利档案，编辑保存日期格式校验逻辑优化 2023-05-04 16:14:00 +08:00
钱涛 9dc41706b2 Merge branch 'release/2.7.4.2304.02' into feature/公式 2023-05-04 14:40:50 +08:00
钱涛 85bf7e0036 数据库删除null 2023-05-04 14:36:49 +08:00
钱涛 2d609ef49d 删除报表 2023-05-04 13:57:55 +08:00
钱涛 ae719ad65b 修复人员过多时bug 2023-05-04 11:56:34 +08:00
Harryxzy 0d6355ca4a 修复回算工资单的合计列 2023-04-28 16:04:52 +08:00
钱涛 790d24b7db Merge branch 'feature/维护工具' into release/2.7.4.2304.02 2023-04-28 14:38:11 +08:00
钱涛 0aabcd0471 将除重新核算的项目外的所有的值都锁定 2023-04-28 14:37:59 +08:00
钱涛 0bd16c3f25 Merge branch 'feature/维护工具' into release/2.7.4.2304.02 2023-04-28 14:07:32 +08:00
钱涛 20e4856c23 人员全部显示 2023-04-28 11:18:01 +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
钱涛 1641b70764 权限控制 2023-04-27 17:31:43 +08:00
钱涛 c7286fbae4 定量-组距式分组、定量-单项式分组 2023-04-27 17:18:20 +08:00
钱涛 d36cfe31b3 报表暂存 2023-04-27 16:05:03 +08:00
钱涛 1529a30768 薪资项目取消过滤档案，使得导入功能一页面为准 2023-04-27 09:22:20 +08:00
钱涛 433ce6cf91 暂存 2023-04-26 16:04:33 +08:00
钱涛 14fca43e18 暂存 2023-04-26 15:17:08 +08:00
钱涛 f47ad2a7a3 注释接口 2023-04-25 18:04:05 +08:00
sy 6ad8c84a04 Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02 2023-04-25 17:40:05 +08:00
钱涛 40cd70e2a3 Merge branch 'release/2.7.4.2304.02' into feature/公式 2023-04-25 17:39:33 +08:00
sy cb36dc2904 薪酬系统-福利档案，档案编辑功能增加对年月的格式校验 2023-04-25 17:38:54 +08:00
钱涛 59c32b24e6 补算 2023-04-25 17:08:42 +08:00
钱涛 77ce806b37 sysadmin不显示申报记录 2023-04-25 10:43:40 +08:00
钱涛 a611301651 Merge remote-tracking branch 'origin/release/2.7.4.2304.02' into release/2.7.4.2304.02 2023-04-25 10:12:01 +08:00
钱涛 c0060ba358 Merge branch 'feature/维护工具' into release/2.7.4.2304.02 2023-04-25 10:11:40 +08:00
sy cea8d14c18 Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02 2023-04-25 09:22:03 +08:00
钱涛 17785b3c2b 导出报表 2023-04-24 18:08:06 +08:00
钱涛 7b4ebd788c 导出报表 2023-04-24 16:34:23 +08:00
钱涛 8d00e6ad45 报表年月 2023-04-24 14:57:54 +08:00
钱涛 cef3d26693 维护工具 2023-04-24 14:55:32 +08:00
sy 1f7c271519 薪酬系统-福利档案，待减员tab页删除待办，添加个税扣缴义务人范围过滤 2023-04-24 14:47:28 +08:00
钱涛 24dfa57850 报表 2023-04-24 14:09:27 +08:00
sy 61326928df Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02 2023-04-24 14:07:28 +08:00
Harryxzy e2570dc520 Merge branch 'feature/salaryItemFieldsCanCopy_0420' into release/2.7.4.2304.02 2023-04-24 11:03:17 +08:00
sy 27969cff80 薪酬系统-福利台账，补差导入处理合计值为null的情况 2023-04-24 10:11:02 +08:00
钱涛 4034c5cdb0 Merge branch 'feature/维护工具' into release/2.7.4.2304.02 2023-04-24 09:26:46 +08:00
钱涛 c94d5169f0 维护工具 2023-04-24 09:19:18 +08:00
sy c686f52153 薪酬系统-福利台账，补差导入部分福利项缴费信息相关合计逻辑优化 2023-04-23 18:05:32 +08:00
钱涛 598ff0cf9a Merge remote-tracking branch 'origin/feature/维护工具' into feature/维护工具 2023-04-23 18:00:41 +08:00
钱涛 5c936a0334 补算 2023-04-23 18:00:30 +08:00
Harryxzy 468dd092a7 恢复往期累计数据 接口 2023-04-23 17:43:02 +08:00
Harryxzy ad6b9a1eb0 Merge remote-tracking branch 'origin/feature/维护工具' into feature/维护工具 2023-04-23 17:37:14 +08:00
Harryxzy 31235096bb 恢复往期累计数据 2023-04-23 17:37:06 +08:00
钱涛 f4ebcf987c 维护估计控制层 2023-04-23 17:30:43 +08:00
sy 37310f02f6 薪酬系统-福利台账，补差导入相关合计项计算逻辑优化 2023-04-23 16:35:52 +08:00
钱涛 413de52d6a 维护工具v1 2023-04-23 16:27:11 +08:00
sy c9a5228f3e Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02 2023-04-23 13:36:28 +08:00
sy d56e9aff82 薪酬系统，导出excel的title行背景置为灰色 2023-04-23 13:35:17 +08:00
钱涛 36863c3695 报表 2023-04-23 10:14:32 +08:00
钱涛 ce8ca9cdb8 分部实现逻辑 2023-04-21 13:52:57 +08:00
钱涛 4a9df2276d 分部计算类 2023-04-21 11:25:16 +08:00
钱涛 d2b304e690 全量数据 2023-04-20 18:04:18 +08:00
钱涛 135530d3b7 全量数据 2023-04-20 17:55:37 +08:00
Harryxzy 3a555c1866 修复已发 2023-04-20 13:08:58 +08:00
钱涛 ef171db128 公式函数 2023-04-19 19:28:05 +08:00
钱涛 19d5e979bb 修复删除报表和维度分页 2023-04-19 16:32:27 +08:00
钱涛 9994ae3df9 公式 2023-04-19 15:22:42 +08:00
钱涛 34f33d21d8 公式 2023-04-19 13:35:35 +08:00
钱涛 a19b19e23d 公式 2023-04-19 10:15:01 +08:00
钱涛 95dd20dc7b 报表接口 2023-04-18 18:55:38 +08:00
sy 62af02522c 薪酬系统-福利台账，线下对比（列表、导入、导出）福利项字段根据正常缴纳中的核算字段获得 2023-04-18 14:21:05 +08:00
钱涛 aeab5c75f5 往期修复 2023-04-18 11:45:30 +08:00
钱涛 c5d9ea5421 累计个人养老金bug 2023-04-18 11:03:09 +08:00
sy f68981baac 薪酬系统-福利台账，福利核算、核算明细列表逻辑优化（取消对档案状态的过滤） 2023-04-17 10:27:31 +08:00
钱涛 6933d63cb1 自定义报表项目 2023-04-17 09:46:01 +08:00
钱涛 bc590b9ee8 自定义报表 2023-04-14 15:18:18 +08:00
钱涛 abf255d03c 暂存 2023-04-14 10:31:20 +08:00
Harryxzy b5d3acf418 Merge branch 'feature/salaryItemFieldsCanCopy_0420' into release/2.7.3.2304.01 2023-04-14 09:04:23 +08:00
钱涛 a87c344581 个人养老金 2023-04-13 17:14:58 +08:00
钱涛 87701c7229 暂存 2023-04-13 15:13:05 +08:00
钱涛 2d8b538897 Merge remote-tracking branch 'origin/fix/employeeServiceFormat_0412' into feature/报表 2023-04-13 14:54:22 +08:00
钱涛 15d6a63df6 薪酬上下文 2023-04-13 11:53:43 +08:00
钱涛 deb2e367f4 薪酬上下文 2023-04-13 11:53:08 +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
钱涛 5ec4f9e649 暂存 2023-04-13 09:32:20 +08:00
Harryxzy 82ee707f16 employebiz改成employeeservice 2023-04-12 15:27:35 +08:00
钱涛 dc5c776d97 暂存 2023-04-12 15:03:19 +08:00
钱涛 58dbdb0d05 养老金 2023-04-12 09:39:53 +08:00
钱涛 1cbb889748 报表删除 2023-04-11 18:43:33 +08:00
钱涛 a4a829d201 年终奖数据 2023-04-11 17:24:31 +08:00
钱涛 0749fffcdb 统计维度 2023-04-11 14:00:41 +08:00
Harryxzy e21b53c2df Merge branch 'fix/deleteSalarySobAddCheck_0414' into release/2.7.3.2304.01 2023-04-11 14:00:26 +08:00
Harryxzy bbe7edaa22 Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.3.2304.01 2023-04-11 13:56:18 +08:00
钱涛 d7ab77dab1 暂存 2023-04-11 13:43:00 +08:00
Harryxzy 0bfe0b62a7 fix 字段重复无法保存 2023-04-11 11:43:32 +08:00
钱涛 95c8ee6a4f 修复mybatis 2023-04-11 11:31:20 +08:00
钱涛 bbcaa1a1e8 暂存 2023-04-11 11:02:03 +08:00
Harryxzy 8c58cf01b3 字段拷贝调整 2023-04-11 10:48:41 +08:00
Harryxzy 482f4dfc25 薪资项目名不允许包含大括号 2023-04-11 10:36:06 +08:00
Harryxzy a286ac6f44 Merge branch 'fix/salaryArchiveImportByRuleBug_0407' into release/2.7.3.2304.01 2023-04-11 10:18:54 +08:00
Harryxzy 0ef8a2ae12 Merge branch 'fix/salaryItemHideDuplicateItem_0407' into release/2.7.3.2304.01 2023-04-11 10:16:28 +08:00
Harryxzy 593ad0d3a4 Merge branch 'fix/specialAddDeduction_cannotImport' into release/2.7.3.2304.01 2023-04-11 10:16:00 +08:00
sy 6bb5f8ddb4 Merge remote-tracking branch 'remotes/origin/feature/v4-closeEncryptSettingWithChange-0406' into release/2.7.3.2304.01 2023-04-11 10:10:59 +08:00
sy 8544abe1bc Merge remote-tracking branch 'origin/release/2.7.3.2304.01' into release/2.7.3.2304.01 2023-04-11 10:08:05 +08:00
Harryxzy c3dfc5692e 薪资项目拷贝 2023-04-11 09:56:20 +08:00
钱涛 09b2bf54e1 暂存 2023-04-11 09:22:09 +08:00
钱涛 ce0b8ce186 暂存 2023-04-10 12:43:48 +08:00
钱涛 739904d48f 暂存 2023-04-10 09:47:33 +08:00
Harryxzy d9f041c9bb 账套删除前校验是否存在工资单模板 2023-04-07 16:06:47 +08:00
Harryxzy 207d338ec2 薪资账套重复薪资项目 2023-04-07 15:14:07 +08:00
钱涛 b0284022c1 核算导出全部功能修复 2023-04-07 14:39:22 +08:00
钱涛 b30a58c1d9 报表功能 2023-04-07 14:38:38 +08:00
Harryxzy d5f6d053b3 修复累计专项附加扣除导出全部bug 2023-04-06 16:20:58 +08:00
Harryxzy 75d66e4cb9 专项附加扣除导入 批量更新分片 2023-04-06 16:07:42 +08:00
钱涛 bb76df3718 个人养老金 2023-04-04 17:29:56 +08:00
Harryxzy accb0d3d2b 社保福利台账 - 合计列 2023-04-04 17:21:29 +08:00
sy 6a9d2a6fab Merge remote-tracking branch 'origin/release/2.7.3.2304.01' into release/2.7.3.2304.01 2023-04-04 16:28:25 +08:00
sy add7051759 薪酬系统, 适配金仓-个税申报单逻辑优化、薪资部分发放逻辑优化、删除initserviceimpl文件 2023-04-04 16:28:15 +08:00
钱涛 44fe9203ab 个人养老金 2023-04-04 14:21:25 +08:00
钱涛 cb46fccb16 工资单推送 2023-04-03 18:49:28 +08:00
sy eb1d441de7 薪酬系统, 关闭加密方法优化 2023-04-03 16:07:37 +08:00
sy 521db08cde Merge remote-tracking branch 'remotes/origin/feature/v4-salaryExcelFormat-0328' into release/2.7.3.2304.01 
# Conflicts:
#	src/com/engine/salary/service/SalaryAcctExcelService.java
#	src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
 2023-04-03 15:59:58 +08:00
Harryxzy 5847f3f449 Merge branch 'fix/salaryTemplateUpdateBug_0407' into release/2.7.3.2304.01 2023-04-03 11:31:49 +08:00
Harryxzy c97407c2ac 工资单模板修复 2023-04-03 11:31:09 +08:00
Harryxzy dcfe6479ed Merge branch 'feature/cancelSuspend' into release/2.7.3.2304.01 2023-04-03 11:12:20 +08:00
Harryxzy 4faa9e36a6 取消待办优化 2023-03-31 10:17:31 +08:00
Harryxzy 40b38b5347 社保福利档案列表提速 2023-03-30 22:52:52 +08:00
sy 31bf7cfd99 薪酬系统-薪资核算和档案，excel导出行高自适应 2023-03-30 17:26:55 +08:00
Harryxzy 30660ce04b 工资单模板，无法修改薪资项为0时不显示 2023-03-30 13:33:52 +08:00
sy 0427ec5ed4 薪酬系统, 关闭加密方法优化 2023-03-30 11:44:21 +08:00
Harryxzy 52decb10ff Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.3.2304.01 2023-03-30 11:03:22 +08:00
Harryxzy f0c80f3287 薪资档案导入无法带出工号数据 2023-03-30 10:02:09 +08:00
Harryxzy 295331d1a5 按照工号导入，支持不输入姓名 2023-03-30 09:49:49 +08:00
Harryxzy 2fc4560488 薪资档案按照工号导入无效 2023-03-29 16:46:10 +08:00
Harryxzy ef3260085f 修复重新核算，往期累计删多数据 2023-03-28 14:18:01 +08:00
Harryxzy b331152d27 修复合计列 2023-03-28 13:59:57 +08:00
Harryxzy d99e6147d3 Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.3.2304.01 2023-03-28 13:40:12 +08:00
Harryxzy 952a8e845c 修复合计列 2023-03-28 11:00:18 +08:00
Harryxzy 2dc40a7b91 取消待办 2023-03-28 10:10:54 +08:00
Harryxzy 95cf271c80 修复薪资档案导入，重复数据报错行数少一 2023-03-28 09:31:00 +08:00
Harryxzy 530dcd7028 Merge branch 'feature/SalaryAcctResult-ImportField-cache_0324' into release/2.7.3.2304.01 2023-03-27 17:36:41 +08:00
钱涛 9f6950d8ae 工资单发放 2023-03-20 17:36:29 +08:00
Harryxzy 1ab7fcc7b8 Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.1.2303.02 2023-03-16 17:20:43 +08:00
Harryxzy 3304ffdbd5 薪资核算导入，添加表头字段缓存功能 2023-03-16 16:19:23 +08:00
Harryxzy e1b4927eaa 删除多余代码 2023-03-16 14:52:08 +08:00
sy dc2cb5f448 薪酬系统-薪资核算，薪资核算和薪资档案导出excel通用格式改造 2023-03-16 13:51:41 +08:00
Harryxzy b9c40955ac Merge branch 'fix/AddUpSituationCantImport_0316' into release/2.7.1.2303.02 2023-03-16 11:38:38 +08:00
Harryxzy cdf7dd916b 往期累计情况编辑 2023-03-16 11:37:43 +08:00
Harryxzy 6a7e5eacdc 社保福利台账合计列 2023-03-16 11:17:18 +08:00
Harryxzy 521de26b51 Merge branch 'fix/AddUpSituationCantImport_0316' into release/2.7.1.2303.02 2023-03-16 09:54:49 +08:00
Harryxzy 16cfe18b90 往期累计情况导入BUG 2023-03-16 09:53:46 +08:00
Harryxzy ca03e0785e 工资单发放详情导出没有部门信息 2023-03-15 17:09:02 +08:00
Harryxzy 712f30ddfa 工资单发放详情合计列 2023-03-15 16:00:37 +08:00
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