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

2250 Commits

Author SHA1 Message Date
钱涛 ec67c89e7d 报表排除掉未归档的数据 2023-06-16 13:49:40 +08:00
Harryxzy ee7936a9bf 考勤引用校验能够否删除 2023-06-16 13:33:38 +08:00
Harryxzy 512510c623 考勤引用校验能够否删除 2023-06-16 11:49:23 +08:00
Harryxzy 1805726387 限制无法打开他人工资单 2023-06-16 10:14:28 +08:00
Harryxzy f4b3a742f0 系统默认水印 2023-06-16 09:58:54 +08:00
钱涛 5e6a65e47e 获取报表缓存，暂存方法 2023-06-15 18:48:31 +08:00
钱涛 5926697c29 报表缓存 2023-06-15 17:34:52 +08:00
sy f33f309262 Merge remote-tracking branch 'remotes/origin/feature/v4-importAndExportHeaderUnified-0615' into release/2.8.4.2306.02 2023-06-15 16:35:52 +08:00
Harryxzy ee14b0435b 一键累计定时任务 2023-06-15 16:18:24 +08:00
Harryxzy 36fc2abffc 停薪action 2023-06-15 15:23:54 +08:00
Harryxzy b30c08d3ff 停薪action传个税扣缴义务人名 2023-06-15 14:48:58 +08:00
Harryxzy a044335406 停薪actionCheck 2023-06-15 11:12:12 +08:00
钱涛 87a9338a73 Merge remote-tracking branch 'origin/release/2.8.4.2306.02' into release/2.8.4.2306.02 2023-06-15 10:44:42 +08:00
钱涛 2480525fa6 修复同步档案bug 
缓存公共接口
 2023-06-15 10:44:31 +08:00
sy c87a754888 薪酬系统，薪资账套、个税扣缴义务人、薪资项目列表按照创建时间降序排列 2023-06-15 10:23:03 +08:00
Harryxzy 9905f406c0 停薪action 2023-06-15 10:07:06 +08:00
Harryxzy d0c04688a8 停薪action 2023-06-15 10:05:27 +08:00
钱涛 912c80c97f 验证方式 2023-06-14 16:15:05 +08:00
钱涛 57798a8e3e 短信验证码功能 2023-06-14 15:51:26 +08:00
sy 3638fb469f 薪酬系统-薪资档案，列表导入、导出统一表头内容和顺序，不包括自选表头 2023-06-14 10:33:26 +08:00
sy 12b4977067 薪酬系统-福利台账，退差新增逻辑优化 2023-06-13 15:43:10 +08:00
sy 1460d32ae4 薪酬系统-社保福利，列表导入、导出统一表头内容和顺序，不包括自选表头 2023-06-13 14:49:26 +08:00
Harryxzy a74bddf326 Merge branch 'fix/salaryAcctResutAutoLock' into release/2.8.4.2306.02 2023-06-13 13:19:13 +08:00
Harryxzy e034954d79 Merge branch 'fix/statisticsEditDelete' into release/2.8.4.2306.02 2023-06-13 10:19:37 +08:00
Harryxzy b544c5e2c1 水印预览 2023-06-13 10:02:11 +08:00
Harryxzy b60904cc03 水印 - 邮件水印不支持图片 2023-06-12 18:55:27 +08:00
Harryxzy d303110737 Merge branch 'fix/statisticsEditDelete' into release/2.8.3.2306.01 2023-06-12 15:38:03 +08:00
钱涛 8bde871286 档案返回列表状态 2023-06-12 15:36:27 +08:00
Harryxzy 7a40a31d6f 水印 - 暂存2 2023-06-12 15:19:24 +08:00
Harryxzy 155a00623a 导入编辑自动锁定 根据confValue判断 2023-06-12 10:45:01 +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 849ea1e2d0 Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01 2023-06-09 09:49:22 +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
钱涛 892f99052b 报表数据接口返回报表id 2023-06-09 09:46:03 +08:00
Harryxzy 93a7dcd59f 数据透视 fix WeaTable 2023-06-08 18:04:25 +08:00
钱涛 f881fa2766 取消注释 2023-06-08 17:19:19 +08:00
Harryxzy e464ca8ba6 薪资账套中薪资项目可以删除 2023-06-08 15:30:52 +08:00
Harryxzy 4b574c9e57 报表数据透视提速 2023-06-08 14:00:51 +08:00
Harryxzy 3d11c74d32 报表数据透视fixbug 2023-06-08 12:25:11 +08:00
Harryxzy d013d14e31 系统薪资项目列表显示改造- 数据库适配 2023-06-08 11:38:53 +08:00
Harryxzy dbb2a97be4 系统薪资项目列表显示改造 2023-06-08 11:10:40 +08:00
Harryxzy 50fd5812d4 数据透视功能改为post 2023-06-08 10:24:28 +08:00
钱涛 458b04703d Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01 2023-06-08 10:15:59 +08:00
钱涛 a4679d7a5b 展示底层异常 2023-06-08 10:14:37 +08:00
Harryxzy 94edee7f8c Merge branch 'feature/taxAgentSorted' into release/2.8.3.2306.01 2023-06-08 09:03:21 +08:00
sy 5a54b83b4a Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01 2023-06-07 18:41:22 +08:00
sy 054d880afa 薪酬系统-福利档案，likecondition条件取消mysql指定 2023-06-07 18:40:55 +08:00
钱涛 799b3d9f64 Merge branch 'feature/短信邮件' into release/2.8.3.2306.01 2023-06-07 17:32:48 +08:00
钱涛 7701420430 邮件去除图片 2023-06-07 17:19:00 +08:00
Harryxzy dcb28b052f 数据透视功能-分页+排序 2023-06-07 16:50:09 +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
sy 4c1e7da51b 薪酬系统-福利档案，福利档案导出增加工号信息 2023-06-07 15:40:38 +08:00
钱涛 77e9b0a74b Merge branch 'release/2.8.3.2306.01' into feature/短信邮件 2023-06-07 15:12:40 +08:00
Harryxzy 9e794c988a Merge branch 'fix/balanceImportBUG_0511' into release/2.8.3.2306.01 2023-06-07 14:36:27 +08:00
钱涛 3498005a11 工资单发放 2023-06-07 14:21:47 +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
钱涛 37d9c04a30 去除发放状态中文转换 2023-06-07 09:43:54 +08:00
钱涛 d4c8a66fcf 注释优化 2023-06-07 09:31:46 +08:00
钱涛 4a258aa45b 替换短信发送方法 2023-06-06 16:40:09 +08:00
钱涛 f154753698 拦截短信 2023-06-06 15:02:53 +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
钱涛 a308ee8d1f 获取员工短信内容 2023-06-06 14:21:35 +08:00
钱涛 0e5eb1b11e 工资单发送 2023-06-06 11:48:19 +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 466412a444 Merge branch 'fix/salaryAcctSearchLockItem' into release/2.8.3.2306.01 2023-06-05 09:53:13 +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
Harryxzy 1294e86c8c 导入自动锁定添加开关 2023-06-02 15:25:46 +08:00
Harryxzy 52b592dd7e 薪资核算获取加锁的值时增加项目条件，提速 2023-06-02 15:06:07 +08:00
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
钱涛 4c41b35b2b 外部人员档案优化 2023-04-17 15:31:56 +08:00
sy f68981baac 薪酬系统-福利台账，福利核算、核算明细列表逻辑优化（取消对档案状态的过滤） 2023-04-17 10:27:31 +08:00
钱涛 f619878f2c 暂存 2023-04-17 10:10:39 +08:00
钱涛 6933d63cb1 自定义报表项目 2023-04-17 09:46:01 +08:00
钱涛 bc590b9ee8 自定义报表 2023-04-14 15:18:18 +08:00
钱涛 bc0b84ee4b 档案验证 2023-04-14 10:51:05 +08:00
钱涛 8a2ec10b65 Merge branch 'release/2.7.3.2304.01' into feature/外部人员 2023-04-14 10:31:41 +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
钱涛 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
钱涛 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
钱涛 9549e75e00 Merge branch 'release/2.7.3.2304.01' into feature/外部人员 2023-04-13 14:48:43 +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
钱涛 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
钱涛 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 2e85f72362 工资单发放系统异常 2023-03-31 09:40:55 +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
钱涛 052eebe83a 解决工资单人名缺失 2023-03-16 19:17:33 +08:00
Harryxzy 1ab7fcc7b8 Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.1.2303.02 2023-03-16 17:20:43 +08:00