 钱涛
|
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 |
|
钱涛
|
013137ba30
|
非系统人员状态是临时
|
2023-07-19 17:07:38 +08:00 |
Harryxzy
|
ca0d800bab
|
Merge branch 'feature/230701-工资单反馈' into release/2.9.2.2307.02
|
2023-07-19 16:18:52 +08:00 |
|
Harryxzy
|
311aa8f139
|
加上大括号
|
2023-07-19 16:17:40 +08:00 |
|
Harryxzy
|
a144b88f6c
|
Merge branch 'feature/230701-工资单反馈' into release/2.9.2.2307.02
|
2023-07-19 11:51:50 +08:00 |
|
Harryxzy
|
31a863c937
|
没有设置工资单模板时报错
|
2023-07-19 11:51:31 +08:00 |
|
Harryxzy
|
959aa83a21
|
Merge branch 'fix/230701-个税扣缴义务人前后空格' into release/2.9.2.2307.02
|
2023-07-19 11:11:58 +08:00 |
|
Harryxzy
|
0a4c19fb36
|
Merge branch 'feature/230702-薪资项目-核算时隐藏' into release/2.9.2.2307.02
|
2023-07-19 11:11:46 +08:00 |
|
Harryxzy
|
57f75d36a0
|
fix个税扣缴义务人保存过滤前后空格
|
2023-07-19 11:10:27 +08:00 |
|
钱涛
|
3cc0d412ce
|
修复导出外部人员名称不显示问题
|
2023-07-19 10:58:11 +08:00 |
|
钱涛
|
b77e7a737c
|
外部人员名称不可重复
|
2023-07-19 09:58:42 +08:00 |
|
钱涛
|
5e227febee
|
关闭系统算税后，系统薪资项目可删除
|
2023-07-18 17:59:20 +08:00 |
|
Harryxzy
|
78e5d37cf3
|
薪资项目-核算时隐藏
|
2023-07-18 17:22:42 +08:00 |
|
Harryxzy
|
db9a0e22eb
|
薪资项目-核算时隐藏fixbug
|
2023-07-18 17:00:09 +08:00 |
|
Harryxzy
|
d551f5ae76
|
薪资项目核算时隐藏
|
2023-07-18 14:03:59 +08:00 |
|
Harryxzy
|
b8f44dd5b6
|
薪资项目核算时隐藏
|
2023-07-18 11:00:13 +08:00 |
|
Harryxzy
|
3a1765b562
|
Merge branch 'feature/230701-工资单反馈' into release/2.9.2.2307.02
|
2023-07-17 15:02:33 +08:00 |
|
Harryxzy
|
1ea80b8fe9
|
工资单反馈
|
2023-07-17 15:01:14 +08:00 |
|
Harryxzy
|
88892f1aac
|
工资单反馈fixBug
|
2023-07-17 12:36:20 +08:00 |
|
Harryxzy
|
e83302caac
|
工资单反馈
|
2023-07-17 12:11:31 +08:00 |
|
Harryxzy
|
8221d4da69
|
工资单反馈
|
2023-07-17 11:27:40 +08:00 |
|
钱涛
|
fbdf93cf5b
|
取消不用系统算税时一系列校验
|
2023-07-17 10:20:54 +08:00 |
|
Harryxzy
|
faf9636a0d
|
薪资项目-核算时隐藏 temp
|
2023-07-14 11:34:53 +08:00 |
|
Harryxzy
|
6279f0d8c9
|
工资单反馈
|
2023-07-14 09:55:36 +08:00 |
|
钱涛
|
942a3b2a97
|
修复工资单发送列表
|
2023-07-13 17:23:28 +08:00 |
|
钱涛
|
873b90474f
|
Merge branch 'feature/230701qt' into feature/外部人员
|
2023-07-13 16:55:36 +08:00 |
|
钱涛
|
152eeaa68e
|
所有配置文件
|
2023-07-13 16:55:23 +08:00 |
|
钱涛
|
385726fa76
|
所有配置文件
|
2023-07-13 16:51:01 +08:00 |
|
钱涛
|
0fc16efb11
|
核算界面获取外部人员
|
2023-07-13 14:11:54 +08:00 |
|
钱涛
|
4901f79066
|
核算界面获取外部人员
|
2023-07-13 14:11:32 +08:00 |
|
Harryxzy
|
30d61e352f
|
工资单确认反馈
|
2023-07-13 11:50:02 +08:00 |
|
钱涛
|
888938f150
|
系统设置接口
|
2023-07-13 11:33:58 +08:00 |
|
钱涛
|
23c0a78adc
|
修复外部人员初始化档案数据
|
2023-07-13 10:20:41 +08:00 |
|
Harryxzy
|
820d15d06f
|
工资单确认反馈
|
2023-07-12 15:17:59 +08:00 |
|
Harryxzy
|
58fe219cdb
|
fix 工资单反馈bug
|
2023-07-12 11:25:44 +08:00 |
|
钱涛
|
89ecf0984d
|
fix外部人员
|
2023-07-12 09:45:00 +08:00 |
|
Harryxzy
|
56c1666542
|
工资单发放
|
2023-07-11 17:51:52 +08:00 |
|
Harryxzy
|
5dc2dadd46
|
工资单自动确认
|
2023-07-11 17:28:15 +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
|
33a0723ad2
|
Merge branch 'release/2.9.1.2307.01' into feature/230701-工资单反馈
|
2023-07-11 15:29:21 +08:00 |
|
Harryxzy
|
be895829c2
|
工资单反馈
|
2023-07-11 15:29:13 +08:00 |
|
Harryxzy
|
5918de016e
|
Merge branch 'feature/salalryItemAndFieldSort' into release/2.9.1.2307.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
|
2023-07-11 13:24:37 +08:00 |
|
Harryxzy
|
fa950fb4dd
|
薪资项目排序比较
|
2023-07-11 13:23:07 +08:00 |
sy
|
fd9a9aef72
|
Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01
|
2023-07-11 11:31:29 +08:00 |
|
sy
|
ad37ba9af0
|
薪酬系统-薪资档案，高级搜索中工号、分部筛选问题修复
|
2023-07-11 11:30:57 +08:00 |
|
sy
|
c28f782f19
|
Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01
|
2023-07-11 11:11:15 +08:00 |
|
sy
|
83604ba534
|
薪酬系统-福利台账，修改台账列表返回台账状态值返回逻辑
|
2023-07-11 11:10:32 +08:00 |
|
钱涛
|
f53c904fde
|
Merge branch 'fix/230701修复项目添加时名称校验问题' into release/2.9.1.2307.01
|
2023-07-11 11:08:39 +08:00 |
|
钱涛
|
bb6cf386cb
|
修复
|
2023-07-11 11:05:35 +08:00 |
|
Harryxzy
|
7a72ef28d1
|
Merge remote-tracking branch 'origin/release/2.9.1.2307.01' into release/2.9.1.2307.01
|
2023-07-11 10:14:46 +08:00 |