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

3579 Commits

Author SHA1 Message Date
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
钱涛 48687f8e65 添加日志 2024-08-09 16:19:56 +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
钱涛 ea3bdea6bb FIX冲突 2024-08-08 18:15:18 +08:00
钱涛 6532225da3 迁移工具 2024-08-08 18:04:50 +08:00
Harryxzy f3f814a145 Merge branch 'release/个税版本' into custom/艾志工业 
# Conflicts:
#	src/com/engine/salary/biz/EmployBiz.java
#	src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
#	src/com/engine/salary/service/AddUpSituationService.java
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
#	src/com/engine/salary/web/AddUpSituationController.java
#	src/com/engine/salary/wrapper/AddUpSituationWrapper.java
 2024-08-08 17:50:16 +08:00
钱涛 83a408afa2 迁移工具 2024-08-08 16:53:31 +08:00
钱涛 549edeeecb 日志 2024-08-08 11:52:10 +08:00
钱涛 8611358c6c 配置 2024-08-08 11:03:55 +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
钱涛 05a755c9b3 Merge branch 'release/2.15.1.2407.01' into release/个税版本 2024-08-06 14:24:42 +08:00
钱涛 bd6e30b63b 导入薪资项目 2024-08-06 14:24:08 +08:00
Harryxzy ceebf58f18 艾志社保bug修复 2024-08-06 14:20:41 +08:00
钱涛 10d988084b 导入工具 2024-08-06 10:32:57 +08:00
钱涛 ff00de206c 线下对比 2024-08-05 17:23:25 +08:00
钱涛 4b85b447c5 Merge branch 'release/2.15.1.2407.01' into release/个税版本 2024-08-01 11:47:05 +08:00
钱涛 1ede373638 处理进行中的错误码 2024-08-01 11:43:26 +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
钱涛 c179a9aedf 在线算税重试处理 2024-07-31 16:02:11 +08:00
钱涛 94f751ee8a Merge branch 'release/2.15.1.2407.01' into release/个税版本 2024-07-31 15:15:05 +08:00
钱涛 241a85c711 默认值 2024-07-31 14:59:03 +08:00
钱涛 1473f72bd0 Merge branch 'release/2.15.1.2407.01' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/mapper/datacollection/EmployMapper.java
#	src/com/engine/salary/mapper/datacollection/EmployMapper.xml
#	src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.java
#	src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
#	src/com/engine/salary/service/SalaryAcctEmployeeService.java
#	src/com/engine/salary/service/SalaryEmployeeService.java
#	src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
 2024-07-31 13:27:15 +08:00
钱涛 25d02d61c9 三方缴款接口更新 2024-07-31 13:17:35 +08:00
Harryxzy bcf5fbdce7 Merge branch 'fix/240702-社保福利档案导入下载模板bug' into release/2.15.1.2407.01 2024-07-30 18:17:49 +08:00
Harryxzy 0c3610961f 修复社保福利档案 高级搜索后下载导入模板bug 2024-07-30 17:29:12 +08:00
Harryxzy 9819bb25e0 修复社保福利台账补差添加bug 2024-07-29 10:58:41 +08:00
Harryxzy ec669c1f51 核算时编辑人员组织信息 2024-07-25 17:51:38 +08:00
Harryxzy bdd27bcfc6 核算时编辑人员组织信息 2024-07-25 14:04:14 +08:00
钱涛 88fee4eca0 下载企业算税明细 2024-07-23 14:47:12 +08:00
钱涛 2a7431c463 恢复对比功能 2024-07-23 10:14:58 +08:00
Harryxzy 671350654a fix薪资明细报表显示列定制 2024-07-22 15:29:34 +08:00
钱涛 89812f45f8 恢复对比功能 2024-07-22 14:18:05 +08:00
Harryxzy 039c6fd568 薪资明细报表合计行过滤文本项 2024-07-22 10:27:46 +08:00
钱涛 f40d2bec91 税后工资 2024-07-17 13:37:39 +08:00
钱涛 08c30c292b 按钮状态 2024-07-17 11:05:30 +08:00
钱涛 46b3dde438 税后工资接口 2024-07-17 09:03:31 +08:00
钱涛 e45ee09c7e Merge branch 'release/2.15.1.2407.01' into release/个税版本 2024-07-16 17:25:37 +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
钱涛 0fb8ed1792 修复个税映射 2024-07-15 16:59:10 +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
钱涛 a72c5e83e2 Merge branch 'release/2.15.1.2407.01' into release/个税版本 2024-07-15 10:25:50 +08:00
钱涛 50e3be607d 修复oracle bug 2024-07-11 16:30:00 +08:00
Harryxzy a259a52044 人员维度分页 2024-07-11 11:28:54 +08:00
钱涛 7db62ab647 Merge branch 'release/2.14.5.2406.03' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java
#	src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
 2024-07-10 17:05:06 +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 7de7e8b84c 艾志人员信息报送bugfix 2024-07-04 14:19:11 +08:00
钱涛 0c22a57f19 取消刷新缴款状态 
取消线下缴款逻辑
 2024-07-04 10:32:09 +08:00
Harryxzy 3a7c1c2d29 修复sql隐藏bug 2024-07-03 18:00:29 +08:00
钱涛 420d0a1fff 升级完税证明 2024-07-03 15:34:23 +08:00
钱涛 3f723d7750 记录日志 2024-07-02 19:13:14 +08:00
钱涛 39a2684196 升级缴款凭证作废接口 
升级完税证明接口
 2024-07-02 15:39:31 +08:00
钱涛 bdcdef34c2 非正常工资薪金的个税规则 2024-07-01 15:09:40 +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
钱涛 77708b96ab 升级1 2024-06-28 14:02:05 +08:00
钱涛 9c7c6de614 核算信息快照 2024-06-27 16:10:30 +08:00
钱涛 d267810e5c 处理报表bug 2024-06-27 11:30:35 +08:00
钱涛 68467fbe46 升级作废申报 2024-06-27 11:19:34 +08:00
钱涛 ea07fe1a59 处理sqlserver 2100 个参数 2024-06-27 10:38:30 +08:00
钱涛 65fcfb8fac 更正申报 2024-06-27 09:30:25 +08:00
钱涛 de257568f1 轮询处理方式 
记录接口日志
 2024-06-26 14:56:43 +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
钱涛 5cffdbc8e6 更正申报接口 2024-06-25 09:38:20 +08:00
钱涛 325e7609b7 1、欠费查询(下架) 
2、获取欠费查询反馈(下架)
 2024-06-24 17:07:36 +08:00
钱涛 610c824e69 局端申报状态查询(下架) 2024-06-24 17:05:41 +08:00
钱涛 d0da02119d 企业申报数据明细查询 (下架) 2024-06-24 17:02:53 +08:00
钱涛 bae85b761c 申报内置算税结果查询(下架) 2024-06-24 16:52:42 +08:00
钱涛 90a198bb54 1、作废人员信息（下架） 
2、企业人员列表查询(下架)
3、关键信息变更(下架)
 2024-06-24 16:32:15 +08:00
钱涛 fda10a06ae 1、企业登记及查询服务升级 
2、申报密码校验服务升级
 2024-06-24 16:23:32 +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
钱涛 3a17e8c833 Merge branch 'release/个税版本' into feature/在线算税 2024-06-21 13:59:00 +08:00
钱涛 d5dd3093cb 处理冲突 2024-06-21 13:38:44 +08:00
钱涛 02be1b9da4 Merge branch 'release/2.14.4.2406.02' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
#	src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
#	src/com/engine/salary/util/excel/ExcelUtil.java
 2024-06-21 10:53:59 +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
钱涛 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
Harryxzy 7359904509 Merge branch 'release/个税版本' into custom/艾志工业 
# Conflicts:
#	src/com/engine/salary/service/impl/SISchemeServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
 2024-06-14 10:53:13 +08:00
Harryxzy f71b8bf7c9 艾志 - 人员信息报送刷新根据首次发薪日判断 2024-06-14 10:43:15 +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
Harryxzy 47f6701d29 Merge branch 'release/个税版本' into custom/艾志工业 2024-05-31 16:50:39 +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
Harryxzy bdecf26b09 Merge branch 'release/个税版本' into custom/艾志工业 2024-05-30 17:24:24 +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
Harryxzy 76bb2faced Merge branch 'release/个税版本' into custom/艾志工业 
# Conflicts:
#	src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
 2024-05-30 09:27:26 +08:00
Harryxzy 69877f518f 艾志 个税申报管理员功能，且注释上一次所开发的分权功能（通过建模按照部门维度所设置的权限） 2024-05-29 18:56:19 +08:00
Harryxzy 399852fe8a 艾志 个税申报管理员功能，且注释上一次所开发的分权功能（通过建模按照部门维度所设置的权限） 2024-05-29 18:52:12 +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
钱涛 bb751c0df3 Merge branch 'release/个税版本' into custom/艾志工业 
# Conflicts:
#	src/com/engine/salary/entity/datacollection/AddUpSituation.java
 2024-05-21 13:28:13 +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
钱涛 b136c71814 Merge branch 'release/个税版本' into custom/艾志工业 2024-05-08 13:48:03 +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
钱涛 6f2d65a4be 修复社保福利新建时没有小数位和进位规则对应问题 2024-05-08 10:49:08 +08:00
钱涛 bb32bdfe11 核算详细信息 2024-05-07 18:48:38 +08:00
钱涛 6b0606f5a4 自适应 2024-05-07 17:37:02 +08:00
钱涛 5c90909c0e 账套快照-解决导入、公式、详细详细不对应问题 2024-05-07 15:25:43 +08:00
钱涛 1cb89a9d1b 账套快照-工资单模板 2024-05-06 17:41:39 +08:00
钱涛 3428de9e33 账套快照 2024-05-06 16:03:29 +08:00
Harryxzy b5b2c9ef1e 累计专项附加扣除一键累计，能根据义务人进行累计 2024-04-30 15:00:43 +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
钱涛 7d7d2dc309 处理公式数组问题 2024-04-28 16:21:44 +08:00
Harryxzy e7c46bc5e8 优化同步离职日期 2024-04-26 15:13:54 +08:00
Harryxzy 4f391a2159 工资单审批 2024-04-26 11:24:47 +08:00
Harryxzy 34fe103055 工资单审批 2024-04-25 15:30:25 +08:00
Harryxzy ea968c316e 解决数据透视薪资项目排序问题 2024-04-25 14:04:13 +08:00
钱涛 353a007149 Merge branch 'release/2.13.1.2404.02' into release/个税版本 2024-04-25 13:46:13 +08:00
钱涛 c9075058d5 跳过人员范围校验 2024-04-25 13:45:59 +08:00
钱涛 0661406c97 Merge branch 'release/2.13.1.2404.02' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
 2024-04-25 11:47:47 +08:00
钱涛 c206538aa6 Merge remote-tracking branch 'origin/release/2.13.1.2404.02' into release/2.13.1.2404.02 2024-04-25 11:45:53 +08:00
钱涛 d802d890d6 处理解密问题 2024-04-25 11:45:37 +08:00
Harryxzy f46a18fa27 薪资审批 2024-04-25 09:39:28 +08:00
Harryxzy 11304bebed 薪资审批 2024-04-24 15:55:41 +08:00
Harryxzy 0bf4b8ed09 修复往期累计导入时未加密 2024-04-23 15:45:24 +08:00
钱涛 8f76daf0d1 Merge branch 'feature/外籍人员' into release/个税版本 2024-04-23 11:15:37 +08:00
钱涛 1120e840c7 Merge branch 'feature/外籍人员' into custom/艾志工业-外籍人员 2024-04-16 20:27:06 +08:00
钱涛 a27ad1f070 并档案接口 2024-04-16 20:26:56 +08:00
钱涛 9f903daf65 Merge branch 'feature/外籍人员' into custom/艾志工业-外籍人员 
# Conflicts:
#	src/com/engine/salary/service/EmployeeDeclareService.java
 2024-04-16 20:13:30 +08:00
钱涛 1496745488 作废人员接口 2024-04-16 20:12:48 +08:00
钱涛 95a7f26d60 Merge remote-tracking branch 'origin/release/2.13.1.2404.02' into release/2.13.1.2404.02 2024-04-16 16:05:53 +08:00
钱涛 68d0003f62 新增核算结果的代理 2024-04-16 16:05:42 +08:00
Harryxzy 916baf623c fix导出文本 2024-04-16 09:57:12 +08:00
钱涛 b8fb4457e6 Merge branch 'feature/外籍人员' into custom/艾志工业-0412 
# Conflicts:
#	src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
 2024-04-12 17:58:05 +08:00
钱涛 12d832c693 Merge branch 'release/2.12.1.2403.02' into custom/艾志工业 2024-04-12 17:53:40 +08:00
钱涛 6cfeb70f9c Merge branch 'release/2.12.1.2403.02' into release/个税版本 2024-04-12 17:47:40 +08:00
钱涛 0e6449e1e2 外籍人员 2024-04-12 17:46:53 +08:00
Harryxzy 8d7d3c3ec3 非系统人员部门id、分部id删除失败 2024-04-12 15:06:32 +08:00
钱涛 4aa66ea587 外籍人员更新 2024-04-11 18:57:56 +08:00
钱涛 23eba4950b 处理pdf生成 2024-04-11 15:23:23 +08:00
钱涛 a2a18245bd 处理缴款反馈 2024-04-11 10:59:36 +08:00
钱涛 691f4c42ce 内置算税结果 2024-04-10 14:48:58 +08:00
钱涛 6a05269b2d 处理LIKE函数 2024-04-10 14:20:30 +08:00
钱涛 917c9f87c1 个税申报 2024-04-10 09:18:05 +08:00
钱涛 d1b6a78238 人员报送 2024-04-10 09:08:24 +08:00
Harryxzy 44ed332ed5 修复ecology的多语言导致乱码 2024-04-08 17:57:59 +08:00
Harryxzy a9dd2c2cb3 Merge branch 'release/2.12.1.2403.02' into release/个税版本 2024-04-08 15:53:13 +08:00
钱涛 e994a61037 申报状态拆分 2024-04-08 14:40:47 +08:00
钱涛 be85c47a68 申报表状态更新主记录 2024-04-07 15:59:36 +08:00
Harryxzy ff19e46ac2 fix 2024-04-07 15:52:07 +08:00
Harryxzy 93f9e9aca7 1、修复工资单员工信息分部显示问题 
2、修复日志功能查询参数超1000导致的报错
 2024-04-07 13:56:00 +08:00
钱涛 fbc9c1a187 申报表状态更新主记录 2024-04-07 11:29:09 +08:00
Harryxzy 2242723d3f Merge branch 'feature/240302-薪资核算导出模板' into release/2.12.1.2403.02 2024-04-03 11:39:30 +08:00
钱涛 7f965c41c9 申报表状态更新主记录 2024-04-02 15:50:33 +08:00
Harryxzy 2e44e2cd86 解决冲突 2024-04-02 13:56:19 +08:00
Harryxzy 422cc687e9 Merge branch 'release/个税版本' into custom/艾志工业 
# Conflicts:
#	src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
#	src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
#	src/com/engine/salary/mapper/datacollection/EmployMapper.java
#	src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.java
#	src/com/engine/salary/service/SalaryArchiveService.java
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
 2024-04-02 13:52:46 +08:00
Harryxzy f15fdef375 艾志优化 2024-04-02 10:39:28 +08:00
Harryxzy de1efcfd7f 艾志优化 2024-04-02 10:38:52 +08:00
钱涛 a06a54f574 去除objectUtil 2024-04-01 20:25:23 +08:00
钱涛 57a0030cc8 处理外籍人员 2024-04-01 17:07:36 +08:00
Harryxzy f9d7c05190 核算导出模板修改表名 2024-04-01 10:17:45 +08:00
Harryxzy d57d5f7e13 薪资核算导出模板优化 2024-03-29 16:23:08 +08:00
Harryxzy 7557c1b330 薪资核算导出模板优化 2024-03-29 15:45:45 +08:00
钱涛 b3cde42f31 解决冲突 2024-03-29 14:41:31 +08:00
钱涛 5f64acc269 Merge branch 'release/2.12.1.2403.02' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/mapper/datacollection/EmployMapper.java
#	src/com/engine/salary/mapper/datacollection/EmployMapper.xml
#	src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.java
#	src/com/engine/salary/service/ExtEmpService.java
#	src/com/engine/salary/service/SalaryEmployeeService.java
#	src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
 2024-03-29 14:37:00 +08:00
钱涛 8e2ff975a9 暂存 2024-03-29 14:01:12 +08:00
Harryxzy 47e0f5da52 fix冲突 2024-03-29 10:52:46 +08:00
Harryxzy 330d1363fc Merge branch 'fix/240302-调薪前端保留位数优化' into release/2.12.1.2403.02 2024-03-29 10:49:58 +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 4e25dd4f0d Merge branch 'feature/240302-报表明细导出' into release/2.12.1.2403.02 2024-03-29 10:47:44 +08:00
Harryxzy 582abc061a 薪资核算导出模板 2024-03-29 10:46:51 +08:00
钱涛 2a692b13b4 外籍人员v1 2024-03-29 10:44:55 +08:00
Harryxzy 0d6bf4dfe3 薪资核算导出模板修复 2024-03-28 18:28:22 +08:00
Harryxzy 130be31d99 薪资核算导出模板 2024-03-27 11:33:56 +08:00
Harryxzy 3c8d1dc6ee 薪资明细表 2024-03-27 09:35:47 +08:00
Harryxzy 1c40ed0ecd 薪资核算导出模板 2024-03-26 17:04:56 +08:00
Harryxzy 92ba8e8fcf 薪资明细合计接口 2024-03-26 13:49:37 +08:00
Harryxzy ccc2744bee 薪资明细 2024-03-26 09:12:59 +08:00
Harryxzy faabf1dad3 薪酬报表-人事状态 2024-03-25 17:29:40 +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 2691b1e099 调薪显示位数前端优化 2024-03-19 17:36:58 +08:00
Harryxzy 649dd8f7d5 社保福利台账补缴新增 2024-03-19 17:23:53 +08:00
Harryxzy 1a4059f7ba 报表数据透视导出 2024-03-19 13:35:37 +08:00
Harryxzy 19732b39b8 艾志修复二开操作权限 2024-03-19 10:47:38 +08:00
Harryxzy 5d0b8e7759 导出excel单元格格式 2024-03-18 14:01:08 +08:00
钱涛 3a79ed9574 Merge branch 'release/2.11.2.2403.01' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
 2024-03-15 15:44:15 +08:00
Harryxzy 69d94731a0 Merge branch 'feature/240301_阅后即焚' into release/3.0.0.2403.01 2024-03-15 10:15:12 +08:00
Harryxzy 08b2c240ab 提示修复 2024-03-15 10:14:59 +08:00
Harryxzy 0f8b16d473 Merge branch 'feature/240301_同步起始缴纳月、起始发薪日期' into release/3.0.0.2403.01 2024-03-15 09:19:17 +08:00
Harryxzy b17d2b70de Merge branch 'feature/240301_阅后即焚' into release/3.0.0.2403.01 2024-03-15 09:19:03 +08:00
Harryxzy d28321bcad Merge branch 'fix/240302_加密解密社保福利错误' into release/3.0.0.2403.01 
# Conflicts:
#	src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
 2024-03-15 09:18:57 +08:00
Harryxzy ea2a8540ef Merge branch 'fix/240301-加解密开关后社保台账线下对比bug' into release/3.0.0.2403.01 2024-03-15 09:18:30 +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 0c42e1cb35 同步社保、薪资档案起始发薪日为入职日定时任务 2024-03-14 14:05:36 +08:00
钱涛 a70a2061a5 部门改多选 2024-03-14 11:19:02 +08:00
Harryxzy 8543d70a66 社保加解密 2024-03-14 11:07:01 +08:00
钱涛 f23b23cd92 优化IF解释 2024-03-14 10:25:39 +08:00
Harryxzy 26a3199b1e 社保线下对比加解密 2024-03-13 17:58:24 +08:00
Harryxzy 3c624fe859 Merge branch 'release/个税版本' into custom/艾志工业 2024-03-12 18:58:57 +08:00
钱涛 1d8a1b91c0 解决冲突 2024-03-12 18:58:36 +08:00
钱涛 452d7bc57c Merge branch 'release/3.0.0.2403.01' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/entity/datacollection/AddUpSituation.java
#	src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
#	src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
 2024-03-12 18:56:12 +08:00
Harryxzy dca445810d Merge branch 'fix/240301_薪资核算、社保台账导入提示缺失' into fix/240302_加密解密社保福利错误 2024-03-12 18:31:30 +08:00
Harryxzy 43c57cb10b 阅后即焚功能 2024-03-12 16:17:24 +08:00
Harryxzy b5afaa54df Merge branch 'release/3.0.0.2403.01' into feature/240301_阅后即焚 2024-03-12 15:13:34 +08:00
Harryxzy af57e8ecf4 Merge remote-tracking branch 'origin/release/3.0.0.2403.01' into release/3.0.0.2403.01 2024-03-12 14:58:21 +08:00
钱涛 836947725f 切换了elog位置 2024-03-12 14:34:44 +08:00
Harryxzy 83624be06e Merge branch 'fix/240301_薪资核算、社保台账导入提示缺失' into release/3.0.0.2403.01 2024-03-12 14:26:42 +08:00
Harryxzy 46626b4c25 Merge branch 'release/3.0.0.2403.01' into custom/艾志工业 2024-03-12 13:28:28 +08:00
Harryxzy 32f8e8a828 Merge branch 'fix/240301_薪资核算、社保台账导入提示缺失' into custom/艾志工业 2024-03-12 13:28:12 +08:00
Harryxzy 17b65fca28 Merge branch 'release/个税版本' into custom/艾志工业 2024-03-12 13:27:25 +08:00
Harryxzy 69480c05cb 艾志工业人员信息报送逻辑修改 2024-03-12 13:27:19 +08:00
Harryxzy a44d42e9d2 修复加密解密：社保档案、社保台账加解密失败问题 2024-03-12 11:27:13 +08:00
Harryxzy afb4bfd7ad 修复bug： 
1、薪资核算结果导入提示缺失
2、社保福利台账导入操作日志导致报错
 2024-03-11 17:23:20 +08:00
钱涛 4b823ccca7 国际化注解 2024-03-11 16:50:47 +08:00
Harryxzy 78d4f5e2ae 阅后即焚 2024-03-11 10:35:56 +08:00
Harryxzy a7b3b7578f 增加个税申报表日志 2024-03-08 16:33:34 +08:00
Harryxzy a85e646e9a Merge branch 'release/个税版本' into custom/艾志工业-个税申报-0308bak 2024-03-08 15:11:25 +08:00
Harryxzy f89c13a95f 艾志处理空指针 2024-03-08 15:11:12 +08:00
钱涛 ddc9188cd9 只获取正常且报送成功的 2024-03-08 15:09:42 +08:00
钱涛 9415dd8e71 可删除报送成功人员 2024-03-08 11:34:50 +08:00
Harryxzy 73df953ae5 Merge branch 'release/个税版本' into custom/艾志工业-个税申报-0308bak 2024-03-08 11:14:31 +08:00
Harryxzy 6aef2856e8 个税日志 2024-03-08 11:14:00 +08:00
Harryxzy 4516f74d2e 艾志-合并0301冲突 2024-03-08 10:38:20 +08:00
Harryxzy 878735cbc8 Merge branch 'release/个税版本' into custom/艾志工业-个税申报-0308bak 
# Conflicts:
#	src/com/engine/salary/entity/datacollection/AddUpSituation.java
#	src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRefresh.java
#	src/com/engine/salary/service/SIArchivesService.java
#	src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
#	src/com/engine/salary/service/impl/SISchemeServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
#	src/com/engine/salary/wrapper/SalaryFormulaWrapper.java
 2024-03-08 09:59:40 +08:00
Harryxzy d890ab5a84 Merge remote-tracking branch 'origin/release/个税版本' into release/个税版本 2024-03-08 09:26:57 +08:00
钱涛 8516a23bba 修改人员报送刷新逻辑 
刷新人员会集成上月所有人员
 2024-03-07 21:12:09 +08:00