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

1233 Commits

Author SHA1 Message Date
钱涛 63851a1fe7 社保福利通过证件号码导入 2024-05-29 15:32:19 +08:00
钱涛 238438897b 处理工资单证件号码不显示 2024-05-29 14:04:16 +08:00
钱涛 2c79afa65e 锁定人员 2024-05-28 17:29:18 +08:00
钱涛 bc5735135c Merge branch 'feature/身份证导入' into release/2.14.3.2406.01 2024-05-28 11:28:18 +08:00
钱涛 11802dad91 根据身份证导入 2024-05-28 11:18:19 +08:00
钱涛 43db025d98 Merge branch 'feature/账套副本' into release/2.14.2.2405.02 2024-05-23 11:36:38 +08:00
Harryxzy bf50976849 Merge branch 'fix/240302-社保福利编辑保存改造' into release/2.14.2.2405.02 2024-05-23 10:58:30 +08:00
钱涛 1b3da7dfc0 身份证 2024-05-23 09:16:28 +08:00
Harryxzy 0facbabf55 薪资项目增加默认值temp 2024-05-20 15:04:14 +08:00
钱涛 3b9981e189 处理短信发送空值 2024-05-14 15:18:32 +08:00
钱涛 11cbf23b8f 统一进位规则 2024-05-14 14:27:19 +08:00
钱涛 38ebbb9928 解决并发问题 2024-05-14 13:28:58 +08:00
Harryxzy 509257b419 pdf导出前先校验生成pdf 2024-05-11 15:07:54 +08:00
Harryxzy 1c1a77d387 移动端工资单列表返回登陆人id 2024-05-10 15:41:40 +08:00
钱涛 6d4265acf1 职称显示为中午 2024-05-08 15:31:36 +08:00
钱涛 c97618bd97 修复社保福利修改时没有小数位问题 2024-05-08 11:15:52 +08:00
钱涛 1cb89a9d1b 账套快照-工资单模板 2024-05-06 17:41:39 +08:00
钱涛 3428de9e33 账套快照 2024-05-06 16:03:29 +08:00
Harryxzy 4b474f864f 累计专项附加扣除一键累计，能根据义务人进行累计 2024-04-30 14:43:37 +08:00
Harryxzy 8ae76f9b65 Merge branch 'release/2.13.1.2404.02' into feature/工资单审批 2024-04-30 10:26:58 +08:00
Harryxzy 1800c02e58 盛威 2024-04-29 16:08:18 +08:00
Harryxzy d7de02696d 工资单审批，增加规则配置 2024-04-28 16:58:33 +08:00
Harryxzy 4f391a2159 工资单审批 2024-04-26 11:24:47 +08:00
钱涛 c9075058d5 跳过人员范围校验 2024-04-25 13:45:59 +08:00
Harryxzy 11304bebed 薪资审批 2024-04-24 15:55:41 +08:00
Harryxzy 44ed332ed5 修复ecology的多语言导致乱码 2024-04-08 17:57:59 +08:00
Harryxzy 2242723d3f Merge branch 'feature/240302-薪资核算导出模板' into release/2.12.1.2403.02 2024-04-03 11:39:30 +08:00
钱涛 a06a54f574 去除objectUtil 2024-04-01 20:25:23 +08:00
Harryxzy 7557c1b330 薪资核算导出模板优化 2024-03-29 15:45:45 +08:00
Harryxzy 5d2cc92bf8 Merge branch 'feature/240302-薪资明细表' into release/2.12.1.2403.02 
# Conflicts:
#	src/com/engine/salary/mapper/datacollection/EmployMapper.java
#	src/com/engine/salary/mapper/datacollection/EmployMapper.xml
#	src/com/engine/salary/service/SalaryEmployeeService.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
 2024-03-29 10:49:39 +08:00
Harryxzy 582abc061a 薪资核算导出模板 2024-03-29 10:46:51 +08:00
Harryxzy 0d6bf4dfe3 薪资核算导出模板修复 2024-03-28 18:28:22 +08:00
Harryxzy 1c40ed0ecd 薪资核算导出模板 2024-03-26 17:04:56 +08:00
Harryxzy e3c528c649 薪资明细表 2024-03-25 16:08:34 +08:00
Harryxzy 25c2e2f1c1 其他维度 2024-03-22 15:23:03 +08:00
Harryxzy 18c496c009 多部门多分部筛选 2024-03-21 14:19:36 +08:00
Harryxzy 0c444acd38 多部门多分部筛选 2024-03-21 14:19:03 +08:00
Harryxzy 216a2c67d3 社保福利编辑保存改造 2024-03-20 14:47:41 +08:00
Harryxzy b17d2b70de Merge branch 'feature/240301_阅后即焚' into release/3.0.0.2403.01 2024-03-15 09:19:03 +08:00
钱涛 0a7334ddef 考勤导入，多语言 2024-03-14 18:16:20 +08:00
钱涛 29e81e03c2 优化公式不显示未启用的考勤字段 2024-03-14 16:08:16 +08:00
钱涛 417c9f703d 下载模板时带出数据 2024-03-14 15:28:14 +08:00
Harryxzy b5afaa54df Merge branch 'release/3.0.0.2403.01' into feature/240301_阅后即焚 2024-03-12 15:13:34 +08:00
钱涛 836947725f 切换了elog位置 2024-03-12 14:34:44 +08:00
钱涛 4b823ccca7 国际化注解 2024-03-11 16:50:47 +08:00
Harryxzy 78d4f5e2ae 阅后即焚 2024-03-11 10:35:56 +08:00
钱涛 729c6c7d3a 处理空指针 2024-03-07 14:12:16 +08:00
钱涛 78c1d6f51c 项目日志字段解释 2024-03-06 15:20:21 +08:00
Harryxzy 20d7266db9 Merge branch 'feature/240201_社保福利台账导入字段缓存' into release/2.11.1.2402.01 
# Conflicts:
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
 2024-03-06 13:50:56 +08:00
Harryxzy 6c2d20a5a7 Merge branch 'feature/240101_我的薪资福利显示页签支持配置' into release/2.11.1.2402.01 2024-03-05 14:24:19 +08:00
钱涛 1c62be09d1 Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01 2024-03-05 13:58:50 +08:00
Harryxzy 3f76b5bbbf 非系统人员管理日志 2024-03-04 16:12:30 +08:00
Harryxzy 5485f7d260 社保福利台账导入，表单字段缓存 2024-03-01 17:40:19 +08:00
钱涛 a1ab3c79f4 添加账套筛选条件 2024-02-28 14:43:27 +08:00
Harryxzy 1261194d88 操作日志优化 2024-02-27 11:30:14 +08:00
Harryxzy 093cb34f77 操作日志fix some bugs 2024-02-23 15:11:56 +08:00
Harryxzy a39806bb92 我的薪资福利显示页签支持配置 2024-02-23 11:04:14 +08:00
Harryxzy 5c5dcdabb2 Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件 2024-02-22 09:44:02 +08:00
Harryxzy f591074fc1 日志 2024-02-22 09:43:47 +08:00
sy f7eb698c4c Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件 2024-02-22 09:34:09 +08:00
Harryxzy dee20149bb 日志 2024-02-21 18:19:02 +08:00
sy e813a195f5 Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件 2024-02-20 17:05:04 +08:00
sy 4f372645ec Merge remote-tracking branch 'remotes/origin/fix/240101-福利方案，自定义福利详情获取接口增加返回参数' into release/2.10.1.2401.01 2024-02-20 17:00:25 +08:00
sy 7804936e52 薪酬系统-福利方案，自定义福利列表返回结果优化 2024-02-20 16:59:18 +08:00
sy 088a5c1d72 薪酬系统-福利台账，正常缴纳页相关功能操作日志添加 2024-02-20 16:50:45 +08:00
Harryxzy 117dbeb211 Merge branch 'fix/240101_考勤引用查看数据报错' into feature/操作日志组件 2024-02-20 10:10:22 +08:00
Harryxzy b4f36ab101 Merge branch 'feature/240102_工资单确认和反馈按钮分开' into release/2.10.1.2401.01 2024-02-20 09:51:00 +08:00
Harryxzy 7fe03ac7a1 工资单确认反馈优化 2024-02-19 10:09:49 +08:00
sy 6a79b22c17 薪酬系统-福利档案，增加操作日志 2024-02-07 17:39:26 +08:00
sy 5783342b01 薪酬系统-福利方案，方案新建、复制、删除功能增加操作日志 2024-02-05 14:06:52 +08:00
sy f4ecb19ef2 Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件 2024-02-01 10:21:47 +08:00
Harryxzy e75cfae309 Merge branch 'feature/240101_工资单反馈区分pc和移动端' into release/2.10.1.2401.01 2024-01-31 16:13:27 +08:00
Harryxzy a502cd84a2 Merge branch 'fix/240101_回算工资单发放后不能再次回算' into release/2.10.1.2401.01 2024-01-31 16:12:52 +08:00
Harryxzy 2331ef354e 工资单确认和反馈按钮分开 2024-01-30 15:53:55 +08:00
sy 8237ed48a6 Merge remote-tracking branch 'remotes/origin/feature/240101工资单模板复制优化及福利基数调整记录优化' into release/2.10.1.2401.01 2024-01-30 14:32:59 +08:00
Harryxzy 12f66512df 工资单反馈区分pc和移动端 2024-01-30 13:50:05 +08:00
钱涛 65f972846f 处理id超过2100 2024-01-30 10:26:44 +08:00
钱涛 d2216eee13 Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
 2024-01-29 15:07:58 +08:00
钱涛 6a8c9aebe3 修复考勤引用数据失败bug 2024-01-29 10:05:30 +08:00
sy f215b45afa 薪酬系统-工资单模板，复制功能改造，获取带选择薪资项目逻辑改造 2024-01-26 10:04:53 +08:00
sy 56c9557b3a Merge remote-tracking branch 'remotes/origin/release/2.10.1.2401.01' into feature/240101工资单模板复制优化及福利基数调整记录优化 
# Conflicts:
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
 2024-01-25 11:43:11 +08:00
sy 8eeb358dcc Merge remote-tracking branch 'remotes/origin/release/2.10.1.2401.01' into feature/240101工资单模板复制优化及福利基数调整记录优化 2024-01-25 11:41:44 +08:00
钱涛 6fc8d8fdee 去除达梦驱动 2024-01-25 11:38:38 +08:00
sy 4da07b9e80 薪酬系统-福利档案、台账，基数调整记录列表查询增加分权，台账查询条件支持个税扣缴义务人多选 2024-01-24 14:35:55 +08:00
钱涛 5bf00a98aa 记录核算日志 2024-01-24 09:50:58 +08:00
Harryxzy 71f90882d3 工资单反馈区分pc和移动端 2024-01-23 16:45:09 +08:00
sy b84b5d1d6e Merge remote-tracking branch 'remotes/origin/feature/231202-福利台账自动核算并归档' into feature/240101工资单模板复制优化及福利基数调整记录优化 2024-01-23 15:37:46 +08:00
钱涛 a5303b42a8 Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件 2024-01-23 14:08:14 +08:00
Harryxzy 2d24fbfa23 回算工资单发放后不能再次回算 2024-01-23 11:34:36 +08:00
sy 94d72cd93c 薪酬系统-工资单模板，复制功能改造 2024-01-23 10:52:53 +08:00
钱涛 6ee8b5f044 解决短信不换行问题 2024-01-22 15:41:38 +08:00
sy 56651196fa Merge remote-tracking branch 'remotes/origin/release/2.9.10.2312.02' into feature/231202-福利台账自动核算并归档 2024-01-22 11:03:37 +08:00
sy 29e5c27ffb 薪酬系统-福利台账，自动核算并归档任务类开发 2024-01-17 16:07:27 +08:00
Harryxzy e38fd9be99 薪资档案增加起始、结束发薪筛选 2024-01-15 10:51:53 +08:00
Harryxzy f5aa425f2c fix公式，人员状态变量没有值bug 2024-01-09 13:21:45 +08:00
Harryxzy 8164660ebf Merge branch 'feature/231202-批量编辑' into release/2.9.10.2312.02 
# Conflicts:
#	src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
 2024-01-08 15:34:32 +08:00
Harryxzy 5f7c1c641b Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02 2024-01-08 15:33:11 +08:00
sy a16ed64ac0 Merge remote-tracking branch 'remotes/origin/feature/231201-福利档案拆分个人和公司福利基数' into release/2.9.10.2312.02 2024-01-08 13:54:25 +08:00
Harryxzy 7945c84fbb 薪资项目宽度 2024-01-02 16:37:07 +08:00
钱涛 7e22711dcd 导入工具 2023-12-28 15:47:05 +08:00
钱涛 7d1ce983dd 日志 2023-12-26 17:49:50 +08:00
sy 7cb0e68623 薪酬系统-福利档案，福利档案编辑页公司基数信息返回逻辑优化 2023-12-15 09:50:20 +08:00
Harryxzy e97a35f158 新建补发工资单模板时，已发补发项目fix 2023-12-14 15:57:55 +08:00
钱涛 b78f4302e0 小数位 2023-12-12 13:18:17 +08:00
Harryxzy 9c454623bc Merge branch 'fix/核算、线下对比导出优化' into release/2.9.9.2312.01 2023-12-12 10:32:30 +08:00
Harryxzy 929bcc7877 薪资核算结果、线下对比下载导入模板优化 2023-12-12 10:18:10 +08:00
Harryxzy d6705e8917 产品-批量编辑 2023-12-11 13:09:20 +08:00
Harryxzy 2b6b1ef2c4 Merge branch 'custom/鲁控数字' into feature/231202-批量编辑 2023-12-11 11:36:59 +08:00
钱涛 e495c1799f 自定义 2023-12-11 09:52:47 +08:00
sy 9d0d7a00fc 薪酬系统-福利台账，线下对比列表、导入、导出，适配拆分福利档案个人和公司基数逻辑 2023-12-08 18:06:54 +08:00
sy 1c5249c76e 薪酬系统-福利台账，福利核算、明细列表、导出数据，适配拆分福利档案个人和公司基数逻辑 2023-12-08 11:16:18 +08:00
Harryxzy 419baeb8cd 鲁控数字 2023-12-06 16:05:08 +08:00
sy ec8cb6214d 薪酬系统-福利档案，档案明细编辑保存功能改造，适配福利档案福利基数拆分个人和公司需求 2023-12-06 14:04:12 +08:00
sy 451c9fb07b 薪酬系统-福利档案，档案明细获取逻辑改造，根据应用设置中的区分开关，判定后将公司的福利基数信息单独区分返回 2023-12-06 09:51:07 +08:00
Harryxzy 4eb931686e 鲁控数字temp 2023-12-05 14:57:34 +08:00
Harryxzy 3687bdfcdc Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01 2023-12-05 11:30:04 +08:00
Harryxzy b093717e46 Merge branch 'fix/231102_账套增加义务人筛选' into release/2.9.9.2312.01 2023-12-05 11:28:47 +08:00
sy ce10204dab Merge remote-tracking branch 'remotes/origin/feature/231102-福利台账，补差待编辑项扩充其他可缴纳福利项' into release/2.9.9.2312.01 2023-12-05 11:26:48 +08:00
Harryxzy a0331112be Merge branch 'fie/231102_线下对比列头改造' into release/2.9.9.2312.01 2023-12-05 11:26:22 +08:00
sy 1bd20b2686 薪酬系统-福利台账，台账查询增加个税扣缴义务人 2023-11-27 11:20:36 +08:00
sy c8e3d6312b 薪酬系统-福利核算，补差待编辑福利项列表功能接口，补缴第三种方式的待编辑福利项获取逻辑优化，补差编辑tab页待编辑福利项获取逻辑优化 2023-11-24 14:05:03 +08:00
钱涛 a143b4fba5 新增工资单模板短信字段 2023-11-23 09:31:09 +08:00
钱涛 f16f93fd43 过滤pdf中的空或0值 2023-11-22 14:06:34 +08:00
Harryxzy 805fb9ff3c 1、薪资账套页面增加义务人筛选条件 
2、薪资核算页面增加义务人列表
 2023-11-20 16:14:51 +08:00
钱涛 a2f63dee2b 短信模板设置接口 2023-11-16 15:42:11 +08:00
钱涛 e1a4e275ff 短信模板设置接口 2023-11-16 15:41:29 +08:00
钱涛 3de1e62f6b 短信模板 2023-11-16 11:38:21 +08:00
Harryxzy 97a5d4ab91 线下对比表头改造成分组的样式 2023-11-15 17:12:52 +08:00
钱涛 d2127cccff 短信模板 2023-11-15 13:32:37 +08:00
钱涛 f3bc735fae 短信发送 2023-11-13 16:52:19 +08:00
钱涛 00f806a8e9 Merge branch 'release/3.0.0.2311.01' into feature/报表支持自定义维度 2023-11-07 19:06:57 +08:00
钱涛 bcee3c5e5a 人员属性扩展 2023-11-07 19:06:43 +08:00
Harryxzy f2a840576e Merge branch 'fix/薪资核算导入下载模板bug' into release/3.0.0.2311.01 2023-11-07 11:24:25 +08:00
钱涛 68bc79ab0b 修改关键字 2023-11-07 11:00:00 +08:00
钱涛 74f7c71ffe 扩展维度属性 2023-11-06 11:19:00 +08:00
钱涛 0634a139b9 显示字符统计规则 2023-11-02 18:41:58 +08:00
钱涛 3d8919da25 账套增加证件号码字段 2023-10-31 15:08:43 +08:00
钱涛 2b4ded9dd0 修复合计没有根据自定义字段过滤 2023-10-30 19:19:07 +08:00
钱涛 872ca0a805 恢复档案pageid 2023-10-26 13:45:38 +08:00
钱涛 adc8bce395 薪资档案改个pageid 2023-10-25 10:14:33 +08:00
sy 05b2c1868b Merge remote-tracking branch 'remotes/origin/feature/231001-福利档案基数调整记录' into release/2.9.6.2310.01 2023-10-24 14:11:22 +08:00
sy 1c0b00d163 薪酬系统-福利档案，福利档案基数调整记录列表查询入参调整 2023-10-23 18:07:37 +08:00
钱涛 0dd9040408 一键累计bug修复 2023-10-19 17:35:33 +08:00
钱涛 3745be2c5c 状态编码 2023-10-19 15:52:52 +08:00
sy 96bc325b43 薪酬系统-福利档案，福利档案基数调整记录列表查询入参和返回数据调整 2023-10-18 15:13:08 +08:00
sy b9a681a791 薪酬系统-福利台账，线下对比中数值是否存在差异相关逻辑优化 2023-10-18 14:14:05 +08:00
sy 9ac549c06a 薪酬系统-福利档案，福利档案基数调整记录列表查询 2023-10-18 13:34:05 +08:00
sy e68359ef50 Merge branch 'fix/231001-福利台账，导入模板下载接口由get改为post' into release/2.9.6.2310.01 2023-10-18 09:48:19 +08:00
钱涛 5d7a6bc241 调薪记录 2023-10-17 18:04:47 +08:00
sy e80a3497d9 薪酬系统-福利档案，福利档案导入逻辑中增加基数调整记录 2023-10-17 11:40:28 +08:00
Harryxzy fbc49bff98 公式变量为文本时返回””number返回0 2023-10-12 13:47:18 +08:00
sy 92a7daa9fa 薪酬系统-福利台账，正常缴纳导入模板下载接口改为post类型 2023-10-10 16:17:44 +08:00
钱涛 182e90676c Merge branch 'feature/自定义筛选条件' into release/2.9.6.2310.01 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
 2023-10-08 14:24:33 +08:00
钱涛 8166e76081 账套增加状态字段 2023-10-08 13:38:37 +08:00
钱涛 138f832537 时效性过滤 2023-10-08 10:11:07 +08:00
钱涛 d98933832a Merge branch 'feature/生成签名pdf' into release/2.9.6.2310.01 
# Conflicts:
#	src/com/engine/salary/web/SalaryBillController.java
 2023-10-07 15:19:38 +08:00
钱涛 5241972151 工资单时效设置 2023-10-07 14:46:28 +08:00
钱涛 4c5bc5dda7 增加状态 2023-09-28 17:05:42 +08:00
钱涛 4ed4edc9ed pdf按钮控制 2023-09-27 14:19:52 +08:00
钱涛 7562b4e4a3 Merge branch 'feature/生成签名pdf' into feature/自定义筛选条件 2023-09-27 14:01:32 +08:00
钱涛 e37922c52f 工资单pdf 2023-09-26 10:26:12 +08:00
钱涛 1de83a57c2 工资单pdf 2023-09-26 10:00:00 +08:00
钱涛 5d203b0783 自定义搜索 2023-09-25 16:53:01 +08:00
钱涛 faeafbe5ad 暂存 2023-09-25 15:38:14 +08:00
Harryxzy bf8ae9fd09 Merge branch 'fix/230902-导出报表为数值类型' into release/2.9.5.2309.01 2023-09-21 16:03:38 +08:00
sy f4883ad87c Merge remote-tracking branch 'remotes/origin/feature/230901-社保福利方案搜索功能' into release/2.9.5.2309.01 2023-09-21 14:10:06 +08:00
sy 5f84ed451b Merge remote-tracking branch 'remotes/origin/feature/230901-福利台账-调差，支持一个人存在多个调差记录' into release/2.9.5.2309.01 2023-09-21 14:09:54 +08:00
Harryxzy efa818f8b9 核算结果导出数值项excel格式为数值 2023-09-21 13:36:23 +08:00
Harryxzy 443368bdb3 Merge branch 'fix/230902-账套中从公式改为输入，核算公式展示错误' into release/2.9.5.2309.01 2023-09-21 11:44:23 +08:00
sy 3167aaab63 薪酬系统-福利方案，修改查询参数 2023-09-20 17:29:44 +08:00
Harryxzy c40c31845c 账套中修改公式为输入，核算的公式页面展示为空字符串不是”输入“ 2023-09-20 15:26:18 +08:00
钱涛 9ab80de441 工资单pdf和签名 2023-09-20 14:45:44 +08:00
Harryxzy 5bd66b626f 查看工资单后能够继续反馈、确认 2023-09-19 16:21:23 +08:00
sy 2afa94e3a4 Merge remote-tracking branch 'remotes/origin/release/2.9.5.2309.01' into feature/230901-福利台账-调差，支持一个人存在多个调差记录 2023-09-19 10:47:13 +08:00
钱涛 12480f8306 生成工资单pdf签名 2023-09-18 18:45:59 +08:00
sy 5538a7d01e 薪酬系统-福利方案，增加查询功能 2023-09-18 16:30:52 +08:00
钱涛 88a59d3d01 处理空指针 2023-09-18 13:49:25 +08:00
钱涛 7b3f7b2e39 签名 2023-09-18 10:25:43 +08:00
Harryxzy 7db0a475ff Merge branch 'fix/230902-薪资账套复制缺少字段' into release/2.9.5.2309.01 2023-09-14 17:35:05 +08:00
Harryxzy 0675de75ed 修复复制账套时少复制 2023-09-14 17:32:01 +08:00
钱涛 2b13d0c7ef 定薪账套 2023-09-14 11:56:00 +08:00
sy 0ad4a63a6b Merge remote-tracking branch 'remotes/origin/fix/230901-福利档案编辑问题修复' into feature/230901-福利台账-调差，支持一个人存在多个调差记录 2023-09-12 11:30:12 +08:00
sy b276066b52 薪酬系统-福利台账，导入模板带出核算数据 2023-09-12 11:05:46 +08:00
sy 39971f726d Merge remote-tracking branch 'remotes/origin/feature/230901-福利档案-非系统人员tab' into release/2.9.5.2309.01 2023-09-08 17:02:03 +08:00
sy 3e7180a25e Merge remote-tracking branch 'remotes/origin/feature/230901-福利档案-非系统人员tab' into feature/230901-福利台账-调差，支持一个人存在多个调差记录 2023-09-08 16:57:32 +08:00
sy ec406b7f8a 薪酬系统-福利档案，福利档案编辑并减员、编辑并增员action 2023-09-08 16:57:09 +08:00
Harryxzy 8ec5def53d Merge branch 'feature/230901-同步薪资项目至账套' into release/2.9.5.2309.01 2023-09-07 10:05:14 +08:00
sy f6094cbc7a 薪酬系统-福利档案，非系统人员tab页列表 2023-09-06 10:04:58 +08:00
Harryxzy 6ca1c6eae3 Merge branch 'fix/230802-薪资核算编辑时保留小数位数' into release/2.9.4.2308.02 2023-08-31 11:13:46 +08:00
Harryxzy 190bbe0875 同步薪资项目至账套 2023-08-31 09:24:41 +08:00
Harryxzy 4467f57928 工资单模板新建时重命名无分类名字消失bug 2023-08-30 13:26:25 +08:00
Harryxzy e83db15bc7 薪资档案、薪资核算编辑前端控制保留位数 2023-08-25 15:09:12 +08:00
sy f925943b31 Merge remote-tracking branches 'remotes/origin/feature/230802-福利方案-修改方案明细接口' and 'remotes/origin/fix/230802-优化福利台账导出合计列' into feature/230802-福利档案-档案相关action 2023-08-24 09:15:48 +08:00
sy 299284872f 薪酬系统-福利方案，福利方案明细数据修改接口 2023-08-21 14:58:01 +08:00
sy 4ffca1872a 薪酬系统-福利台账，核算明细列表合计行导出 2023-08-18 17:58:36 +08:00
sy 63023ae8e6 薪酬系统-福利档案、台账，档案增加分部字段、tab计数过滤非系统人员、补差取消部分字段展示 2023-08-17 11:31:38 +08:00
Harryxzy 19cb2d9622 Merge branch 'feature/230703-薪资账套项目页面改造' into release/2.9.3.2308.01 2023-08-14 09:19:20 +08:00
Harryxzy 7ebb8d6618 Merge branch 'feature/230702-自定义工资项目展示名' into release/2.9.3.2308.01 2023-08-14 09:19:04 +08:00
sy 9f021b6d5e 薪酬系统-福利档案，修复非系统人员增量数据造成的bug 2023-08-08 15:03:52 +08:00
Harryxzy 6a01f0d785 Merge branch 'release/2.9.2.2307.02' into feature/230702-自定义工资项目展示名 2023-08-08 11:42:41 +08:00
Harryxzy fa7eb0ee60 Merge branch 'release/2.9.2.2307.02' into feature/230703-薪资账套项目页面改造 2023-08-08 11:06:06 +08:00
sy 8c9049f1f7 Merge remote-tracking branch 'remotes/origin/feature/230702-非系统人员导入功能' into release/2.9.3.2308.01 2023-08-04 15:26:24 +08:00
Harryxzy 190771037e fixbug 2023-08-04 09:33:17 +08:00
sy 3f10c8eb96 Merge remote-tracking branch 'remotes/origin/fix/福利台账-线下对比导入分批' into release/2.9.3.2308.01 2023-08-02 15:41:33 +08:00
sy 293297ad7f 薪酬系统-福利台账，线下对比导入分批,列表逻辑优化 2023-08-01 15:37:32 +08:00
Harryxzy 3827c8963d fix补发模板问题 2023-07-31 17:07:21 +08:00
Harryxzy b7203625c1 自定义工资项目展示名fix 添加 2023-07-31 10:47:00 +08:00
Harryxzy f282f1a3ab 自定义工资项目展示名 2023-07-28 17:51:50 +08:00
Harryxzy 02628d8224 薪资账套-薪资项目编辑fixBUG 2023-07-28 17:43:14 +08:00
sy 007d6df3cd 薪酬系统-非系统人员管理，非系统人员导入 2023-07-28 10:12:59 +08:00
sy 80f4f7d43b 薪酬系统-非系统人员管理，非系统人员导入模板 2023-07-27 09:39:03 +08:00
Harryxzy 7763f16c0f 薪资账套薪资项目编辑功能 2023-07-26 13:43:53 +08:00
Harryxzy da18b0f884 薪资账套项目页面改造temp 2023-07-25 16:46:57 +08:00
Harryxzy a8a414a48b 薪资账套项目页面改造temp 2023-07-24 17:11:19 +08:00
sy ea4b603c36 薪酬系统-薪资档案、核算，列表不要显示离职日期、核算人员确认页面范围列表不要显示离职日期 2023-07-24 11:26:36 +08:00
Harryxzy ad6a571310 自定义工资项目展示名fix 2023-07-21 11:08:54 +08:00
Harryxzy 19c297dfe9 自定义工资项目展示名fix补发 2023-07-20 15:57:27 +08:00
Harryxzy fd3abc7f65 自定义工资项目展示名 2023-07-20 14:12:33 +08:00
Harryxzy b95663ada8 自定义工资项目展示名 2023-07-20 10:42:16 +08:00
sy c7fe4fee23 Merge branches 'feature/230701-社保福利-核算记录的校验' and 'feature/230701-薪资核算-导出功能可选择字段导出' into release/2.9.2.2307.02 2023-07-20 10:19:40 +08:00
钱涛 01b02531ce Merge branch 'feature/外部人员' into release/2.9.2.2307.02 
# Conflicts:
#	src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
#	src/com/engine/salary/sys/service/SalarySysConfService.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
#	src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
 2023-07-20 10:08:05 +08:00
Harryxzy 8e6bd24d0d 自定义工资项目展示名 2023-07-19 16:14:25 +08:00
Harryxzy 0a4c19fb36 Merge branch 'feature/230702-薪资项目-核算时隐藏' into release/2.9.2.2307.02 2023-07-19 11:11:46 +08:00
sy 4b503513f2 Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into feature/230701-薪资核算-导出功能可选择字段导出 2023-07-19 10:04:58 +08:00
Harryxzy 78e5d37cf3 薪资项目-核算时隐藏 2023-07-18 17:22:42 +08:00
Harryxzy db9a0e22eb 薪资项目-核算时隐藏fixbug 2023-07-18 17:00:09 +08:00
Harryxzy bbb8417008 自定义工资项目展示名temp 2023-07-18 16:28:29 +08:00
Harryxzy d551f5ae76 薪资项目核算时隐藏 2023-07-18 14:03:59 +08:00
Harryxzy b8f44dd5b6 薪资项目核算时隐藏 2023-07-18 11:00:13 +08:00
Harryxzy 88892f1aac 工资单反馈fixBug 2023-07-17 12:36:20 +08:00
Harryxzy 8221d4da69 工资单反馈 2023-07-17 11:27:40 +08:00
Harryxzy faf9636a0d 薪资项目-核算时隐藏 temp 2023-07-14 11:34:53 +08:00
Harryxzy 30d61e352f 工资单确认反馈 2023-07-13 11:50:02 +08:00
sy c78c8375f0 薪酬系统-薪资核算，自定义导出字段 2023-07-12 15:20:02 +08:00
Harryxzy 820d15d06f 工资单确认反馈 2023-07-12 15:17:59 +08:00
sy 47dc9e35bd 薪酬系统-福利台账，已归档状态下重新核算按钮增加是否被薪资核算引用校验逻辑 2023-07-11 17:56:45 +08:00
钱涛 aec6918c12 Merge branch 'release/2.9.1.2307.01' into feature/外部人员 
# Conflicts:
#	src/com/engine/salary/biz/EmployBiz.java
#	src/com/engine/salary/biz/SIAccountBiz.java
#	src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java
#	src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
#	src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
#	src/com/engine/salary/service/SalaryEmployeeService.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/SIAccountServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java
#	src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
#	src/com/engine/salary/web/SalarySobController.java
#	src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
#	src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
#	src/com/engine/salary/wrapper/SalarySendWrapper.java
#	src/com/engine/salary/wrapper/TaxAgentSubAdminWrapper.java
#	src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
 2023-07-11 16:08:15 +08:00
Harryxzy 33a0723ad2 Merge branch 'release/2.9.1.2307.01' into feature/230701-工资单反馈 2023-07-11 15:29:21 +08:00
Harryxzy be895829c2 工资单反馈 2023-07-11 15:29:13 +08:00
sy c28f782f19 Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01 2023-07-11 11:11:15 +08:00
sy 83604ba534 薪酬系统-福利台账，修改台账列表返回台账状态值返回逻辑 2023-07-11 11:10:32 +08:00
sy a55ca5182e Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01 2023-07-11 09:59:29 +08:00
sy b705161492 薪酬系统-薪资核算、薪资档案、福利档案，高级搜索功能问题修复 2023-07-10 14:33:43 +08:00
Harryxzy 938f03946b Merge branch 'feature/230701-系统薪资项目可配置删除' into release/2.9.1.2307.01 2023-07-10 10:09:52 +08:00
Harryxzy 9b7ba19d64 Merge branch 'feature/230701-工资单定时发送' into release/2.9.1.2307.01 2023-07-10 10:09:45 +08:00
sy b92c7ff599 薪酬系统-薪资核算、薪资档案、福利档案，高级搜索中的状态条件改为数组类型的入参 2023-07-07 15:32:12 +08:00
sy 9c34fb9497 薪酬系统-薪资核算，搜索条件新增字段 2023-07-07 11:47:43 +08:00
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