 钱涛
|
99b5c36864
|
暂存
|
2022-05-31 16:41:11 +08:00 |
|
钱涛
|
019ad96871
|
其他扣除
|
2022-05-31 11:21:51 +08:00 |
|
钱涛
|
0898055d77
|
fix
|
2022-05-31 10:29:18 +08:00 |
|
钱涛
|
8b14038b90
|
分权
|
2022-05-31 09:58:35 +08:00 |
|
钱涛
|
5925fb5606
|
分权
|
2022-05-30 20:13:03 +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 |
|
钱涛
|
c7a4f8a8e1
|
档案导入提示优化
|
2022-05-30 16:25:27 +08:00 |
|
钱涛
|
6986b39231
|
暂存
|
2022-05-30 14:17:02 +08:00 |
|
钱涛
|
7e09b283da
|
暂存
|
2022-05-30 13:33:22 +08:00 |
|
钱涛
|
841ca27c84
|
暂存
|
2022-05-27 17:21:39 +08:00 |
|
钱涛
|
71ea4b8609
|
导入
|
2022-05-27 15:43:38 +08:00 |
|
钱涛
|
c4c04ac87a
|
暂存
|
2022-05-27 14:46:01 +08:00 |
|
钱涛
|
c6ea4c5698
|
线下对比
|
2022-05-26 15:45:37 +08:00 |
|
钱涛
|
6103c9233e
|
批量操作数量限制
|
2022-05-26 13:41:58 +08:00 |
|
钱涛
|
f6eb69e62a
|
暂存
|
2022-05-26 11:02:55 +08:00 |
|
钱涛
|
586fad5f2c
|
分权累计专项附加扣除
|
2022-05-25 16:51:43 +08:00 |
|
钱涛
|
90a6bd9921
|
暂存
|
2022-05-25 13:49:25 +08:00 |
|
钱涛
|
f066d1ef64
|
fix档案分页
|
2022-05-25 13:13:03 +08:00 |
|
钱涛
|
e1b579d480
|
暂存
|
2022-05-25 13:10:03 +08:00 |
|
钱涛
|
895d258a44
|
分权基本控制开发完毕
|
2022-05-24 13:25:56 +08:00 |
|
钱涛
|
082d02ae67
|
Merge branch 'develop' into auth
|
2022-05-24 11:26:37 +08:00 |
|
钱涛
|
bccd246b2c
|
fix分页异常
|
2022-05-24 10:54:46 +08:00 |
|
钱涛
|
cb1a53c649
|
暂存
|
2022-05-24 09:14:26 +08:00 |
|
钱涛
|
49cd388df1
|
暂存
|
2022-05-20 15:58:58 +08:00 |
|
钱涛
|
4f36f89e53
|
Merge branch 'develop' into auth
|
2022-05-20 14:56:25 +08:00 |
|
钱涛
|
2c03d4bc27
|
暂存
|
2022-05-19 16:36:18 +08:00 |
|
钱涛
|
ed0ba7ed6d
|
暂存
|
2022-05-19 14:50:01 +08:00 |
|
钱涛
|
bb66f80906
|
fix 新增系统薪资项目，模糊搜索
|
2022-05-18 16:07:51 +08:00 |
|
钱涛
|
fa4d605c8d
|
暂存
|
2022-05-18 09:19:50 +08:00 |
|
钱涛
|
282c0abc22
|
薪资项目不使用自增
|
2022-05-13 11:22:10 +08:00 |
|
钱涛
|
e49bc9943f
|
薪酬核算第一步不使用线程池
|
2022-05-12 15:41:12 +08:00 |
|
钱涛
|
6f3d8e85c0
|
个税申报bug
|
2022-05-09 17:47:19 +08:00 |
|
钱涛
|
2c432ab1c0
|
可删除
|
2022-05-09 16:39:04 +08:00 |
|
钱涛
|
c852211b0e
|
核算log
|
2022-05-07 15:20:39 +08:00 |
|
钱涛
|
0b523846d7
|
日期类型处理
|
2022-05-06 16:54:58 +08:00 |
|
钱涛
|
d2a564cb92
|
sql兼容性处理
|
2022-05-06 16:01:33 +08:00 |
|
钱涛
|
5a406d52f3
|
系统项目及公式初始化脚本
|
2022-05-06 10:23:23 +08:00 |
|
钱涛
|
231961663f
|
核算结果导出
|
2022-05-05 14:10:19 +08:00 |
|
钱涛
|
a530532a45
|
去除run方法
|
2022-05-05 10:35:58 +08:00 |
|
钱涛
|
f2f678c6d1
|
核算进度
|
2022-04-29 17:15:22 +08:00 |
|
钱涛
|
ad6ab6daff
|
核算3.0
|
2022-04-29 14:56:33 +08:00 |
|
钱涛
|
dff9657c3d
|
核算字段
|
2022-04-29 14:17:31 +08:00 |
|
钱涛
|
23da0fb5e4
|
sql公式
|
2022-04-28 15:02:11 +08:00 |
|
钱涛
|
5c2bb1bf58
|
入职日期改为String
|
2022-04-28 10:05:27 +08:00 |
|
钱涛
|
6ca41e8e59
|
字段分类
|
2022-04-27 18:29:38 +08:00 |
|
钱涛
|
151fa2b575
|
线下对比
|
2022-04-26 16:39:41 +08:00 |
|
钱涛
|
d521bf5bf7
|
账套周期
|
2022-04-26 14:44:42 +08:00 |
|
钱涛
|
6a024cb35b
|
权限构造
|
2022-04-25 18:06:09 +08:00 |
|
钱涛
|
daeb41f092
|
fix列
|
2022-04-25 16:31:33 +08:00 |