 钱涛
|
5efe84dd2d
|
Merge branch 'release/2.14.2.2405.02' into release/个税版本
|
2024-05-30 14:42:00 +08:00 |
|
钱涛
|
9e8e7f1f09
|
删除隐藏
|
2024-05-30 14:41:28 +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 |
|
钱涛
|
18a4f7c3e7
|
隐藏数据迁移
|
2024-05-30 12:01:53 +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 |
|
钱涛
|
3428de9e33
|
账套快照
|
2024-05-06 16:03:29 +08:00 |
Harryxzy
|
a9dd2c2cb3
|
Merge branch 'release/2.12.1.2403.02' into release/个税版本
|
2024-04-08 15:53:13 +08:00 |
|
钱涛
|
a06a54f574
|
去除objectUtil
|
2024-04-01 20:25:23 +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 |
|
钱涛
|
836947725f
|
切换了elog位置
|
2024-03-12 14:34:44 +08:00 |
|
钱涛
|
5a9d45f92b
|
Merge branch 'release/2.11.1.2402.01' into release/个税版本
# Conflicts:
# resource/WEB-INF/prop/hrmSalaryCustom.properties
# src/com/engine/salary/entity/datacollection/AddUpSituation.java
# src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java
# src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
# src/com/engine/salary/formlua/entity/parameter/ExcelFuncs.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
# src/com/engine/salary/util/page/SalaryPageUtil.java
|
2024-03-06 15:54:07 +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 |
|
钱涛
|
53806d9262
|
Merge branch 'release/2.10.1.2401.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/util/excel/ExcelUtil.java
|
2024-02-21 15:28:33 +08:00 |
|
钱涛
|
6fc8d8fdee
|
去除达梦驱动
|
2024-01-25 11:38:38 +08:00 |
|
钱涛
|
791bc2ffca
|
Merge branch 'release/2.9.9.2312.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/SalaryArchiveService.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
|
2023-12-05 15:09:40 +08:00 |
|
Harryxzy
|
805fb9ff3c
|
1、薪资账套页面增加义务人筛选条件
2、薪资核算页面增加义务人列表
|
2023-11-20 16:14:51 +08:00 |
|
钱涛
|
e19f00c44d
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
|
2023-10-20 09:43:24 +08:00 |
|
Harryxzy
|
a34a5b9aa6
|
同步义务人人员范围到账套人员范围
|
2023-10-16 16:59:18 +08:00 |
|
钱涛
|
895d3065e9
|
账套拓扑图
|
2023-10-16 10:45:19 +08:00 |
|
钱涛
|
a5d019799c
|
账套复制
|
2023-09-22 11:47:51 +08:00 |
|
钱涛
|
cf22685fca
|
账套-个税字段对应、累计字段对应
|
2023-08-15 20:48:09 +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 |
|
Harryxzy
|
d9f041c9bb
|
账套删除前校验是否存在工资单模板
|
2023-04-07 16:06:47 +08:00 |
|
Harryxzy
|
207d338ec2
|
薪资账套重复薪资项目
|
2023-04-07 15:14:07 +08:00 |
|
钱涛
|
0138351665
|
修复账套项目可删除
|
2023-02-27 17:51:26 +08:00 |
|
Harryxzy
|
0130b83f00
|
Merge branch 'feature/加密方法&分页merge' into feature/V3-backItem-1215
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2022-12-14 12:21:42 +08:00 |
|
Harryxzy
|
3b6418263f
|
薪资账套复制-薪资回算
薪资核算-回算部分四舍五入
|
2022-12-13 16:39:39 +08:00 |
fcli
|
b58e71989d
|
feat: 统一修改到内存分页
|
2022-12-12 10:25:55 +08:00 |
|
Harryxzy
|
a53fa14a3d
|
Merge branch 'master' into feature/V3-backItem-MMdd
|
2022-11-22 14:37:15 +08:00 |
|
Harryxzy
|
036d2d540b
|
薪资回算-薪资账套部分
|
2022-11-22 14:36:59 +08:00 |
|
Harryxzy
|
1bcb02d2e0
|
fix薪资账套关闭状态下无法删除bug
|
2022-11-16 14:22:25 +08:00 |
|
Harryxzy
|
00357cd9d8
|
回算功能-新建薪资账套默认
|
2022-11-16 10:32:05 +08:00 |
|
Harryxzy
|
7c358fe3a0
|
xzy-fix-薪资档案中默认人员范围
|
2022-10-09 17:51:30 +08:00 |
|
Harryxzy
|
f2b83bf837
|
xzy-删除薪资账套时，删除对应的薪资项目隐藏信息
|
2022-09-22 09:35:52 +08:00 |
|
Harryxzy
|
d647f9fcc3
|
xzy-复制薪资账套时，复制薪资项目隐藏选项
|
2022-09-22 09:06:53 +08:00 |
|
钱涛
|
01bd6fefd4
|
支持人员可在多个扣缴单位
|
2022-07-14 10:36:51 +08:00 |
|
钱涛
|
3363120c44
|
修复核算分权的问题
|
2022-06-20 19:39:01 +08:00 |
|
钱涛
|
5cea57d477
|
fix bug
|
2022-06-17 17:22:48 +08:00 |
|
钱涛
|
f5b8806eff
|
账套
|
2022-06-15 15:27:23 +08:00 |
|
钱涛
|
b832910af9
|
Merge branch 'develop' into release
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
|
2022-06-08 18:48:23 +08:00 |
|
钱涛
|
79632dd1bf
|
申报表分权
|
2022-06-07 19:10:40 +08:00 |
|
钱涛
|
cedc9f2644
|
考勤和申报表的分权
|
2022-06-07 15:43:22 +08:00 |