 钱涛
|
490e6ab0fe
|
Merge branch 'release/个税&业务线' into custom/钱智
|
2025-06-19 11:05:53 +08:00 |
|
钱涛
|
3dc9f327df
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-06-12 11:04:58 +08:00 |
Harryxzy
|
84339ab715
|
定时任务查询超1000bug
|
2025-06-10 17:35:44 +08:00 |
|
钱涛
|
f638665b72
|
Merge branch 'release/个税&业务线' into custom/钱智
# Conflicts:
# src/com/engine/salary/service/impl/SIExportServiceImpl.java
|
2025-04-22 16:05:31 +08:00 |
|
钱涛
|
b1c1587344
|
Merge branch 'release/3.0.1.2503.01' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/service/SalaryAcctResultService.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/wrapper/SalarySobWrapper.java
|
2025-03-26 15:48:02 +08:00 |
|
Harryxzy
|
3339178ac5
|
钱智 建模带出固定值
|
2025-03-05 09:35:48 +08:00 |
|
钱涛
|
2f9822aeef
|
修复导出社保档案失败问题
|
2025-02-20 10:53:27 +08:00 |
|
Harryxzy
|
6cb2b2e677
|
钱智 社保核算需求变更
|
2025-02-14 16:47:20 +08:00 |
|
Harryxzy
|
27d0f2f452
|
钱智 特殊人员社保福利台账计算
|
2025-02-13 16:15:20 +08:00 |
|
Harryxzy
|
09b358f5b2
|
钱智 特殊人员社保福利台账计算
|
2025-02-13 13:34:22 +08:00 |
|
钱涛
|
f3577d3ddd
|
Merge branch 'feature/数据推送' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/constant/SalaryDefaultTenantConstant.java
# src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java
# src/com/engine/salary/entity/salarysob/param/SalarySobListQueryParam.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
# src/com/engine/salary/service/AddUpDeductionService.java
# src/com/engine/salary/service/OtherDeductionService.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/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalarySobWrapper.java
|
2025-02-12 14:00:43 +08:00 |
|
钱涛
|
35aff0431e
|
Merge branch 'release/2.18.2.2412.02' into feature/数据推送
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-12-27 09:24:22 +08:00 |
|
钱涛
|
c415cc7f25
|
Merge branch 'release/2.18.2.2412.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-12-20 16:41:08 +08:00 |
|
Harryxzy
|
ec88fc5b10
|
修复基数没有自动调整 日志调整
|
2024-12-13 16:29:24 +08:00 |
|
Harryxzy
|
874de98a91
|
修复基数没有自动调整
|
2024-12-13 16:19:56 +08:00 |
|
钱涛
|
7243eece3d
|
Merge branch 'release/2.18.1.2412.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/SalaryEmployeeService.java
|
2024-12-13 13:53:00 +08:00 |
|
Harryxzy
|
66912f62a4
|
社保基数自动调整 增加日志
|
2024-12-12 16:16:18 +08:00 |
|
Harryxzy
|
19a4385703
|
社保基数自动调整 增加日志
|
2024-12-12 15:30:26 +08:00 |
|
钱涛
|
f94ab9c3be
|
Merge branch 'release/2.17.1.2411.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/wrapper/SalaryCommonWrapper.java
|
2024-12-05 10:52:08 +08:00 |
|
钱涛
|
051a38d408
|
社保和薪资档案支持定时任务增员
|
2024-12-04 11:46:00 +08:00 |
|
钱涛
|
af7d51ac79
|
Merge branch 'release/2.16.1.2410.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
# src/com/engine/salary/web/SalaryCommonController.java
# src/com/engine/salary/wrapper/SalaryCommonWrapper.java
|
2024-11-12 18:01:22 +08:00 |
|
钱涛
|
ef13d93fe1
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
# Conflicts:
# src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java
|
2024-11-04 14:33:15 +08:00 |
|
Harryxzy
|
f664536bce
|
社保停缴action最后缴纳月支持分开设置
|
2024-10-17 15:51:05 +08:00 |
|
钱涛
|
800f03427d
|
社保档案业务线
|
2024-09-29 14:34:44 +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 |
|
钱涛
|
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 |
|
钱涛
|
63851a1fe7
|
社保福利通过证件号码导入
|
2024-05-29 15:32:19 +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 |
|
Harryxzy
|
bf50976849
|
Merge branch 'fix/240302-社保福利编辑保存改造' into release/2.14.2.2405.02
|
2024-05-23 10:58:30 +08:00 |
|
Harryxzy
|
b76a87b125
|
社保福利编辑保存改造
|
2024-05-17 09:40:52 +08:00 |
|
钱涛
|
8f76daf0d1
|
Merge branch 'feature/外籍人员' into release/个税版本
|
2024-04-23 11:15:37 +08:00 |
|
钱涛
|
a2a18245bd
|
处理缴款反馈
|
2024-04-11 10:59:36 +08:00 |
|
Harryxzy
|
44ed332ed5
|
修复ecology的多语言导致乱码
|
2024-04-08 17:57:59 +08:00 |
|
Harryxzy
|
216a2c67d3
|
社保福利编辑保存改造
|
2024-03-20 14:47:41 +08:00 |
|
Harryxzy
|
0c42e1cb35
|
同步社保、薪资档案起始发薪日为入职日定时任务
|
2024-03-14 14:05:36 +08:00 |
|
钱涛
|
836947725f
|
切换了elog位置
|
2024-03-12 14:34:44 +08:00 |
|
Harryxzy
|
8984369343
|
薪资档案、社保档案查看日志
|
2024-03-05 15:15:20 +08:00 |
|
Harryxzy
|
efa556ddd9
|
操作日志修复
|
2024-02-29 11:31:18 +08:00 |
|
Harryxzy
|
89787332e3
|
操作日志修复
|
2024-02-28 18:03:55 +08:00 |
sy
|
1654e041b9
|
薪酬系统-福利档案，相关功能操作日志逻辑优化
|
2024-02-22 15:23:59 +08:00 |
|
sy
|
75dd4235af
|
薪酬系统-福利台账，补缴、补差、退差页相关功能操作日志添加
|
2024-02-22 09:33:35 +08:00 |
|
sy
|
cfb82cb9b2
|
薪酬系统-福利方案、档案、台账，相关实现类代码梳理，去除sqlsession形式的mpper调用
|
2024-02-19 17:27:42 +08:00 |
|
sy
|
6a79b22c17
|
薪酬系统-福利档案，增加操作日志
|
2024-02-07 17:39:26 +08:00 |
|
sy
|
306af48291
|
薪酬系统-福利档案，SICategoryBiz、SISchemeBiz方法迁移到对应是实现类，并修改调用方相关代码
|
2024-02-04 10:11:10 +08:00 |
|
sy
|
9074fb46fc
|
薪酬系统-福利档案，SIArchivesBiz方法迁移到对应是实现类，并修改调用方相关代码
|
2024-02-02 15:23:26 +08:00 |
|
sy
|
f5d21042c8
|
Merge remote-tracking branch 'remotes/origin/feature/240101-减员action优化以及福利档案拷贝action开发' into release/2.10.1.2401.01
|
2024-01-31 16:32:45 +08:00 |
|
sy
|
b1d3d2c445
|
薪酬系统-福利档案，复制action开发
|
2024-01-30 14:31:21 +08:00 |
|
sy
|
c4adecf436
|
薪酬系统-福利档案，减员action优化
|
2024-01-29 11:30:04 +08:00 |