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

3113 Commits

Author SHA1 Message Date
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
钱涛 ba49d66b46 在线算税日志 2024-06-20 10:39:40 +08:00
钱涛 0df6169152 在线获取累计专项附加扣除 2024-06-19 17:05:46 +08:00
钱涛 24a979507a 未报送人员列表 2024-06-19 11:37:31 +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
钱涛 d52e146001 在线算税时校验人员是否已报送 2024-06-19 09:53:46 +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
钱涛 af8cce8525 在线算税，个税对应规则 2024-06-17 17:03:48 +08:00
钱涛 5b7533e908 同步假期余额字段 2024-06-14 13:46:59 +08:00
钱涛 0633225648 同步假期余额字段 2024-06-14 13:34:21 +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
钱涛 e94273468e 处理刷新非正常人员问题 2024-06-11 15:27:00 +08:00
钱涛 a1e7ec160c 处理复制异常 2024-06-11 10:10:45 +08:00
钱涛 dc85ba6043 个税字段配置 2024-06-11 10:09:18 +08:00
钱涛 6a8c2dd8ac 个税字段配置 2024-06-07 11:01:57 +08:00
钱涛 3e11d7240b Merge branch 'release/个税版本' into feature/在线算税 2024-06-06 15:56:37 +08:00
钱涛 eca321ee4c Merge branch 'release/个税版本2.14.3.2406.01' into release/个税版本 2024-06-06 15:54:23 +08:00
钱涛 b7b1dc8aac Merge branch 'release/2.14.3.2406.01' into release/个税版本2.14.3.2406.01 2024-06-06 15:54:07 +08:00
钱涛 789b77ba0b 档案导入模板注释 2024-06-06 14:54:58 +08:00
钱涛 e1e00f4db0 在线算税v1 2024-06-06 13:51:33 +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
钱涛 440a64aece 补充日志 2024-06-03 13:52:39 +08:00
钱涛 572b114f28 Merge branch 'release/2.14.3.2406.01' into release/个税版本2.14.3.2406.01 
# Conflicts:
#	src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
#	src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
 2024-06-03 11:18:01 +08:00
钱涛 36fb0da4dc Merge branch 'release/2.14.2.2405.02' into release/个税版本 2024-05-31 11:39:26 +08:00
钱涛 6b164ece2a 处理隐藏bug 2024-05-31 11:39:08 +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
钱涛 cdcdfabe9b 处理申报类型问题 2024-05-30 15:19:15 +08:00
钱涛 c28bbf4d1d 处理冲突 2024-05-30 14:49:02 +08:00
钱涛 5efe84dd2d Merge branch 'release/2.14.2.2405.02' into release/个税版本 2024-05-30 14:42:00 +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
钱涛 ec7b251981 显示薪资项目显示申报类型 2024-05-30 14:21:27 +08:00
钱涛 98d4bb79a3 Merge branch 'release/2.14.2.2405.02' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
 2024-05-30 12:03:34 +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
钱涛 0e1242daa7 根据身份证导入 2024-05-28 14:10:45 +08:00
钱涛 f595b1782a Merge branch 'release/2.14.3.2406.01' into release/个税版本2.14.3.2406.01 2024-05-28 11:29:37 +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
钱涛 ffdbf20160 Merge branch 'release/2.14.2.2405.02' into release/个税版本 2024-05-27 13:48:02 +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
钱涛 ec5463c050 Merge branch 'release/2.14.2.2405.02' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
 2024-05-27 10:37:39 +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
钱涛 8bf2cda7c3 修复日期问题 2024-05-21 12:29:42 +08:00
钱涛 79cfa0cbc0 删除往期累计多余项目 
往期累计别名设置
 2024-05-21 10:50:17 +08:00
Harryxzy 0facbabf55 薪资项目增加默认值temp 2024-05-20 15:04:14 +08:00
钱涛 3dc8f6d57c Merge branch 'release/2.14.1.2405.01' into release/个税版本 2024-05-20 09:56:12 +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
钱涛 c146537684 修改计时说明 2024-05-16 15:56:49 +08:00
钱涛 3b9981e189 处理短信发送空值 2024-05-14 15:18:32 +08:00
钱涛 11cbf23b8f 统一进位规则 2024-05-14 14:27:19 +08:00
钱涛 0f1473801e 维护工具效率 2024-05-14 14:12:14 +08:00
钱涛 38ebbb9928 解决并发问题 2024-05-14 13:28:58 +08:00
钱涛 04978dd8e6 Merge branch 'release/2.14.1.2405.01' into release/个税版本 2024-05-13 14:01:22 +08:00
Harryxzy dd54a10433 核算固定列头数优化 2024-05-11 16:19:25 +08:00
Harryxzy 509257b419 pdf导出前先校验生成pdf 2024-05-11 15:07:54 +08:00
Harryxzy 8d18c0e5cb 优化“薪资项目同步至账套”，薪酬总管理员能选到所有义务人下账套 2024-05-10 18:25:32 +08:00
Harryxzy 1c1a77d387 移动端工资单列表返回登陆人id 2024-05-10 15:41:40 +08:00
Harryxzy 845586cba2 test 2024-05-10 14:54:02 +08:00
钱涛 6d4265acf1 职称显示为中午 2024-05-08 15:31:36 +08:00
钱涛 ec27cf5a08 Merge branch 'release/2.13.1.2404.02' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/service/AddUpDeductionService.java
#	src/com/engine/salary/wrapper/AddUpDeductionWrapper.java
 2024-05-08 11:17:40 +08:00
钱涛 c97618bd97 修复社保福利修改时没有小数位问题 2024-05-08 11:15:52 +08:00