Harryxzy
|
09d85bdab3
|
考勤引用=编辑
|
2022-10-28 16:15:51 +08:00 |
|
Harryxzy
|
1f29ac67eb
|
累计、其他免税、往期 新增、删除、一键清空、编辑功能
|
2022-10-28 14:08:27 +08:00 |
|
Harryxzy
|
ddd0c49cdd
|
其他免税扣除-新增、删除所选、一键清空功能
|
2022-10-27 18:02:05 +08:00 |
|
Harryxzy
|
a406eed4b9
|
累计专项附加扣除-新增、删除所选、一键清空功能
|
2022-10-27 13:59:11 +08:00 |
 钱涛
|
6e726366ad
|
排序
|
2022-09-26 18:51:17 +08:00 |
sy
|
3c007f8e0b
|
薪酬系统导入方式配置-社保福利档案导入,添加导入人员筛选配置化处理
|
2022-09-15 15:31:34 +08:00 |
|
Harryxzy
|
e1239d3018
|
xzy-核算自定义列表添加分部
|
2022-08-29 14:50:26 +08:00 |
|
钱涛
|
bfcda3525a
|
1、福利方案分权
2、累计、往期、其他导入分权
3、导入精度
|
2022-08-25 16:46:12 +08:00 |
|
Harryxzy
|
8b84f0b15f
|
xzy-fix北京城建集团-考勤引用中引用时报错问题
|
2022-08-25 09:59:19 +08:00 |
|
钱涛
|
0f62239d4e
|
fix离职日期
福利档案导出
|
2022-08-23 14:16:20 +08:00 |
|
Harryxzy
|
bf2f05e9ab
|
'xzy-解决oracle批量添加问题'
|
2022-08-17 13:28:33 +08:00 |
|
钱涛
|
b60758cd28
|
修复往期累计列表显示异常
|
2022-07-29 10:33:54 +08:00 |
|
钱涛
|
057ca97c9e
|
修复往期累计不显示的问题
|
2022-07-13 10:13:49 +08:00 |
|
钱涛
|
bf31d993a7
|
薪酬报表-薪酬核算完成，将数据存储到非加密表，删除人员信息，补充：分部、部门、岗位等其他字段，供数据中心引用
|
2022-07-11 17:31:33 +08:00 |
|
钱涛
|
b23f790fc9
|
去除Spring注解
|
2022-07-06 17:36:30 +08:00 |
|
钱涛
|
abdd87a005
|
fix
|
2022-06-24 18:05:08 +08:00 |
|
钱涛
|
a577645329
|
fix
|
2022-06-22 10:58:18 +08:00 |
|
钱涛
|
b78e96c875
|
考勤列表适配sqlserver
|
2022-06-13 15:37:52 +08:00 |
|
钱涛
|
e6c6b8eb57
|
Merge branch 'auth-fl' into release
# Conflicts:
# resource/sql/分权.sql
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/mapper/taxagent/TaxAgentMapper.xml
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SIExportServiceImpl.java
|
2022-06-10 16:58:45 +08:00 |
|
钱涛
|
6ddf483767
|
加解密
|
2022-06-10 16:43:38 +08:00 |
|
钱涛
|
e83714ba4f
|
Merge branch 'feature/encrypt' into release
# Conflicts:
# src/com/engine/salary/biz/AddUpSituationBiz.java
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/cmd/datacollection/OtherDeductionGetDetailListCmd.java
# src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java
# src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java
# src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java
# src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java
# src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java
# src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java
# src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.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/SISchemeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
# src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2022-06-10 15:26:43 +08:00 |
MustangDeng
|
ca1c20329c
|
fix 福利档案导入bug
|
2022-06-10 15:12:56 +08:00 |
|
钱涛
|
ec3838a292
|
申报表
|
2022-06-10 13:33:48 +08:00 |
|
钱涛
|
b8972bcd43
|
分权v3
|
2022-06-09 17:45:28 +08:00 |
|
钱涛
|
860c89b560
|
申报和往期异常
|
2022-06-08 16:36:50 +08:00 |
|
钱涛
|
cedc9f2644
|
考勤和申报表的分权
|
2022-06-07 15:43:22 +08:00 |
|
MustangDeng
|
6db127d926
|
Merge branch 'develop' into feature/encrypt
|
2022-06-06 11:31:21 +08:00 |
|
钱涛
|
88a0d08b1f
|
Merge branch 'auth-2' into release
# Conflicts:
# src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
|
2022-06-06 10:37:07 +08:00 |
|
钱涛
|
2bfd6c90a0
|
Merge branch 'develop' into release
# Conflicts:
# src/com/engine/salary/service/impl/SISchemeServiceImpl.java
|
2022-06-06 10:23:19 +08:00 |
|
钱涛
|
3f0bbd3160
|
剔除主账号
|
2022-06-06 10:19:11 +08:00 |
|
MustangDeng
|
f80365ddd5
|
Merge branch 'develop' into feature/encrypt
|
2022-06-02 10:35:07 +08:00 |
|
MustangDeng
|
da2a0e5d22
|
工资单及福利问题修复
|
2022-06-01 19:13:20 +08:00 |
|
钱涛
|
37a73b94df
|
同步人员
|
2022-06-01 17:45:49 +08:00 |
|
钱涛
|
69c76ea687
|
Merge branch 'auth-1' into release
|
2022-05-31 18:29:43 +08:00 |
|
钱涛
|
d800ab1925
|
Merge branch 'develop' into release
|
2022-05-31 18:29:34 +08:00 |
|
钱涛
|
99b5c36864
|
暂存
|
2022-05-31 16:41:11 +08:00 |
|
MustangDeng
|
68994ee304
|
Merge branch 'develop' into feature/encrypt
# Conflicts:
# resource/ecology9/WEB-INF/prop/hrmSalary.properties
# src/com/engine/salary/biz/AddUpDeductionBiz.java
# src/com/engine/salary/biz/AddUpSituationBiz.java
# src/com/engine/salary/biz/OtherDeductionBiz.java
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/biz/SalaryArchiveItemBiz.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2022-05-31 11:33:36 +08:00 |
|
钱涛
|
0898055d77
|
fix
|
2022-05-31 10:29:18 +08:00 |
|
钱涛
|
76b05e3d38
|
fix
|
2022-05-31 09:59:32 +08:00 |
|
钱涛
|
8b14038b90
|
分权
|
2022-05-31 09:58:35 +08:00 |
|
钱涛
|
f8ecb548ed
|
Merge branch 'auth' into release
# Conflicts:
# src/com/engine/salary/biz/AddUpDeductionBiz.java
# src/com/engine/salary/biz/AddUpSituationBiz.java
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/biz/SalaryArchiveBiz.java
# src/com/engine/salary/biz/SalaryArchiveItemBiz.java
# src/com/engine/salary/biz/SalaryItemBiz.java
# src/com/engine/salary/biz/SalarySobCheckRuleBiz.java
# src/com/engine/salary/cmd/datacollection/AddUpDeductionImportCmd.java
# src/com/engine/salary/cmd/datacollection/AddUpSituationImportCmd.java
# src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java
# src/com/engine/salary/enums/UserStatusEnum.java
# src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml
# src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
|
2022-05-30 18:50:00 +08:00 |
|
MustangDeng
|
4e4c190f31
|
bug修改
|
2022-05-30 17:31:29 +08:00 |
|
钱涛
|
4baa1643f6
|
oracle适配
|
2022-05-30 11:51:00 +08:00 |
|
MustangDeng
|
d48ef0aeec
|
oracle 适配
|
2022-05-30 09:14:12 +08:00 |
|
MustangDeng
|
224c823590
|
oracle 自增返回
|
2022-05-27 15:01:44 +08:00 |
|
钱涛
|
ad991954cd
|
暂存
|
2022-05-27 11:49:23 +08:00 |
|
钱涛
|
586fad5f2c
|
分权累计专项附加扣除
|
2022-05-25 16:51:43 +08:00 |
|
钱涛
|
e1b579d480
|
暂存
|
2022-05-25 13:10:03 +08:00 |
|
钱涛
|
99fda7ecc3
|
修复调薪记录
|
2022-05-25 11:09:48 +08:00 |
|
钱涛
|
bf364a7639
|
暂存
|
2022-05-24 15:20:12 +08:00 |