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
钱涛 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
钱涛 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
钱涛 7d7d2dc309 处理公式数组问题 2024-04-28 16:21:44 +08:00
Harryxzy e7c46bc5e8 优化同步离职日期 2024-04-26 15:13:54 +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 0bf4b8ed09 修复往期累计导入时未加密 2024-04-23 15:45:24 +08:00
钱涛 8f76daf0d1 Merge branch 'feature/外籍人员' into release/个税版本 2024-04-23 11:15:37 +08:00
钱涛 a27ad1f070 并档案接口 2024-04-16 20:26:56 +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
钱涛 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
钱涛 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 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 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
钱涛 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 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
钱涛 ddc9188cd9 只获取正常且报送成功的 2024-03-08 15:09:42 +08:00