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

3428 Commits

Author SHA1 Message Date
钱涛 77d8c8168c Merge branch 'release/2.16.1.2410.01' into feature/权限 
# Conflicts:
#	src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
 2024-10-22 17:10:47 +08:00
钱涛 b5e6059298 核算记录组织字段分开标识 2024-10-22 16:38:27 +08:00
钱涛 ce8356f9b2 分部id字段 2024-10-22 16:12:30 +08:00
钱涛 8c5c3d5949 工资单查看限制类型约束 2024-10-22 15:00:19 +08:00
钱涛 5271d2516a Merge branch 'release/2.16.1.2410.01' into feature/权限 
# Conflicts:
#	src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
#	src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
 2024-10-22 09:27:11 +08:00
钱涛 2bd336fc16 单元格锁定 2024-10-18 16:54:34 +08:00
钱涛 af34b8a5b5 单元格锁定 2024-10-18 16:49:17 +08:00
钱涛 988b82751e 考勤日志 2024-10-18 16:21:14 +08:00
钱涛 57fdc79e7b 修复引用日期转换问题 2024-10-18 15:58:43 +08:00
钱涛 96a7be5625 修复核算列表次账号不显示问题 2024-10-18 11:03:33 +08:00
钱涛 313b91297f Merge branch 'release/2.16.1.2410.01' into feature/次账号 
# Conflicts:
#	src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
 2024-10-18 10:39:12 +08:00
钱涛 9f498551e4 单元格锁定字段改成字符型 2024-10-18 10:20:29 +08:00
钱涛 be2d6b693a 单元格锁定 2024-10-17 18:27:37 +08:00
Harryxzy c6fdbe6403 社保停缴action最后缴纳月支持分开设置 2024-10-17 16:39:24 +08:00
Harryxzy f664536bce 社保停缴action最后缴纳月支持分开设置 2024-10-17 15:51:05 +08:00
钱涛 4ec883cd9c Merge branch 'release/2.16.1.2410.01' into feature/次账号 2024-10-17 14:28:08 +08:00
钱涛 38f773d125 优化核算导入效率 2024-10-17 14:07:27 +08:00
钱涛 70429df180 Merge branch 'custom/上海电力设计院' into release/2.16.1.2410.01 2024-10-17 13:42:23 +08:00
钱涛 0d100d9f53 修复报表分部条件过滤不生效 2024-10-17 10:20:58 +08:00
钱涛 fb8595ac00 次账号规则 2024-10-16 18:20:11 +08:00
钱涛 070a2a75ac Merge branch 'release/2.15.2.2409.01' into feature/次账号 2024-10-16 17:19:43 +08:00
钱涛 637e5ced98 Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-10-16 17:19:19 +08:00
钱涛 d42e9768c2 处理sqlserver浮动数据bug 2024-10-16 16:53:24 +08:00
Harryxzy fc88f03904 浮动薪酬加解密 2024-10-16 15:47:18 +08:00
钱涛 53ce7c7b43 核算人员显示次账号 2024-10-16 15:25:48 +08:00
钱涛 8e90361e82 Merge branch 'release/2.15.2.2409.01' into feature/权限 
# Conflicts:
#	src/com/engine/salary/service/VariableArchiveService.java
 2024-10-16 10:04:24 +08:00
Harryxzy 35a0349f38 Merge remote-tracking branch 'origin/release/2.15.2.2409.01' into release/2.15.2.2409.01 2024-10-16 09:42:10 +08:00
Harryxzy e8559e1afa 修复社保福利导入报无人员 （历史数据兼容bug） 2024-10-16 09:41:55 +08:00
钱涛 5f50c26640 取消核算导入vlookup支持 2024-10-16 09:30:10 +08:00
钱涛 6ec7210720 除去核算支持函数 2024-10-15 14:40:04 +08:00
钱涛 6336ae24a0 Merge branch 'release/2.15.2.2409.01' into custom/上海电力设计院 2024-10-15 14:27:55 +08:00
钱涛 d3050117d1 支持次账号 2024-10-15 14:24:37 +08:00
Harryxzy 4c551dae87 Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01 2024-10-14 15:06:52 +08:00
Harryxzy dbd1b574e0 浮动薪酬优化 2024-10-14 15:05:22 +08:00
Harryxzy 3ac5da2b31 社保台账sqlserver 2100bug 2024-10-14 14:34:46 +08:00
Harryxzy 49cbb7a7cc 浮动薪酬 2024-10-14 10:38:30 +08:00
钱涛 0111822a47 Merge branch 'release/2.15.2.2409.01' into feature/权限 
# Conflicts:
#	src/com/engine/salary/constant/SalaryDefaultTenantConstant.java
#	src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
 2024-10-12 15:16:38 +08:00
钱涛 779d519a6f Merge branch 'release/2.15.2.2409.01' into feature/自定义列全局设置 2024-10-12 11:11:44 +08:00
钱涛 c209399566 修复模板设置主键 2024-10-12 09:38:08 +08:00
钱涛 265ca2a54e 默认展示所有薪资明细列 2024-10-11 18:02:52 +08:00
钱涛 a0bc3b5452 记录核算日志 2024-10-11 17:32:02 +08:00
钱涛 3a224170f1 导入字段持久化 2024-10-11 17:17:07 +08:00
钱涛 4c4b6ab57d 导入字段持久化 2024-10-11 17:14:14 +08:00
钱涛 b6c7a7f2bd 自定义列全局设置 2024-10-11 17:04:13 +08:00
钱涛 32b3ce97a9 Merge branch 'release/2.15.2.2409.01' into feature/自定义列全局设置 2024-10-11 15:34:44 +08:00
钱涛 64ac30c05f 自定义列全局设置 2024-10-11 15:34:17 +08:00
Harryxzy 310c77a270 excel设置列宽 超过255报错 2024-10-11 15:14:21 +08:00
Harryxzy 8d8fc5c15d 社保台账人员信息快照 2024-10-11 10:17:35 +08:00
钱涛 861cda00fa 1、批量锁定、批量解锁选择人员的所在行的工资项目，需根据人员的选择来设置。 
2、导入薪资项目时，优化下当前导入表头能否自动为上次选择的表头信息
 2024-10-10 11:39:22 +08:00
钱涛 2ba4bb72db 薪资明细增加入职日期 2024-10-09 18:10:38 +08:00
钱涛 767d650ee9 Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-10-09 17:31:45 +08:00
钱涛 3a128a4c5b 报表快照 2024-10-09 14:59:33 +08:00
钱涛 a40188659f 报表快照 2024-10-09 13:21:28 +08:00
Harryxzy 752de1fa8e 社保福利台账人员信息快照 2024-10-09 10:57:23 +08:00
钱涛 c2b200d843 业务线 2024-10-08 19:47:45 +08:00
钱涛 237ea8fcd8 业务线 2024-10-08 19:47:18 +08:00
钱涛 f487e060a2 Merge branch 'feature/快照条件搜索报表' into feature/权限 
# Conflicts:
#	src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
 2024-10-08 16:20:32 +08:00
钱涛 09ccda7883 Merge branch 'release/2.15.2.2409.01' into feature/快照条件搜索报表 2024-10-08 16:12:08 +08:00
钱涛 61dee5d3a1 薪资明细排序 2024-10-08 15:48:33 +08:00
钱涛 ff5419f2bb 薪资明细排序 2024-10-08 15:45:12 +08:00
钱涛 edb07052b5 员工明细排序 2024-10-08 14:36:18 +08:00
钱涛 87f819f3e2 Merge branch 'release/2.15.2.2409.01' into feature/快照条件搜索报表 2024-10-08 14:25:26 +08:00
钱涛 ff44ddd8b1 员工明细排序 2024-10-08 14:19:02 +08:00
钱涛 8c0bad8023 报表快照 2024-09-30 10:37:27 +08:00
钱涛 13f0854208 报表缓存 2024-09-29 17:02:59 +08:00
钱涛 b4050e4ee8 报表快照搜索 2024-09-29 16:58:41 +08:00
钱涛 800f03427d 社保档案业务线 2024-09-29 14:34:44 +08:00
钱涛 7f233145d4 fix刷新核算人员功能冲突 2024-09-29 11:07:48 +08:00
钱涛 d54dd4e237 fix刷新核算人员功能冲突 2024-09-29 10:52:04 +08:00
钱涛 541546f5c8 Merge branch 'release/2.15.2.2409.01' into feature/权限 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
 2024-09-29 10:46:04 +08:00
钱涛 93d2980ad8 刷新核算人员功能 2024-09-29 10:37:38 +08:00
钱涛 4a8e96ebe6 修复扣缴业务人 2024-09-27 18:10:21 +08:00
钱涛 4db0fdc699 SQL 使用mybatis执行 2024-09-27 17:18:07 +08:00
钱涛 6e03afecc2 社保档案导入 2024-09-27 16:15:01 +08:00
钱涛 1d43e980e7 1、优化浮动数据业务线 
2、优化浮动字段业务线
3、修复累计专项附加编辑权限
 2024-09-27 11:34:01 +08:00
钱涛 e512a2868a Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-27 11:13:24 +08:00
钱涛 0852094cb1 修改浮动数据扣缴义务人id类型 2024-09-27 11:13:00 +08:00
钱涛 ab2912fb28 Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-27 11:08:53 +08:00
钱涛 ecd99537fa 修复浮动数据null 2024-09-27 11:04:44 +08:00
钱涛 ffb4b5f0b4 记录删除业务线日志 2024-09-27 10:16:48 +08:00
钱涛 222fe9facd 业务线明细列表 2024-09-26 19:20:37 +08:00
钱涛 7f17c2a9b7 业务线同步 2024-09-26 17:52:01 +08:00
钱涛 0d7cdeddb0 社保台账操作按钮 2024-09-26 15:57:16 +08:00
钱涛 78c8d06200 社保福利搜索条件 2024-09-26 11:24:12 +08:00
钱涛 9b9d41532d 社保福利业务线 2024-09-26 10:35:46 +08:00
钱涛 2ada09f16c Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-25 16:07:42 +08:00
钱涛 b732430562 支持根据工号排序 2024-09-25 15:40:36 +08:00
钱涛 9f7fe00303 穿透显示快照组织信息 2024-09-25 13:38:45 +08:00
钱涛 ff200e2586 核算确认列表组织信息 2024-09-25 11:45:36 +08:00
钱涛 63c6a5af5e 业务线配置 2024-09-24 19:02:40 +08:00
钱涛 ae708a1d3b Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-24 13:19:59 +08:00
钱涛 0944efcf5e 物理删除业务线数据 2024-09-24 11:04:44 +08:00
钱涛 d959c75ce0 业务线操作日志 2024-09-24 10:19:06 +08:00
钱涛 a659821be8 业务线高级搜索 2024-09-24 09:50:46 +08:00
钱涛 cc6deee04c 报表模块分权 2024-09-23 14:35:51 +08:00
钱涛 1bb5dd63fb 优化申报提示 2024-09-23 13:20:59 +08:00
钱涛 164a97a8e0 修复大数据量，重新核算报错 2024-09-23 11:10:25 +08:00
钱涛 f0f6943eb0 薪资项目模块 2024-09-23 10:17:36 +08:00
钱涛 f62dfa17be 往期累计模块 2024-09-20 17:01:37 +08:00
钱涛 0ece125d18 其他免税扣除模块 2024-09-20 16:49:46 +08:00
钱涛 619af1a76a 其他免税扣除模块 2024-09-20 16:45:35 +08:00
钱涛 7ea6278e4e 累计专项附加扣除模块 2024-09-20 15:58:05 +08:00
钱涛 63a9e9caf8 Merge branch 'release/2.15.2.2409.01' into feature/权限 
# Conflicts:
#	src/com/engine/salary/service/impl/VariableArchiveServiceImpl.java
 2024-09-20 13:20:30 +08:00
钱涛 dc3dfc2d6b 去除脱敏报表 2024-09-20 11:41:44 +08:00
钱涛 7584404bc1 Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-20 10:27:42 +08:00
钱涛 0f1d710cc1 穿梭薪资项目列表 2024-09-19 17:57:48 +08:00
Harryxzy 2b7b61745a Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01 2024-09-19 17:50:09 +08:00
钱涛 ee535fc2bf 1、业务线-新建累计专项附加扣除 
2、业务线-报表
 2024-09-19 16:46:36 +08:00
钱涛 91863b901f 增加核算日志 2024-09-19 14:17:47 +08:00
钱涛 a59448e454 修复人力资源删除数据影响列表展示 2024-09-18 18:24:08 +08:00
钱涛 6e7ccb2339 浮动薪资档案分权 2024-09-18 18:19:58 +08:00
Harryxzy 3420c36448 人员id加密 2024-09-18 18:10:30 +08:00
Harryxzy 18ab255678 Merge branch 'fix/240901_社保福利档案补缴添加bug' into release/2.15.2.2409.01 2024-09-18 16:47:19 +08:00
Harryxzy 58012fe1e1 修复社保福利档案补缴添加bug 2024-09-18 16:44:02 +08:00
钱涛 9edf23fa37 Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-18 16:13:24 +08:00
钱涛 cbd6553e11 Merge remote-tracking branch 'origin/release/2.15.2.2409.01' into release/2.15.2.2409.01 2024-09-18 15:59:45 +08:00
钱涛 09042321d1 1、支持获取班次信息 
2、导出考勤功能优化，excel列和列表显示保持一致
 2024-09-18 15:59:36 +08:00
Harryxzy c4826515e1 Merge branch 'fix/240802-报表数据透视bug' into feature/240901-报表增加岗位筛选 2024-09-14 15:33:58 +08:00
Harryxzy eefd4d1795 报表增加岗位筛选 2024-09-14 15:33:31 +08:00
钱涛 174838382a 支持扣缴义务人选项 2024-09-14 10:52:06 +08:00
Harryxzy 31d2994a9a 浮动薪酬多语言 2024-09-14 10:30:32 +08:00
钱涛 a48d4cea11 浮动数据 2024-09-14 09:36:52 +08:00
钱涛 96ced6e934 Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-13 17:32:58 +08:00
钱涛 de0728665b 导入往期累计 2024-09-13 17:32:15 +08:00
Harryxzy c212a2782f 薪酬统计报表增加岗位筛选 2024-09-13 14:54:52 +08:00
Harryxzy 9e5810f173 Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01 2024-09-13 11:11:24 +08:00
钱涛 d70e63e787 修复工资单保存异常 2024-09-12 17:07:52 +08:00
钱涛 4d40deeada 业务线资源 2024-09-12 16:32:19 +08:00
钱涛 3d21fd250f 工资单支持文本变量 2024-09-12 16:22:32 +08:00
钱涛 e8b2fec1ff Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-12 15:03:19 +08:00
钱涛 46f94ddd3d 档案批量发薪、停薪权限控制 2024-09-12 14:48:51 +08:00
钱涛 383562c9cf 工资单、数据采集权限功能 2024-09-12 11:50:18 +08:00
钱涛 54f9c8f056 增加账套配置接口级锁 2024-09-11 16:15:02 +08:00
钱涛 7393d96259 增加账套配置接口级锁 2024-09-11 16:13:49 +08:00
钱涛 87d601c65b 账套和核算列表的权限控制 2024-09-11 15:25:50 +08:00
钱涛 c7659e0717 数据采集权限 2024-09-11 10:28:20 +08:00
钱涛 5e67b5937d 业务线权限接口 2024-09-10 14:42:08 +08:00
钱涛 3614f89982 业务线权限接口 2024-09-10 13:37:21 +08:00
钱涛 a0fb036bce 业务线配置 2024-09-09 19:10:40 +08:00
钱涛 1dd8f12534 Merge branch 'release/2.15.1.2407.01' into feature/权限 
# Conflicts:
#	resource/wiki/扩展功能/hrmSalaryCustom.properties
 2024-09-09 14:20:56 +08:00
钱涛 09fb9898e7 完成账套和扣缴义务人接口 2024-09-09 11:13:10 +08:00
钱涛 17afe87356 申报表权限规则 2024-09-05 18:14:02 +08:00
钱涛 4d9f1e6ff4 申报权限按钮限制 2024-09-05 17:31:01 +08:00
钱涛 882716b10c 修复核算结果可能为空带来的影响 2024-09-05 14:13:43 +08:00
钱涛 920b0e31c4 账套扣缴义务人聚合查询 2024-09-05 10:26:52 +08:00
钱涛 4b0eee4798 工资单跨扣缴义务人发放 2024-09-04 15:39:54 +08:00
钱涛 5ccee97429 新建账套携带各扣缴义务人人员范围 2024-09-04 13:59:00 +08:00
钱涛 e7eb2e3459 支持跨扣缴义务人兼容性 2024-09-03 15:48:20 +08:00
钱涛 e788f3dd37 申报表支持跨扣缴义务人 2024-09-03 14:46:08 +08:00
钱涛 0b90f4890e 工资单支持跨扣缴义务人 2024-09-03 14:30:57 +08:00
Harryxzy 0d5b1c37fd Merge remote-tracking branch 'origin/release/2.15.1.2407.01' into release/2.15.1.2407.01 2024-09-03 09:24:22 +08:00
Harryxzy 44c11c7dcc Merge branch 'feature/240801-社保方案上下限调整自动调整基数' into release/2.15.1.2407.01 2024-09-03 09:23:50 +08:00
钱涛 7f77f4cb12 获取账套关联扣缴义务人 2024-09-03 09:21:57 +08:00
钱涛 fa861c71dc 支持自定义单个线程处理人员数量 2024-09-02 18:11:00 +08:00
钱涛 ecfa6a4604 跨扣缴义务人核算 2024-09-02 17:36:41 +08:00
Harryxzy fedaf50187 返聘优化 2024-09-02 14:45:03 +08:00
钱涛 c72fa7fd7c 保存账套联系 2024-09-02 14:13:29 +08:00
钱涛 13665d8269 业务线列表 2024-09-02 10:43:28 +08:00
钱涛 fdb1f76e01 保存业务线 2024-09-02 10:22:42 +08:00
钱涛 05a9b9e9b2 修改批量插入大小 2024-08-30 17:23:36 +08:00
钱涛 9d4362b46e 业务线分权 2024-08-30 17:22:10 +08:00
Harryxzy e3200f7932 fix报表数据透视 bug 2024-08-30 13:35:17 +08:00
钱涛 49e6050c54 核算和账套的权限 2024-08-30 10:49:46 +08:00
钱涛 932ea6bedd 核算和账套的权限 2024-08-29 14:47:33 +08:00
钱涛 3721867723 核算和账套的权限 2024-08-28 17:55:42 +08:00
Harryxzy eb5cf04622 fix 2024-08-28 11:02:46 +08:00
钱涛 9b96d0cff2 限制账套 2024-08-28 10:02:39 +08:00
钱涛 a2db71d403 Merge branch 'release/2.15.1.2407.01' into feature/权限 2024-08-26 11:11:31 +08:00
钱涛 42e91e32da 改为通过快照信息搜索 2024-08-26 09:26:42 +08:00
钱涛 36c325c62d sql权限 2024-08-23 09:38:54 +08:00
钱涛 df8f2d7b3a sql权限 2024-08-22 16:37:35 +08:00
钱涛 a22aa624db 权限控制 2024-08-22 15:37:50 +08:00
钱涛 25321bb357 Merge branch 'release/2.15.1.2407.01' into feature/权限 2024-08-21 15:49:12 +08:00
Harryxzy 59820f6aca Merge branch 'fix/240801-核算导入支持vlookup' into release/2.15.1.2407.01 2024-08-20 14:03:58 +08:00
Harryxzy 2a58b4972b 薪资核算导入支持vlookup函数 2024-08-20 13:48:31 +08:00
钱涛 9fae93fcd7 Merge branch 'feature/导入工具' into release/2.15.1.2407.01 2024-08-20 11:40:33 +08:00
钱涛 ae3d666e7d 核算和申报权限 2024-08-20 11:40:12 +08:00
钱涛 9121268815 修复重新导入账套bug 2024-08-20 09:29:14 +08:00
Harryxzy 984e544503 社保方案上下限自动调整基数 2024-08-19 16:27:56 +08:00
Harryxzy 6dc9650305 Merge branch 'release/2.15.1.2407.01' into feature/240801-社保方案上下限调整自动调整基数 2024-08-19 16:01:06 +08:00
钱涛 7c46da5fce 删除数据范围 2024-08-19 15:29:45 +08:00
Harryxzy 26d300299b 社保方案上下限 2024-08-19 12:07:03 +08:00
钱涛 9b390faf50 SQL适配 2024-08-19 11:33:15 +08:00
钱涛 a796752203 Merge branch 'release/2.15.1.2407.01' into feature/权限 
# Conflicts:
#	src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java
 2024-08-19 10:43:43 +08:00
钱涛 cd8d4601af 全量迁移配置 2024-08-19 09:49:49 +08:00
Harryxzy 8742ee7857 Merge branch 'fix/240801-工资明细导出excel单元格格式' into release/2.15.1.2407.01 2024-08-16 15:27:15 +08:00
钱涛 105129165d Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资 2024-08-16 14:40:02 +08:00
钱涛 22c99e081d 支持Vlookup 2024-08-16 14:39:01 +08:00
钱涛 10b8be86d1 Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资 2024-08-16 14:14:30 +08:00
钱涛 4b9341cc98 支持Vlookup 2024-08-16 14:13:59 +08:00
钱涛 94d068356b Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资 2024-08-16 14:07:56 +08:00
钱涛 4b30292c6c 支持Vlookup 2024-08-16 14:07:16 +08:00
钱涛 e2b2b9071f Merge remote-tracking branch 'origin/feature/240801-浮动薪资' into feature/240801-浮动薪资 2024-08-16 14:04:31 +08:00
钱涛 1d388a1993 支持Vlookup 2024-08-16 14:04:20 +08:00
钱涛 659560550a Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资 2024-08-16 13:18:08 +08:00
钱涛 d23baeb940 支持Vlookup 2024-08-16 12:19:18 +08:00
钱涛 673699dfb8 导入工具明细 2024-08-16 11:18:27 +08:00
Harryxzy be6e7bb787 工资明细导出excel单元格格式 2024-08-16 11:08:57 +08:00
钱涛 7250ed3520 修复组织信息快照，主动添加或者sql添加人员丢失 2024-08-15 17:03:17 +08:00
钱涛 980dc2f532 导入工具 2024-08-15 16:25:31 +08:00
Harryxzy a4d91c3c97 删除无用代码 2024-08-15 16:01:00 +08:00
Harryxzy 2ee605df44 浮动薪酬优化 2024-08-15 13:56:41 +08:00
钱涛 c079b1d2e6 Merge branch 'release/2.15.1.2407.01' into feature/导入工具 2024-08-15 13:48:14 +08:00
钱涛 22ccad05ad 排除显示 2024-08-15 13:47:55 +08:00
钱涛 5071c08d8c Merge branch 'release/2.15.1.2407.01' into feature/导入工具 
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySobServiceImpl.java
 2024-08-15 13:41:52 +08:00
钱涛 c5c469e4c4 修复邮件不显示入职日期 2024-08-15 11:54:18 +08:00
Harryxzy e9fef7d915 Merge remote-tracking branch 'origin/release/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-15 11:10:49 +08:00
Harryxzy 4348954994 Merge branch 'feature/240801-报表义务人、账套分权' into release/2.15.1.2407.01 2024-08-15 11:09:09 +08:00
钱涛 2b2e9ea504 账套支持sql范围 2024-08-15 10:53:08 +08:00
钱涛 d37434521d Merge remote-tracking branch 'origin/release/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-15 10:37:57 +08:00
钱涛 f74ec99644 账套支持sql范围 2024-08-15 10:37:41 +08:00
钱涛 6450254371 薪酬迁移工具 2024-08-14 14:47:27 +08:00
Harryxzy 832a6ac1ec 社保福利台账明细导入2100bug 2024-08-14 11:17:56 +08:00
钱涛 9d26e1228f 薪酬迁移工具 2024-08-13 18:15:04 +08:00
Harryxzy c255d74912 批量导入 分页 2024-08-13 15:25:57 +08:00
Harryxzy a05fb6fcf0 报表义务人、账套分权 2024-08-13 13:45:24 +08:00
Harryxzy 2e7657eb23 浮动薪酬增加义务人 2024-08-12 17:21:11 +08:00
钱涛 845f117d9c excel导入工具 2024-08-12 17:17:52 +08:00
Harryxzy a0dff5780a 浮动薪酬增加义务人sql 2024-08-12 17:11:17 +08:00
Harryxzy 5055a4801a 浮动薪酬增加义务人 2024-08-12 16:36:27 +08:00
钱涛 ecb0f6f7bc excel导入工具 2024-08-12 15:16:06 +08:00
钱涛 b83d45efa0 下载系统配置 2024-08-12 10:02:46 +08:00
钱涛 31cd3981e2 添加日志 2024-08-09 17:30:44 +08:00
钱涛 71c9bd3564 xml文件 2024-08-09 15:53:36 +08:00
Harryxzy 75fb15928a 浮动薪酬 2024-08-09 10:21:40 +08:00
钱涛 dd257ec53e xml文件 2024-08-09 09:22:27 +08:00
钱涛 6532225da3 迁移工具 2024-08-08 18:04:50 +08:00
钱涛 83a408afa2 迁移工具 2024-08-08 16:53:31 +08:00
钱涛 8611358c6c 配置 2024-08-08 11:03:55 +08:00
钱涛 e0271c3006 成员和数据批量保存 2024-08-08 10:01:41 +08:00
钱涛 080a69c929 全量迁移 2024-08-08 09:50:04 +08:00
钱涛 484639a690 导入薪资项目、模板、预览 2024-08-07 14:40:08 +08:00
钱涛 d30380e2e7 导入薪资项目、模板、预览 2024-08-07 14:23:35 +08:00
钱涛 b8b9cbbe6c 导入薪资项目 2024-08-07 13:25:57 +08:00
钱涛 48120f8e24 导入薪资项目 2024-08-07 09:06:09 +08:00
Harryxzy dd18cf5191 考勤引用多个账套 2024-08-06 16:54:19 +08:00
钱涛 bd6e30b63b 导入薪资项目 2024-08-06 14:24:08 +08:00
钱涛 23ed2c5f3f 删除、同步对象设置 2024-08-06 10:46:33 +08:00
钱涛 10d988084b 导入工具 2024-08-06 10:32:57 +08:00
钱涛 84cb57ccd7 Merge branch 'release/2.15.1.2407.01' into feature/权限 2024-08-05 17:23:47 +08:00
钱涛 ff00de206c 线下对比 2024-08-05 17:23:25 +08:00
钱涛 4dcb3b4fea 薪资档案分权 2024-08-05 15:40:34 +08:00
钱涛 4d8c54bf8a 角色加描述 2024-08-02 16:18:26 +08:00
钱涛 494679087d 角色加描述 2024-08-02 14:04:14 +08:00
钱涛 9eea989bf2 显示扣缴义务人的角色 2024-08-02 10:10:04 +08:00
钱涛 4d51b6e57c 显示扣缴义务人的角色 2024-08-01 18:04:09 +08:00
钱涛 a0d2db2702 角色 2024-08-01 16:19:23 +08:00
钱涛 c674c22da1 在线算税重试处理 2024-08-01 10:56:29 +08:00
Harryxzy 8d057e2706 Merge branch 'feature/240702-编辑核算时人员信息' into release/2.15.1.2407.01 2024-08-01 10:53:29 +08:00
Harryxzy 8bbf8f3ff6 核算时编辑职称bug 2024-08-01 10:52:44 +08:00
钱涛 a8b487c94b Merge branch 'release/2.15.1.2407.01' into feature/权限 
# 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-08-01 10:16:05 +08:00
钱涛 241a85c711 默认值 2024-07-31 14:59:03 +08:00
钱涛 6f55def466 权限数据 2024-07-30 18:55:02 +08:00
Harryxzy bcf5fbdce7 Merge branch 'fix/240702-社保福利档案导入下载模板bug' into release/2.15.1.2407.01 2024-07-30 18:17:49 +08:00
钱涛 87a5eb59c6 暂存 2024-07-30 17:45:02 +08:00
Harryxzy 0c3610961f 修复社保福利档案 高级搜索后下载导入模板bug 2024-07-30 17:29:12 +08:00
钱涛 fad1402b06 权限项配置 2024-07-29 16:00:27 +08:00
钱涛 63012fd62a 成员列表 2024-07-29 13:28:46 +08:00
Harryxzy 9819bb25e0 修复社保福利台账补差添加bug 2024-07-29 10:58:41 +08:00
钱涛 a976dbc9c5 成员同步 2024-07-29 09:46:01 +08:00
钱涛 76543c6021 成员同步 2024-07-26 16:35:51 +08:00
钱涛 0b091eee12 成员表达式变更 2024-07-26 14:32:35 +08:00
钱涛 e30ae5a2a1 成员表达式变更 2024-07-26 14:30:14 +08:00
钱涛 4543539206 角色和成员基础接口 2024-07-26 11:35:17 +08:00
Harryxzy ec669c1f51 核算时编辑人员组织信息 2024-07-25 17:51:38 +08:00
Harryxzy bdd27bcfc6 核算时编辑人员组织信息 2024-07-25 14:04:14 +08:00
Harryxzy 671350654a fix薪资明细报表显示列定制 2024-07-22 15:29:34 +08:00
Harryxzy 039c6fd568 薪资明细报表合计行过滤文本项 2024-07-22 10:27:46 +08:00
钱涛 909152decc 报表导出改为从内存获取 2024-07-16 16:57:58 +08:00
Harryxzy 6f7ae2506d 阅后即焚oracle数据库修复 2024-07-16 14:56:11 +08:00
Harryxzy 78cdadbb99 工资单详情 - 显示列定制 2024-07-16 11:30:25 +08:00
Harryxzy 95ba4aee36 Merge branch 'fix/240701_返聘action优化' into release/2.15.1.2407.01 2024-07-15 14:48:21 +08:00
Harryxzy 5331494ebc Merge branch 'fix/240701_报表分页' into release/2.15.1.2407.01 2024-07-15 14:48:08 +08:00
Harryxzy e579bbc4f2 人员维度分页 2024-07-15 11:20:24 +08:00
钱涛 50e3be607d 修复oracle bug 2024-07-11 16:30:00 +08:00
Harryxzy a259a52044 人员维度分页 2024-07-11 11:28:54 +08:00
Harryxzy a6f02082d8 fix社保福利台账非系统人员日志空指针 2024-07-10 15:01:49 +08:00
Harryxzy 84ce2821f6 1、定薪、返聘action优化 
2、修复导出时excel中双击单元格变成黑色
 2024-07-10 14:01:09 +08:00
钱涛 7ef229dfde 修复社保调差bug 2024-07-10 10:43:11 +08:00
Harryxzy 95b9f5452a 薪资档案导出fix多选义务人bug 2024-07-08 10:20:21 +08:00
Harryxzy 3a7c1c2d29 修复sql隐藏bug 2024-07-03 18:00:29 +08:00
Harryxzy db93c2b8a8 修复报表分享记录分页总计数bug 2024-06-28 17:22:34 +08:00
钱涛 458f10d09b 优化考勤引用 2024-06-28 15:42:10 +08:00
钱涛 edddf5f557 处理8位小数问题 2024-06-28 14:42:23 +08:00
钱涛 9c7c6de614 核算信息快照 2024-06-27 16:10:30 +08:00
钱涛 ea07fe1a59 处理sqlserver 2100 个参数 2024-06-27 10:38:30 +08:00
Harryxzy b26663889d Merge branch 'fix/240603_薪资明细导出排序' into release/2.14.5.2406.03 2024-06-26 11:33:32 +08:00
Harryxzy 933fc8ae65 报表分享支持次账号 2024-06-26 11:33:12 +08:00
Harryxzy c1c8bae9da Merge branch 'fix/240603_薪资明细导出排序' into release/2.14.5.2406.03 2024-06-26 10:37:51 +08:00
Harryxzy 63c7477966 1、薪资明细导出根据显示列定制导出 
2、薪资档案 高级搜索支持个税扣缴义务人多选
 2024-06-26 10:35:05 +08:00
钱涛 993f21b448 Merge branch 'feature/人员信息快照' into release/2.14.5.2406.03 
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
 2024-06-21 14:17:36 +08:00
钱涛 a90e32fbf4 map映射 2024-06-20 17:08:01 +08:00
Harryxzy 071130adb3 Merge remote-tracking branch 'origin/release/2.14.4.2406.02' into release/2.14.4.2406.02 2024-06-20 16:40:42 +08:00
Harryxzy b5f8e88a58 Merge branch 'feature/240502_薪资项目增加默认值设置' into release/2.14.4.2406.02 2024-06-20 16:40:07 +08:00
Harryxzy 537992187e update 设置了多个default_value 2024-06-20 16:39:48 +08:00
钱涛 2be7ec31de 修改工资单预览 2024-06-20 16:39:35 +08:00
Harryxzy 560fabe075 账套人员范围导入增加了一列，导致导入校验没通过 2024-06-20 16:28:48 +08:00
钱涛 e5d66373e6 默认值需要导致异动 2024-06-20 14:47:19 +08:00
Harryxzy 3f9bb23e80 Merge branch 'feature/240502_薪资项目增加默认值设置' into release/2.14.4.2406.02 2024-06-20 11:44:15 +08:00
Harryxzy e13c2b0cd0 薪资项目同步默认值 2024-06-20 11:43:57 +08:00
Harryxzy 4fbd7d7418 Merge branch 'feature/240502_薪资项目增加默认值设置' into release/2.14.4.2406.02 2024-06-20 10:44:41 +08:00
Harryxzy 5459729da2 Merge branch 'feature/240301-导出excel单元格格式' into release/2.14.4.2406.02 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
 2024-06-20 10:44:12 +08:00
钱涛 0961071980 Merge remote-tracking branch 'origin/feature/240502_薪资项目增加默认值设置' into feature/240502_薪资项目增加默认值设置 
# Conflicts:
#	src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
 2024-06-19 11:23:43 +08:00
钱涛 fe8dcd0ccd 核算默认值 2024-06-19 11:21:00 +08:00
钱涛 f0fce26e8a Merge branch 'release/2.14.4.2406.02' into feature/240502_薪资项目增加默认值设置 
# Conflicts:
#	src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
 2024-06-19 11:14:31 +08:00
钱涛 81c768b7b9 人员信息快照 2024-06-18 15:28:31 +08:00
钱涛 0c0c754a9d 人员信息快照 2024-06-18 11:01:58 +08:00
Harryxzy 216c4cee84 默认值temp 2024-06-17 17:58:01 +08:00
钱涛 5b7533e908 同步假期余额字段 2024-06-14 13:46:59 +08:00
钱涛 5c13f80034 Merge remote-tracking branch 'origin/release/2.14.4.2406.02' into release/2.14.4.2406.02 2024-06-13 17:46:55 +08:00
钱涛 64e34d6d08 工资单预览 2024-06-13 17:46:37 +08:00
Harryxzy a27716ae72 Merge remote-tracking branch 'origin/release/2.14.4.2406.02' into release/2.14.4.2406.02 2024-06-13 14:14:38 +08:00
Harryxzy 6513c2b6e6 Merge branch 'fix/240601-补差导入模板bug' into release/2.14.4.2406.02 2024-06-13 14:14:21 +08:00
Harryxzy 1dd3439ce3 社保福利台账小数位优化 2024-06-13 13:59:43 +08:00
钱涛 db391f01c4 处理大数据内存溢出 2024-06-13 13:39:24 +08:00
钱涛 4798f5d4a6 处理大数据内存溢出 2024-06-12 17:35:06 +08:00
Harryxzy e249de9a59 报表导出单元格格式 2024-06-12 16:01:09 +08:00
钱涛 1983ba968c 去除日志 
系统薪资项目配置不需要重启
 2024-06-12 15:35:40 +08:00
钱涛 7e988193c6 公式扩展获取月有多少天 2024-06-12 14:31:50 +08:00
钱涛 853482141f 小数位支持10位 2024-06-12 10:45:32 +08:00
钱涛 f073f6d90c 处理刷新非正常人员问题 2024-06-11 15:48:07 +08:00
钱涛 a1e7ec160c 处理复制异常 2024-06-11 10:10:45 +08:00
钱涛 789b77ba0b 档案导入模板注释 2024-06-06 14:54:58 +08:00
Harryxzy 91444e9495 修复薪资核算高级搜索ISNOTEMPTY 中文显示 2024-06-05 16:54:53 +08:00
Harryxzy 16f5ffcf29 优化 - 社保福利台账小数位数 2024-06-05 15:30:57 +08:00
Harryxzy 91b8809c03 修复薪资核算搜索，合并计税bug 2024-06-05 13:43:49 +08:00
Harryxzy b6331b952c 修复 
1、社保福利台账补差下载导入模板，显示的是补差数据；
2、报表分享不设置起始日期时oracle数据库兼容问题；
 2024-06-05 11:02:59 +08:00
钱涛 abba78ead3 处理隐藏bug 2024-05-31 11:36:56 +08:00
钱涛 c86b53fd27 Merge branch 'feature/锁定人员' into release/2.14.3.2406.01 2024-05-30 17:06:57 +08:00
钱涛 9aa2a03425 Merge branch 'release/2.14.2.2405.02' into release/2.14.3.2406.01 2024-05-30 14:41:45 +08:00
钱涛 9e8e7f1f09 删除隐藏 2024-05-30 14:41:28 +08:00
钱涛 3569519b12 Merge branch 'release/2.14.2.2405.02' into release/2.14.3.2406.01 2024-05-30 12:02:18 +08:00
钱涛 18a4f7c3e7 隐藏数据迁移 2024-05-30 12:01:53 +08:00
钱涛 7952e93d01 考勤引用显示证件号码 2024-05-29 16:53:51 +08:00
钱涛 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
钱涛 98d45ebd32 处理内存溢出 2024-05-27 11:36:05 +08:00
钱涛 e2dec06735 隐藏身份证号 2024-05-27 10:52:26 +08:00
钱涛 24b2154cb3 隐藏身份证号 2024-05-27 10:48:46 +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 51b4a3198c 修复报表数值项目出现文本值 2024-05-21 15:04:52 +08:00
Harryxzy 0facbabf55 薪资项目增加默认值temp 2024-05-20 15:04:14 +08:00
钱涛 6a1b28c555 解决工资单null 2024-05-17 17:11:51 +08:00
钱涛 26d6efd827 pdf日志 2024-05-17 10:58:38 +08:00
Harryxzy b76a87b125 社保福利编辑保存改造 2024-05-17 09:40:52 +08:00