 钱涛
|
1969b44804
|
见分进角规则
|
2022-08-17 18:33:46 +08:00 |
|
钱涛
|
7d79dcdfc2
|
修复社保福利列表高级搜索
|
2022-08-11 10:27:15 +08:00 |
|
钱涛
|
a252d055ab
|
1、核算接口代理
2、获取异常真实信息
|
2022-08-01 14:15:09 +08:00 |
|
钱涛
|
36e2f96ae5
|
社保方案起始缴纳和最后缴纳生效
|
2022-07-28 14:22:59 +08:00 |
|
钱涛
|
259c40758f
|
1、薪资项目增加系统名
2、薪资项目增加申报项目名
3、账套对应字段
|
2022-07-27 16:56:13 +08:00 |
|
钱涛
|
e7968f2545
|
1、公共枚举接口
2、薪资档案封存标识
|
2022-07-26 18:01:39 +08:00 |
|
钱涛
|
9dcebdc994
|
暂存
|
2022-07-15 10:15:59 +08:00 |
|
钱涛
|
bb8c863bcc
|
薪酬报表与解密方法
|
2022-07-13 13:55:31 +08:00 |
|
钱涛
|
1d5c69278f
|
描述异常
|
2022-07-13 11:45:16 +08:00 |
|
钱涛
|
12917f4f8b
|
去除无用todo
|
2022-07-08 11:30:10 +08:00 |
|
钱涛
|
03ba0418ab
|
福利核算精度异常
|
2022-07-05 15:04:00 +08:00 |
|
钱涛
|
c372fff59c
|
系统异常处理
|
2022-07-01 15:18:29 +08:00 |
|
钱涛
|
31a8b4bff9
|
fix
|
2022-06-23 17:15:39 +08:00 |
|
钱涛
|
b8972bcd43
|
分权v3
|
2022-06-09 17:45:28 +08:00 |
|
钱涛
|
860c89b560
|
申报和往期异常
|
2022-06-08 16:36:50 +08:00 |
|
钱涛
|
79632dd1bf
|
申报表分权
|
2022-06-07 19:10:40 +08:00 |
|
钱涛
|
bb665500ae
|
档案
|
2022-06-01 19:14:05 +08:00 |
|
钱涛
|
d800ab1925
|
Merge branch 'develop' into release
|
2022-05-31 18:29:34 +08:00 |
|
钱涛
|
72d1b48126
|
fix
|
2022-05-31 11:03:56 +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 |
|
钱涛
|
6470346ed0
|
oracle的like
|
2022-05-30 13:30:51 +08:00 |
|
钱涛
|
6103c9233e
|
批量操作数量限制
|
2022-05-26 13:41:58 +08:00 |
|
钱涛
|
e1b579d480
|
暂存
|
2022-05-25 13:10:03 +08:00 |
|
钱涛
|
082d02ae67
|
Merge branch 'develop' into auth
|
2022-05-24 11:26:37 +08:00 |
|
钱涛
|
f555192e70
|
升级
|
2022-05-24 11:24:21 +08:00 |
|
钱涛
|
2c03d4bc27
|
暂存
|
2022-05-19 16:36:18 +08:00 |
|
钱涛
|
fa4d605c8d
|
暂存
|
2022-05-18 09:19:50 +08:00 |
|
钱涛
|
a4c285dfd4
|
异常
|
2022-05-16 17:03:17 +08:00 |
|
钱涛
|
c440ccd0a6
|
修复
|
2022-05-10 17:26:58 +08:00 |
|
钱涛
|
525fcc49a7
|
公式模拟运行
|
2022-05-08 12:34:05 +08:00 |
|
钱涛
|
c852211b0e
|
核算log
|
2022-05-07 15:20:39 +08:00 |
|
钱涛
|
a530532a45
|
去除run方法
|
2022-05-05 10:35:58 +08:00 |
|
钱涛
|
5c2bb1bf58
|
入职日期改为String
|
2022-04-28 10:05:27 +08:00 |
|
钱涛
|
8abfb7631e
|
fix线下对比404
|
2022-04-27 09:43:24 +08:00 |
|
钱涛
|
151fa2b575
|
线下对比
|
2022-04-26 16:39:41 +08:00 |
|
钱涛
|
11241d0b6f
|
权限构造
|
2022-04-26 11:26:13 +08:00 |
|
钱涛
|
6a024cb35b
|
权限构造
|
2022-04-25 18:06:09 +08:00 |
 Chengliang
|
9dc29b2b3c
|
修复xml文件报错
|
2022-04-22 16:42:06 +08:00 |
18895359881@163.com
|
4fd63c1999
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-19 20:59:33 +08:00 |
|
18895359881@163.com
|
bfdb9a33d5
|
个税申报表接口
|
2022-04-19 20:58:30 +08:00 |
|
钱涛
|
e16a533089
|
补充列
|
2022-04-19 13:42:16 +08:00 |
|
钱涛
|
2afab36ee7
|
补充列
|
2022-04-19 13:30:41 +08:00 |
|
reset
|
37830fc89e
|
!22 增加datakey
Merge pull request !22 from reset/archive
|
2022-04-19 04:20:18 +00:00 |
|
Chengliang
|
9c02c9c9fd
|
列表增加datakey
|
2022-04-19 12:19:06 +08:00 |
|
reset
|
8ed7bbb3b6
|
!21 福利台账导出各接口
Merge pull request !21 from reset/archive
|
2022-04-18 12:26:02 +00:00 |
|
Chengliang
|
651df1842e
|
福利台账导出
|
2022-04-18 20:24:43 +08:00 |
|
18895359881@163.com
|
6fce8cdf4c
|
薪酬接口
|
2022-04-18 18:56:17 +08:00 |
|
18895359881@163.com
|
a5b73098c9
|
Merge branch 'develop' into test_xxy
|
2022-04-16 16:14:56 +08:00 |
|
18895359881@163.com
|
3e64b1cfde
|
薪酬接口
|
2022-04-16 15:33:51 +08:00 |
|
钱涛
|
941a34990f
|
Merge branch 'feature/acct' into develop
# Conflicts:
# src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java
# src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java
|
2022-04-14 20:49:24 +08:00 |