Commit Graph

19 Commits

Author SHA1 Message Date
钱涛 74f7c71ffe 扩展维度属性 2023-11-06 11:19:00 +08:00
钱涛 0634a139b9 显示字符统计规则 2023-11-02 18:41:58 +08:00
Harryxzy c1893f9152 自动同步结束发薪日期temp 2023-08-30 10:41: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 068f7e6535 EmployeeBiz修改调用方式 2023-03-07 17:14:25 +08:00
钱涛 a423790a35 获取人员信息 2023-03-06 17:57:20 +08:00
钱涛 2ab7049fa0 单个核算 2022-11-23 18:30:53 +08:00
钱涛 19ea334d57 获取员工信息方法 2022-09-21 11:52:06 +08:00
钱涛 bf31d993a7 薪酬报表-薪酬核算完成,将数据存储到非加密表,删除人员信息,补充:分部、部门、岗位等其他字段,供数据中心引用 2022-07-11 17:31:33 +08:00
钱涛 eab3e9a6a9 1、福利列表显示扣税扣缴义务人
2、导入限制
3、修改福利查询异常
4、核算人员范围限制
2022-07-07 18:29:52 +08:00
钱涛 ec3838a292 申报表 2022-06-10 13:33:48 +08:00
钱涛 692c2f5a79 核算 2022-04-12 19:25:19 +08:00
钱涛 a069447f02 核算基础公式 2022-04-11 20:17:47 +08:00
钱涛 0b72b2e6cb 核算v2 2022-04-08 19:08:59 +08:00
钱涛 0dedda4dbd 核算 2022-04-07 16:54:10 +08:00