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

2102 Commits

Author SHA1 Message Date
Harryxzy 9842784297 工资单定时发送 - 模板保存 2023-06-30 15:58:55 +08:00
Harryxzy 8cbc758131 删除档案开关bug 2023-06-30 11:40:59 +08:00
Harryxzy 1fa04f1515 个税申报撤回开关-2 2023-06-29 16:42:48 +08:00
Harryxzy 04592a58b4 Merge branch 'release/2.8.4.2306.02' into feature/taxDeclarationWithdraw 
# Conflicts:
#	src/com/engine/salary/sys/constant/SalarySysConstant.java
#	src/com/engine/salary/sys/service/SalarySysConfService.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
#	src/com/engine/salary/web/SalarySystemConfigController.java
#	src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
 2023-06-29 16:40:07 +08:00
Harryxzy ba85231656 个税申报撤回开关-1 2023-06-29 16:38:50 +08:00
Harryxzy d10d5da364 Merge remote-tracking branch 'origin/release/2.8.4.2306.02' into release/2.8.4.2306.02 2023-06-29 15:14:10 +08:00
sy a429c271f4 Merge branch 'feature/230602-数据库适配-PG' into release/2.8.4.2306.02 2023-06-29 15:12:48 +08:00
Harryxzy eb0c59c0b9 累计专项附加扣除列表提速-2 2023-06-29 14:05:33 +08:00
Harryxzy 33593311df 累计专项附加扣除列表提速 2023-06-29 14:04:11 +08:00
Harryxzy e3e0bcd66b 累计专项附加扣除防抖动 2023-06-29 13:53:07 +08:00
钱涛 6a5304a605 修复进度条 2023-06-29 13:38:07 +08:00
Harryxzy 2735661b4a 删除薪资档案 2023-06-29 10:35:55 +08:00
钱涛 b130fb0121 海康包冲突jar 2023-06-28 18:11:53 +08:00
Harryxzy 5d83326d23 listByAcctEmployeeIdsAndSalaryItemIds的分片问题 2023-06-28 16:26:20 +08:00
sy faee7160e3 Merge remote-tracking branch 'remotes/origin/release/2.8.4.2306.02' into feature/230602-数据库适配-PG 2023-06-28 09:46:11 +08:00
Harryxzy 2bb5d18b90 Merge branch 'fix/薪资核算页面查看权限校验' into release/2.8.4.2306.02 2023-06-28 09:16:51 +08:00
Harryxzy ea527d0e37 Merge branch 'fix/下载档案模板没有数据' into release/2.8.4.2306.02 2023-06-27 18:00:59 +08:00
Harryxzy 04f0528143 修复下载薪资档案模板没有带出档案数据 2023-06-27 18:00:39 +08:00
钱涛 89ae0dc786 报表缓存时参数变更问题 2023-06-27 16:18:42 +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
Harryxzy 822ad87451 薪资核算结果校验拦截 2023-06-27 14:58:33 +08:00
Harryxzy 6ae98ce50a Merge branch 'fix/新建定量维度时数据透视没有值' into release/2.8.4.2306.02 2023-06-26 14:23:27 +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 ce6ba1453c Merge branch 'fix/一键累计定时任务' into release/2.8.4.2306.02 2023-06-26 13:27:21 +08:00
Harryxzy 0d23a318e8 Merge branch 'feature/停薪action' into release/2.8.4.2306.02 2023-06-26 13:27:03 +08:00
Harryxzy a43123efc0 Merge branch 'fix/DBType修改' into release/2.8.4.2306.02 2023-06-26 13:26:27 +08:00
Harryxzy 3be6eaa16f Merge branch 'feature/核算人员匹配规则（是否包含停薪列）' into release/2.8.4.2306.02 2023-06-26 13:26:03 +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
sy 8514f076d0 薪酬系统-pg数据库适配，考勤引用-设置表头字段显示异常问题修复 2023-06-26 10:14:07 +08:00
钱涛 50fa724756 采用线程池发送邮件 2023-06-26 10:11:54 +08:00
sy 3657abe41b 薪酬系统-pg数据库适配，福利档案状态变换异常问题修复 2023-06-25 17:56:18 +08:00
sy 1bb9b939f0 薪酬系统-pg数据库适配，薪资档案待定薪导入问题修复 2023-06-25 13:50:20 +08:00
钱涛 1e78c40e9a Merge branch 'feature/报表缓存' into release/2.8.4.2306.02 2023-06-21 09:48:23 +08:00
Harryxzy e7edb9040c 修复无分类 2023-06-20 17:27:18 +08:00
钱涛 3708aea0de 考勤引用-列表字段根据当时引用情况生成 2023-06-20 17:00:14 +08:00
钱涛 d90a1977ce fix数据采集-往期累计情况导出全部字段为空时显示null 2023-06-20 15:58:03 +08:00
Harryxzy d60d24ea2e 新建定量维度时数据透视没有值 2023-06-20 14:31:06 +08:00
钱涛 7719c503fe Merge branch 'release/2.8.4.2306.02' into feature/报表缓存 2023-06-19 14:22:11 +08:00
Harryxzy 0e601e3967 修改DBType的写法 2023-06-19 13:59:24 +08:00
钱涛 16cf63018f 重新核算或者回算时删除报表缓存 2023-06-19 09:54:02 +08:00
Harryxzy 6850c050b8 薪资核算人员去除 停薪_来自待定薪 2023-06-19 09:16:49 +08:00
Harryxzy d9f57ac258 修复回算后无法发放第二次核算的工资单 2023-06-16 16:41:49 +08:00
Harryxzy 1c6cf5feab 核算人员匹配规则（是否包含停薪列表）暂存 2023-06-16 15:47:24 +08:00
钱涛 8612f0e5b2 Merge branch 'release/2.8.4.2306.02' into feature/短信验证码 2023-06-16 14:54:24 +08:00
Harryxzy 3096954628 核算人员匹配规则（是否包含停薪列表）暂存 2023-06-16 14:40:36 +08:00
钱涛 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