 钱涛
|
0634a139b9
|
显示字符统计规则
|
2023-11-02 18:41:58 +08:00 |
Harryxzy
|
c1893f9152
|
自动同步结束发薪日期temp
|
2023-08-30 10:41:00 +08:00 |
|
Harryxzy
|
e655daf018
|
fix个税扣缴义务人人员范围，无法根据部门、分部维度生成数据
|
2023-08-02 10:34:04 +08:00 |
|
钱涛
|
4901f79066
|
核算界面获取外部人员
|
2023-07-13 14:11:32 +08:00 |
|
钱涛
|
89ecf0984d
|
fix外部人员
|
2023-07-12 09:45:00 +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 |
|
钱涛
|
bc590b9ee8
|
自定义报表
|
2023-04-14 15:18:18 +08:00 |
|
Harryxzy
|
82ee707f16
|
employebiz改成employeeservice
|
2023-04-12 15:27:35 +08:00 |
|
钱涛
|
8430397d03
|
外部人员终极版
|
2023-03-16 16:10:29 +08:00 |
|
钱涛
|
ace15ca7a1
|
非系统人员
|
2023-03-15 18:03:46 +08:00 |
|
Harryxzy
|
7b0e1cb1f3
|
employeeService查询外部 fixBug
|
2023-03-13 15:57:12 +08:00 |
|
Harryxzy
|
32b1a2db48
|
employeeService查询外部
|
2023-03-13 15:53:56 +08:00 |
|
钱涛
|
d8c13b70d2
|
内外部人员匹配标识
|
2023-03-08 18:01:19 +08:00 |
|
Harryxzy
|
068f7e6535
|
EmployeeBiz修改调用方式
|
2023-03-07 17:14:25 +08:00 |
|
钱涛
|
a423790a35
|
获取人员信息
|
2023-03-06 17:57:20 +08:00 |
|
钱涛
|
b59ba320df
|
人员去重
|
2022-12-15 16:59:00 +08:00 |
|
钱涛
|
57e4360030
|
通过员工id导入
|
2022-09-21 13:40:43 +08:00 |
|
钱涛
|
19ea334d57
|
获取员工信息方法
|
2022-09-21 11:52:06 +08:00 |
|
钱涛
|
f71e222c73
|
fix导入
|
2022-08-26 14:06:21 +08:00 |
|
钱涛
|
11ac3d6d51
|
Merge branch 'feature/outdatasource' into develop
# Conflicts:
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
|
2022-08-03 15:06:16 +08:00 |
|
钱涛
|
c4831a1612
|
支持外部数据源
|
2022-08-03 10:08:43 +08:00 |
 liuliang
|
6a42f1c7c6
|
修改bug
|
2022-08-02 17:57:29 +08:00 |
|
钱涛
|
bf31d993a7
|
薪酬报表-薪酬核算完成，将数据存储到非加密表，删除人员信息，补充：分部、部门、岗位等其他字段，供数据中心引用
|
2022-07-11 17:31:33 +08:00 |
|
钱涛
|
ec3838a292
|
申报表
|
2022-06-10 13:33:48 +08:00 |
|
钱涛
|
0b72b2e6cb
|
核算v2
|
2022-04-08 19:08:59 +08:00 |
|
钱涛
|
0dedda4dbd
|
核算
|
2022-04-07 16:54:10 +08:00 |