Harryxzy
|
4d0a73e030
|
xzy-解决社保福利方案删除时校验问题
|
2022-08-18 12:26:53 +08:00 |
 钱涛
|
5124520850
|
1、其他福利单位合计导出错误
2、方案删除错误
|
2022-08-17 11:46:35 +08:00 |
 liuliang
|
089cb2aa11
|
删除社保福利方案测试
|
2022-07-28 17:56:42 +08:00 |
|
liuliang
|
35fc07bb9a
|
社保福利方案bug修复
|
2022-07-28 17:18:51 +08:00 |
|
liuliang
|
eb6f0b81ca
|
删除社保方案福利功能
|
2022-07-26 16:14:24 +08:00 |
|
钱涛
|
1d5c69278f
|
描述异常
|
2022-07-13 11:45:16 +08:00 |
|
钱涛
|
bf31d993a7
|
薪酬报表-薪酬核算完成，将数据存储到非加密表，删除人员信息，补充：分部、部门、岗位等其他字段，供数据中心引用
|
2022-07-11 17:31:33 +08:00 |
|
钱涛
|
12917f4f8b
|
去除无用todo
|
2022-07-08 11:30:10 +08:00 |
|
钱涛
|
5cea57d477
|
fix bug
|
2022-06-17 17:22:48 +08:00 |
|
钱涛
|
6ddf483767
|
加解密
|
2022-06-10 16:43:38 +08:00 |
|
钱涛
|
860c89b560
|
申报和往期异常
|
2022-06-08 16:36:50 +08:00 |
|
钱涛
|
6646a2e481
|
申报表的分权
|
2022-06-02 18:02:27 +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 |
|
钱涛
|
3907ac49d9
|
fix bug
|
2022-05-30 18:03:20 +08:00 |
|
钱涛
|
60ae1ff35b
|
sqlserver
适配
|
2022-05-27 18:07:26 +08:00 |
|
钱涛
|
841ca27c84
|
暂存
|
2022-05-27 17:21:39 +08:00 |
|
钱涛
|
be4ed2229d
|
暂存
|
2022-05-27 14:51:53 +08:00 |
|
钱涛
|
c4c04ac87a
|
暂存
|
2022-05-27 14:46:01 +08:00 |
|
钱涛
|
ad991954cd
|
暂存
|
2022-05-27 11:49:23 +08:00 |
|
钱涛
|
586fad5f2c
|
分权累计专项附加扣除
|
2022-05-25 16:51:43 +08:00 |
|
钱涛
|
d77e8b0de4
|
累计扣除字段
|
2022-05-20 14:41:42 +08:00 |
MustangDeng
|
0909e37741
|
数据采集高级搜索
|
2022-05-19 09:45:02 +08:00 |
|
MustangDeng
|
f8105537c9
|
福利导入
|
2022-05-18 18:53:30 +08:00 |
|
钱涛
|
e445e654de
|
往期累计
|
2022-04-28 19:32:38 +08:00 |
|
钱涛
|
beb725fb8a
|
导入
|
2022-04-28 18:27:25 +08:00 |
|
钱涛
|
741a81bd29
|
除去导入无效的代码
|
2022-04-26 13:36:16 +08:00 |
|
钱涛
|
36d65de007
|
fix
|
2022-04-21 14:15:56 +08:00 |
18895359881@163.com
|
3e64b1cfde
|
薪酬接口
|
2022-04-16 15:33:51 +08:00 |
|
钱涛
|
e9e03880d9
|
Merge branch 'feature/qt' into develop
|
2022-03-31 18:42:06 +08:00 |
|
钱涛
|
a8732708a8
|
薪资档案导入
|
2022-03-31 15:41:55 +08:00 |
|
钱涛
|
faca2d4d1b
|
Merge branch 'feature/qt' into develop
|
2022-03-28 11:38:46 +08:00 |
|
钱涛
|
00c0fe477e
|
税率
|
2022-03-28 10:49:23 +08:00 |
|
钱涛
|
c4142801bc
|
Merge branch 'feature/qt' into develop
|
2022-03-24 20:01:56 +08:00 |
|
钱涛
|
f2cf03ebbf
|
departmentIds
|
2022-03-24 20:01:25 +08:00 |
|
钱涛
|
288c274aaf
|
Merge branch 'feature/qt' into develop
|
2022-03-23 20:54:22 +08:00 |
|
钱涛
|
79f9e010af
|
账套薪资项目
|
2022-03-23 20:54:08 +08:00 |
|
钱涛
|
578b8f7aaa
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-03-23 09:26:33 +08:00 |
|
钱涛
|
c01e63040c
|
薪资项目&账套
|
2022-03-22 21:01:38 +08:00 |
 Chengliang
|
56036bf9cb
|
福利方案getSearchCondition接口
|
2022-03-22 19:47:46 +08:00 |
|
Chengliang
|
cc9a650b92
|
批量保存，批量删除社保档案
|
2022-03-16 18:26:49 +08:00 |
|
Chengliang
|
88c0cc67e6
|
福利档案获取baseForm
|
2022-03-15 17:39:19 +08:00 |
|
Chengliang
|
67fe45cd2a
|
bug修复
|
2022-03-15 09:56:56 +08:00 |
|
钱涛
|
27c9d669f7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-03-15 09:56:30 +08:00 |
|
钱涛
|
eb4ca765d7
|
考勤相关接口
|
2022-03-15 09:55:58 +08:00 |
|
reset
|
64eff51ab2
|
!4 福利方案表单接口
Merge pull request !4 from reset/archive
|
2022-03-15 01:39:24 +00:00 |
|
Chengliang
|
69a1b4d5ae
|
福利项目表单接口修复
|
2022-03-15 09:34:53 +08:00 |
|
钱涛
|
fe14008e39
|
sql适配
|
2022-03-12 17:45:39 +08:00 |
|
钱涛
|
4e9d103021
|
fix bug
|
2022-03-12 14:20:39 +08:00 |
|
钱涛
|
3abcf90ee2
|
连表查询
|
2022-03-12 13:21:27 +08:00 |