Harryxzy
|
7945c84fbb
|
薪资项目宽度
|
2024-01-02 16:37:07 +08:00 |
 钱涛
|
b78f4302e0
|
小数位
|
2023-12-12 13:18:17 +08:00 |
|
Harryxzy
|
929bcc7877
|
薪资核算结果、线下对比下载导入模板优化
|
2023-12-12 10:18:10 +08:00 |
|
Harryxzy
|
805fb9ff3c
|
1、薪资账套页面增加义务人筛选条件
2、薪资核算页面增加义务人列表
|
2023-11-20 16:14:51 +08:00 |
|
Harryxzy
|
0675de75ed
|
修复复制账套时少复制
|
2023-09-14 17:32:01 +08:00 |
|
Harryxzy
|
190771037e
|
fixbug
|
2023-08-04 09:33:17 +08:00 |
|
Harryxzy
|
02628d8224
|
薪资账套-薪资项目编辑fixBUG
|
2023-07-28 17:43:14 +08:00 |
|
Harryxzy
|
7763f16c0f
|
薪资账套薪资项目编辑功能
|
2023-07-26 13:43:53 +08:00 |
|
Harryxzy
|
da18b0f884
|
薪资账套项目页面改造temp
|
2023-07-25 16:46:57 +08:00 |
|
Harryxzy
|
a8a414a48b
|
薪资账套项目页面改造temp
|
2023-07-24 17:11:19 +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
|
db9a0e22eb
|
薪资项目-核算时隐藏fixbug
|
2023-07-18 17:00:09 +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 |
|
Harryxzy
|
c8cf6090ff
|
系统薪资项目可配置删除、工资单模板默认没有隐藏项目
|
2023-07-04 13:21:19 +08:00 |
|
钱涛
|
7e940b4db4
|
减少单次核算的人员
|
2023-05-05 17:15:25 +08:00 |
|
钱涛
|
4c41b35b2b
|
外部人员档案优化
|
2023-04-17 15:31:56 +08:00 |
|
钱涛
|
f619878f2c
|
暂存
|
2023-04-17 10:10:39 +08:00 |
|
钱涛
|
b30a58c1d9
|
报表功能
|
2023-04-07 14:38:38 +08:00 |
|
钱涛
|
767fbe36f5
|
外部人员
|
2023-03-14 10:52:48 +08:00 |
|
钱涛
|
0138351665
|
修复账套项目可删除
|
2023-02-27 17:51:26 +08:00 |
|
钱涛
|
dc24b03efd
|
薪资项目删除校验
|
2023-02-17 15:58:33 +08:00 |
|
Harryxzy
|
cbc1c13e4d
|
Merge branch 'feature/V3-TaxAgentImport_AddState-0209' into release/2.6.1.2301.02
|
2023-02-09 17:40:49 +08:00 |
fcli
|
308a44a9a6
|
Merge remote-tracking branch 'origin/feature/SalaryItemAuth&FieldManage' into release/2.6.1.2301.02
|
2023-02-09 17:23:07 +08:00 |
|
Harryxzy
|
69dd9cc61c
|
个税扣缴义务人、薪资账套 导入添加员工状态导入功能
|
2023-02-08 17:48:14 +08:00 |
|
fcli
|
90b2edb96c
|
feat: 薪资项目分权代码合并
|
2023-01-12 14:19:39 +08:00 |
|
Harryxzy
|
fd470c56aa
|
薪资账套人员范围导入
|
2023-01-09 15:12:44 +08:00 |
|
Harryxzy
|
5f37281757
|
添加backcalctype
|
2022-12-14 18:21:25 +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 |
|
Harryxzy
|
ce76bc8b43
|
薪资账套list返回个税扣缴义务人id
|
2022-12-08 15:42:21 +08:00 |
|
Harryxzy
|
3ff3fd8e44
|
薪资回算-薪资核算部分（剩余核算归档）
|
2022-12-02 17:35:14 +08:00 |
|
钱涛
|
ac0b0a7e25
|
公式提醒
|
2022-12-01 13:59:38 +08:00 |
|
钱涛
|
6cffbf4db7
|
取消安全级别
|
2022-11-30 16:59:58 +08:00 |
|
Harryxzy
|
85fef5c5f8
|
Merge branch 'master' into feature/V3-backItem-1215
|
2022-11-28 09:26:59 +08:00 |
|
钱涛
|
7808019c43
|
新增核算时间变量
|
2022-11-24 17:33:48 +08:00 |
|
钱涛
|
832b40e40a
|
新增核算时间变量
|
2022-11-24 17:21:16 +08:00 |
|
Harryxzy
|
036d2d540b
|
薪资回算-薪资账套部分
|
2022-11-22 14:36:59 +08:00 |
|
Harryxzy
|
a5ae8c8ea6
|
回算薪资项（薪资账套部分），剩余处理历史数据
|
2022-11-18 14:20:18 +08:00 |
|
Harryxzy
|
1e307e2f87
|
薪资回算，薪资账套中薪资回算项目展示
|
2022-11-16 15:18:43 +08:00 |
|
Harryxzy
|
94f3c9720a
|
回算功能-fix mybatis报错
|
2022-11-16 14:13:50 +08:00 |
|
Harryxzy
|
00357cd9d8
|
回算功能-新建薪资账套默认
|
2022-11-16 10:32:05 +08:00 |
|
Harryxzy
|
5c4380cbe0
|
xzy-fix-薪资档案中人员范围更新时bug
|
2022-10-10 10:53:51 +08:00 |
|
Harryxzy
|
8c4050fe73
|
xzy-fix-薪资账套人员状态传参问题
|
2022-10-09 15:20:04 +08:00 |
|
Harryxzy
|
e3a2a52ab8
|
xzy-fix-薪资账套人员错误问题
|
2022-10-09 13:32:05 +08:00 |
|
Harryxzy
|
b2b0abcaf5
|
xzy-fix-处理Employee_statuses历史数据
|
2022-10-08 17:21:38 +08:00 |
|
Harryxzy
|
6dcecfb1c1
|
xzy-fix-薪资账套
|
2022-10-08 16:00:08 +08:00 |
|
Harryxzy
|
d647f9fcc3
|
xzy-复制薪资账套时，复制薪资项目隐藏选项
|
2022-09-22 09:06:53 +08:00 |
|
Harryxzy
|
9244440a0d
|
xzy-薪资项目显隐控制(修改传参itemHide为字符串)
|
2022-08-25 09:20:51 +08:00 |
|
Harryxzy
|
289e685e09
|
xzy-薪资项目显隐控制
|
2022-08-24 10:31:42 +08:00 |