 钱涛
|
6e366bed5a
|
fix账套列表检索问题
|
2025-04-17 14:20:14 +08:00 |
|
钱涛
|
165a775074
|
刷新账套和扣缴义务人自关联
|
2025-03-05 16:42:13 +08:00 |
|
钱涛
|
df3ce490c0
|
处理账套复制问题
|
2024-12-27 14:34:03 +08:00 |
|
钱涛
|
5c4d7d8bde
|
Merge branch 'feature/权限' into feature/数据推送
# Conflicts:
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
|
2024-11-15 14:20:51 +08:00 |
Harryxzy
|
8a06eaad93
|
Merge branch 'feature/工资单审批' into release/2.17.1.2411.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/sys/constant/SalarySysConstant.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
|
2024-11-13 18:36:20 +08:00 |
|
钱涛
|
383562c9cf
|
工资单、数据采集权限功能
|
2024-09-12 11:50:18 +08:00 |
|
钱涛
|
c7659e0717
|
数据采集权限
|
2024-09-11 10:28:20 +08:00 |
|
钱涛
|
09fb9898e7
|
完成账套和扣缴义务人接口
|
2024-09-09 11:13:10 +08:00 |
|
钱涛
|
920b0e31c4
|
账套扣缴义务人聚合查询
|
2024-09-05 10:26:52 +08:00 |
|
钱涛
|
5ccee97429
|
新建账套携带各扣缴义务人人员范围
|
2024-09-04 13:59:00 +08:00 |
|
钱涛
|
e7eb2e3459
|
支持跨扣缴义务人兼容性
|
2024-09-03 15:48:20 +08:00 |
|
钱涛
|
0b90f4890e
|
工资单支持跨扣缴义务人
|
2024-09-03 14:30:57 +08:00 |
|
钱涛
|
7f77f4cb12
|
获取账套关联扣缴义务人
|
2024-09-03 09:21:57 +08:00 |
|
钱涛
|
ecfa6a4604
|
跨扣缴义务人核算
|
2024-09-02 17:36:41 +08:00 |
|
钱涛
|
c72fa7fd7c
|
保存账套联系
|
2024-09-02 14:13:29 +08:00 |
|
钱涛
|
49e6050c54
|
核算和账套的权限
|
2024-08-30 10:49:46 +08:00 |
|
钱涛
|
9b96d0cff2
|
限制账套
|
2024-08-28 10:02:39 +08:00 |
|
钱涛
|
9121268815
|
修复重新导入账套bug
|
2024-08-20 09:29:14 +08:00 |
|
钱涛
|
673699dfb8
|
导入工具明细
|
2024-08-16 11:18:27 +08:00 |
|
钱涛
|
980dc2f532
|
导入工具
|
2024-08-15 16:25:31 +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 |
|
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 |
|
钱涛
|
f74ec99644
|
账套支持sql范围
|
2024-08-15 10:37:41 +08:00 |
|
钱涛
|
6450254371
|
薪酬迁移工具
|
2024-08-14 14:47:27 +08:00 |
|
钱涛
|
9d26e1228f
|
薪酬迁移工具
|
2024-08-13 18:15:04 +08:00 |
|
Harryxzy
|
a05fb6fcf0
|
报表义务人、账套分权
|
2024-08-13 13:45:24 +08:00 |
|
钱涛
|
dd257ec53e
|
xml文件
|
2024-08-09 09:22:27 +08:00 |
|
钱涛
|
83a408afa2
|
迁移工具
|
2024-08-08 16:53:31 +08:00 |
|
钱涛
|
080a69c929
|
全量迁移
|
2024-08-08 09:50:04 +08:00 |
|
钱涛
|
9e8e7f1f09
|
删除隐藏
|
2024-05-30 14:41:28 +08:00 |
|
钱涛
|
18a4f7c3e7
|
隐藏数据迁移
|
2024-05-30 12:01:53 +08:00 |
|
钱涛
|
3428de9e33
|
账套快照
|
2024-05-06 16:03:29 +08:00 |
|
Harryxzy
|
34fe103055
|
工资单审批
|
2024-04-25 15:30:25 +08:00 |
|
钱涛
|
a06a54f574
|
去除objectUtil
|
2024-04-01 20:25:23 +08:00 |
|
钱涛
|
836947725f
|
切换了elog位置
|
2024-03-12 14:34:44 +08:00 |
|
Harryxzy
|
093cb34f77
|
操作日志fix some bugs
|
2024-02-23 15:11:56 +08:00 |
|
Harryxzy
|
dee20149bb
|
日志
|
2024-02-21 18:19:02 +08:00 |
|
钱涛
|
6fc8d8fdee
|
去除达梦驱动
|
2024-01-25 11:38:38 +08:00 |
|
Harryxzy
|
805fb9ff3c
|
1、薪资账套页面增加义务人筛选条件
2、薪资核算页面增加义务人列表
|
2023-11-20 16:14:51 +08:00 |
|
Harryxzy
|
a34a5b9aa6
|
同步义务人人员范围到账套人员范围
|
2023-10-16 16:59:18 +08:00 |
|
钱涛
|
01b02531ce
|
Merge branch 'feature/外部人员' into release/2.9.2.2307.02
# Conflicts:
# src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/sys/service/SalarySysConfService.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
|
2023-07-20 10:08:05 +08:00 |
|
Harryxzy
|
d551f5ae76
|
薪资项目核算时隐藏
|
2023-07-18 14:03:59 +08:00 |
|
钱涛
|
aec6918c12
|
Merge branch 'release/2.9.1.2307.01' into feature/外部人员
# Conflicts:
# src/com/engine/salary/biz/EmployBiz.java
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java
# src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
# src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
# src/com/engine/salary/service/SalaryEmployeeService.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/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java
# src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
# src/com/engine/salary/wrapper/SalarySendWrapper.java
# src/com/engine/salary/wrapper/TaxAgentSubAdminWrapper.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2023-07-11 16:08:15 +08:00 |
|
钱涛
|
82ab6c1e11
|
非系统算税功能
|
2023-07-04 09:32:12 +08:00 |
|
钱涛
|
fef828ef1d
|
人员明细列表展示账套和核算记录信息、自定义列功能
|
2023-05-26 11:17:25 +08:00 |
|
钱涛
|
4c41b35b2b
|
外部人员档案优化
|
2023-04-17 15:31:56 +08:00 |
|
钱涛
|
f619878f2c
|
暂存
|
2023-04-17 10:10:39 +08:00 |
|
Harryxzy
|
e21b53c2df
|
Merge branch 'fix/deleteSalarySobAddCheck_0414' into release/2.7.3.2304.01
|
2023-04-11 14:00:26 +08:00 |