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

2004 Commits

Author SHA1 Message Date
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