Harryxzy
|
5e4f32dbab
|
累计专项附加扣除更新插入时间修正
|
2023-07-03 10:34:30 +08:00 |
|
Harryxzy
|
2bf99d3ec1
|
累计专项附加扣除防抖动修复
|
2023-07-03 10:33:01 +08:00 |
|
Harryxzy
|
eb0c59c0b9
|
累计专项附加扣除列表提速-2
|
2023-06-29 14:05:33 +08:00 |
|
Harryxzy
|
33593311df
|
累计专项附加扣除列表提速
|
2023-06-29 14:04:11 +08:00 |
|
Harryxzy
|
e3e0bcd66b
|
累计专项附加扣除防抖动
|
2023-06-29 13:53:07 +08:00 |
 钱涛
|
6b19445a1a
|
Merge branch 'release/2.8.2.2305.02' into feature/公式
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
|
2023-05-08 11:22:23 +08:00 |
|
钱涛
|
a19b19e23d
|
公式
|
2023-04-19 10:15:01 +08:00 |
|
Harryxzy
|
82ee707f16
|
employebiz改成employeeservice
|
2023-04-12 15:27:35 +08:00 |
|
钱涛
|
62d124efb1
|
外部人员终极版
|
2023-03-15 22:48:01 +08:00 |
|
钱涛
|
a423790a35
|
获取人员信息
|
2023-03-06 17:57:20 +08:00 |
|
钱涛
|
6de22b142d
|
1、工资单模板
2、一键累计
|
2023-03-02 17:11:42 +08:00 |
fcli
|
d1f62e8b49
|
Merge remote-tracking branch 'origin/release/2.5.3.2301.01' into release/2.5.3.2301.01
|
2023-01-06 09:06:41 +08:00 |
|
fcli
|
eb3c75197b
|
feat: 往期累计一键清空校验bug修复
|
2023-01-05 09:40:43 +08:00 |
|
fcli
|
3863a10c27
|
fix: 一月份不累计上年数据
|
2023-01-04 14:15:59 +08:00 |
|
fcli
|
dea2353ef2
|
Merge branch 'feature/变更分页' into feature/加密方法&分页merge
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/biz/SalaryArchiveItemBiz.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/SpecialAddDeductionServiceImpl.java
|
2022-12-14 10:57:41 +08:00 |
|
fcli
|
d3de862d11
|
feat: 加密统一,薪资项目&社保档案详情...
|
2022-12-13 17:14:27 +08:00 |
|
fcli
|
1431308cc5
|
feat: 加密统一，薪资核算结果
|
2022-12-12 16:42:44 +08:00 |
|
fcli
|
b58e71989d
|
feat: 统一修改到内存分页
|
2022-12-12 10:25:55 +08:00 |
|
钱涛
|
8dc2ddc3c8
|
加密方法
|
2022-12-12 09:37:15 +08:00 |
|
钱涛
|
309cb2047d
|
配置文件
|
2022-12-09 15:28:29 +08:00 |
|
fcli
|
b3cd118c21
|
feat: 自动累计功能
|
2022-11-17 14:28:15 +08:00 |
|
fcli
|
459f7e5053
|
Merge branch 'feature/SpecialAddUpMerge' into release/2.1.3.2211.03
|
2022-11-10 09:33:22 +08:00 |
|
fcli
|
63ee9c9b8e
|
fix: 一键累计添加日期与校验
|
2022-11-09 18:57:28 +08:00 |
|
fcli
|
815e37e50b
|
fix: 一键累计添加日期与校验
|
2022-11-09 16:55:00 +08:00 |
|
Harryxzy
|
02a6ab11ce
|
Merge branch 'fix/CollectionDataLongCompare' into release/2.1.3.2211.03
# Conflicts:
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
|
2022-11-09 16:44:49 +08:00 |
|
fcli
|
bf75c3831f
|
fix: 一键累计添加日期
|
2022-11-09 15:39:00 +08:00 |
|
Harryxzy
|
e2e383bd79
|
数据采集-Fix数据采集Long类型判断
|
2022-11-09 15:36:07 +08:00 |
|
fcli
|
dd5c2ba4ce
|
fix: 管理员可以编辑该扣缴义务人数据，其他人可以编辑本人数据&一键累计所有个税扣缴义务人下的人员
|
2022-11-09 10:41:00 +08:00 |
|
fcli
|
eb7311f0f3
|
fix: 管理员可以编辑该扣缴义务人数据，其他人可以编辑本人数据&一键累计所有个税扣缴义务人下的人员
|
2022-11-09 10:40:55 +08:00 |
|
fcli
|
07a07d2be8
|
feat: 专项附加扣除模块, 权限限制，导入导出优化，添加一键累计
|
2022-11-09 10:40:48 +08:00 |
|
fcli
|
9b77bf7139
|
feat: 专项附加扣除模块, 一键清空、分页bug等
|
2022-11-09 10:40:38 +08:00 |
|
Harryxzy
|
317fb5e8ac
|
数据采集-编辑前查看功能
|
2022-10-31 14:50:54 +08:00 |
|
Harryxzy
|
e046b7e3fe
|
fix 一键清空
|
2022-10-28 16:35: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 |
|
Harryxzy
|
c0bb94bf71
|
editDataCollection-2
|
2022-10-26 18:35:23 +08:00 |
|
钱涛
|
919d08a496
|
修复工资单查询
|
2022-09-29 10:28:46 +08:00 |
|
钱涛
|
92b2774ebf
|
三个数据采集模块删除无效的查询条件
|
2022-09-29 10:03:51 +08:00 |
|
钱涛
|
66a39a07a3
|
Merge branch 'feature/order' into develop
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
|
2022-09-27 10:25:12 +08:00 |
|
钱涛
|
6e726366ad
|
排序
|
2022-09-26 18:51:17 +08:00 |
sy
|
0a900905bd
|
薪酬系统-数据采集-累计专项附加扣除、往期累计情况、考勤引用三处导入模板均增加基本信息的带出
|
2022-09-26 13:46:43 +08:00 |
|
sy
|
de150e063e
|
薪酬系统导入方式配置-人员筛选方法类调用优化以及调整相关调用该方法的代码
|
2022-09-21 15:49:55 +08:00 |
|
sy
|
b0cc2cc19d
|
薪酬系统导入方式配置-人员匹配全局配置的confValue默认设为0
|
2022-09-19 15:11:27 +08:00 |
|
sy
|
86ba593d1f
|
薪酬系统导入方式配置-数据采集-累计附加专项扣除-导入,添加导入人员筛选配置化处理
|
2022-09-19 11:01:17 +08:00 |
|
sy
|
280c979536
|
薪酬系统-修改导入信息时对于姓名字段的依赖逻辑
|
2022-09-16 15:03:48 +08:00 |
|
钱涛
|
f71e222c73
|
fix导入
|
2022-08-26 14:06:21 +08:00 |
|
sy
|
8ea34ef7dd
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport
|
2022-08-26 09:18:06 +08:00 |
|
钱涛
|
bfcda3525a
|
1、福利方案分权
2、累计、往期、其他导入分权
3、导入精度
|
2022-08-25 16:46:12 +08:00 |
|
sy
|
2041031e92
|
薪酬模块导入按钮匹配项优化
姓名-部门-手机号
涉及接口，薪资档案导入接口、数据采集子菜单中的四个导入接口
|
2022-08-25 11:43:52 +08:00 |
|
钱涛
|
a7c022f38d
|
1、批量插入报表支持oracle
2、累计、往期返聘人员适配
|
2022-08-16 10:39:45 +08:00 |
|
钱涛
|
9bd1074258
|
1、档案限制应为个税扣缴义务人下的人员
2、个税扣缴义务人未开启分权的情况下显示管理员
|
2022-07-06 10:13:06 +08:00 |
|
钱涛
|
7b468045c8
|
1、限制核算的人员范围
2、薪资工资单的导出功能
3、修复工资单批量发放和撤回的问题
4、核算时取各个扣缴义务人的数据
|
2022-06-29 17:38:00 +08:00 |
|
钱涛
|
abdd87a005
|
fix
|
2022-06-24 18:05:08 +08:00 |
|
钱涛
|
b357bd18a6
|
fix
|
2022-06-23 14:08:55 +08:00 |
|
钱涛
|
fc35eff75d
|
fix
|
2022-06-21 22:37:22 +08:00 |
|
钱涛
|
bf7d8dd634
|
导入时人员唯一校验
|
2022-06-13 17:05:36 +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 |
|
钱涛
|
b8972bcd43
|
分权v3
|
2022-06-09 17:45:28 +08:00 |
|
钱涛
|
79632dd1bf
|
申报表分权
|
2022-06-07 19:10:40 +08:00 |
|
钱涛
|
be88b90f56
|
核算的分权
|
2022-06-02 17:10:54 +08:00 |
|
钱涛
|
bb665500ae
|
档案
|
2022-06-01 19:14:05 +08:00 |
|
钱涛
|
efd31013cd
|
薪资账套分权
|
2022-05-31 21:05:59 +08:00 |
|
钱涛
|
99b5c36864
|
暂存
|
2022-05-31 16:41:11 +08:00 |
|
钱涛
|
e38841f280
|
合并auth
|
2022-05-30 18:59:48 +08:00 |
|
钱涛
|
71ea4b8609
|
导入
|
2022-05-27 15:43:38 +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 |
|
钱涛
|
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 |
|
钱涛
|
e1b579d480
|
暂存
|
2022-05-25 13:10:03 +08:00 |
|
钱涛
|
bf364a7639
|
暂存
|
2022-05-24 15:20:12 +08:00 |
MustangDeng
|
05f529769c
|
加解密
|
2022-05-24 09:23:17 +08:00 |
|
钱涛
|
d77e8b0de4
|
累计扣除字段
|
2022-05-20 14:41:42 +08:00 |
|
钱涛
|
bf37add9dd
|
修复导出异常
|
2022-05-09 14:11:07 +08:00 |
|
钱涛
|
b0ee96eb41
|
导入模板改为内存生成
|
2022-04-28 17:44:26 +08:00 |
|
钱涛
|
a069447f02
|
核算基础公式
|
2022-04-11 20:17:47 +08:00 |
|
钱涛
|
8a7251c076
|
Merge branch 'feature/qt' into develop
# Conflicts:
# src/com/engine/salary/web/AddUpDeductionController.java
|
2022-03-10 11:10:40 +08:00 |
|
钱涛
|
d55fca8eeb
|
导出明细
|
2022-03-10 11:09:08 +08:00 |
|
钱涛
|
8da28ec05f
|
Merge branch 'feature/qt' into develop
# Conflicts:
# src/com/engine/salary/init.sql
|
2022-03-09 19:00:21 +08:00 |
|
钱涛
|
7ee952e63c
|
累计
|
2022-03-09 16:40:14 +08:00 |
 Chengliang
|
0c3322796f
|
solve conflict
|
2022-03-09 10:09:07 +08:00 |
|
钱涛
|
880cf9ef66
|
excel导入导出
|
2022-03-09 09:58:36 +08:00 |
|
钱涛
|
9de0f08415
|
日期转换
|
2022-03-08 15:40:26 +08:00 |
|
钱涛
|
0759628eb2
|
excel导入导出
|
2022-03-07 15:08:56 +08:00 |
|
钱涛
|
97cc5d154f
|
累计附加扣除-条件接口
|
2022-03-04 10:10:38 +08:00 |
|
钱涛
|
c183a11cba
|
统一税率保存参数
|
2022-03-03 13:50:03 +08:00 |