Harryxzy
|
093cb34f77
|
操作日志fix some bugs
|
2024-02-23 15:11:56 +08:00 |
|
Harryxzy
|
dee20149bb
|
日志
|
2024-02-21 18:19:02 +08:00 |
 钱涛
|
079b7de258
|
合并240101
|
2024-02-21 15:35:08 +08:00 |
|
钱涛
|
53806d9262
|
Merge branch 'release/2.10.1.2401.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/util/excel/ExcelUtil.java
|
2024-02-21 15:28:33 +08:00 |
|
钱涛
|
6a8c9aebe3
|
修复考勤引用数据失败bug
|
2024-01-29 10:05:30 +08:00 |
|
钱涛
|
895da67d46
|
Merge branch 'release/2.9.8.2311.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
# src/com/engine/salary/util/SalaryDateUtil.java
|
2023-11-28 15:09:51 +08:00 |
|
钱涛
|
e1a4e275ff
|
短信模板设置接口
|
2023-11-16 15:41:29 +08:00 |
|
钱涛
|
75717871d0
|
Merge branch 'release/3.0.0.2311.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
|
2023-11-08 16:20:31 +08:00 |
|
钱涛
|
0634a139b9
|
显示字符统计规则
|
2023-11-02 18:41:58 +08:00 |
|
钱涛
|
b050888b7b
|
Merge branch 'release/3.0.0.2311.01' into release/个税版本
|
2023-10-31 17:19:09 +08:00 |
|
钱涛
|
3d8919da25
|
账套增加证件号码字段
|
2023-10-31 15:08:43 +08:00 |
|
钱涛
|
e19f00c44d
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
|
2023-10-20 09:43:24 +08:00 |
|
钱涛
|
0dd9040408
|
一键累计bug修复
|
2023-10-19 17:35:33 +08:00 |
|
钱涛
|
26bbc9c0ee
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
|
2023-10-08 14:21:25 +08:00 |
|
钱涛
|
8166e76081
|
账套增加状态字段
|
2023-10-08 13:38:37 +08:00 |
|
钱涛
|
83e0b1668e
|
往期累计
|
2023-09-07 18:21:22 +08:00 |
|
钱涛
|
6059174e7c
|
往期累计的在线获取
|
2023-09-06 09:40:50 +08:00 |
|
钱涛
|
f245bd2f49
|
新增往期累计字段
|
2023-09-05 11:04:53 +08:00 |
|
钱涛
|
9867728d2e
|
在线获取累计专项附加扣除
|
2023-09-04 16:18:02 +08:00 |
|
钱涛
|
96bfdf05ed
|
在线获取累计专项附加扣除
|
2023-09-04 14:20:42 +08:00 |
|
钱涛
|
c0c29b7472
|
在线获取累计专项附加扣除
|
2023-09-04 09:29:00 +08:00 |
|
钱涛
|
7c5e373b01
|
2
|
2023-09-01 09:23:43 +08:00 |
|
钱涛
|
45e69cd6c8
|
导出
|
2023-08-24 11:36:17 +08:00 |
|
钱涛
|
914963135a
|
个税对接辅助缴款
|
2023-08-17 14:55:32 +08:00 |
|
钱涛
|
e75d5ab427
|
v1
|
2023-07-20 10:36:29 +08:00 |
|
钱涛
|
aec6918c12
|
Merge branch 'release/2.9.1.2307.01' into feature/外部人员
# Conflicts:
# src/com/engine/salary/biz/EmployBiz.java
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java
# src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
# src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
# src/com/engine/salary/service/SalaryEmployeeService.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/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java
# src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
# src/com/engine/salary/wrapper/SalarySendWrapper.java
# src/com/engine/salary/wrapper/TaxAgentSubAdminWrapper.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2023-07-11 16:08:15 +08:00 |
|
Harryxzy
|
512510c623
|
考勤引用校验能够否删除
|
2023-06-16 11:49:23 +08:00 |
|
钱涛
|
399a615be6
|
人员明细
|
2023-05-25 13:51:27 +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 |
|
钱涛
|
41e95ceadf
|
字段管理不显示id
|
2023-05-05 15:32:55 +08:00 |
|
钱涛
|
2d8b4b07d0
|
Merge branch 'release/2.7.4.2304.02' into feature/报表
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
|
2023-04-28 10:49:33 +08:00 |
|
钱涛
|
d36cfe31b3
|
报表暂存
|
2023-04-27 16:05:03 +08:00 |
|
钱涛
|
40cd70e2a3
|
Merge branch 'release/2.7.4.2304.02' into feature/公式
|
2023-04-25 17:39:33 +08:00 |
|
钱涛
|
36863c3695
|
报表
|
2023-04-23 10:14:32 +08:00 |
|
钱涛
|
a19b19e23d
|
公式
|
2023-04-19 10:15:01 +08:00 |
|
钱涛
|
9549e75e00
|
Merge branch 'release/2.7.3.2304.01' into feature/外部人员
|
2023-04-13 14:48:43 +08:00 |
|
钱涛
|
a4a829d201
|
年终奖数据
|
2023-04-11 17:24:31 +08:00 |
|
钱涛
|
44fe9203ab
|
个人养老金
|
2023-04-04 14:21:25 +08:00 |
|
钱涛
|
ace15ca7a1
|
非系统人员
|
2023-03-15 18:03:46 +08:00 |
|
钱涛
|
6f9769bae2
|
手机号
|
2023-03-15 10:07:40 +08:00 |
|
Harryxzy
|
fdb5774ae4
|
考勤引用列表改造
|
2023-03-02 11:23:57 +08:00 |
|
钱涛
|
245803cfe8
|
获取人员状态
|
2023-02-23 10:28:27 +08:00 |
fcli
|
d3de862d11
|
feat: 加密统一,薪资项目&社保档案详情...
|
2022-12-13 17:14:27 +08:00 |
|
fcli
|
1c6acb497c
|
feat: 加密统一，累计附加扣除详细
|
2022-12-13 10:49:51 +08:00 |
|
fcli
|
93db32b758
|
feat: 加密统一，累计附加扣除&社保福利模块
|
2022-12-12 15:40:01 +08:00 |
|
钱涛
|
8dc2ddc3c8
|
加密方法
|
2022-12-12 09:37:15 +08:00 |
|
fcli
|
5743fa2162
|
feat: 其他附加扣除沿用上月功能完成
|
2022-11-17 14:28:10 +08:00 |
|
fcli
|
bf75c3831f
|
fix: 一键累计添加日期
|
2022-11-09 15:39:00 +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 |
|
fcli
|
92a6512dc8
|
feat: 专项附加扣除模块,去除月份，添加普通用户登录查看本人记录功能
|
2022-11-09 10:40:28 +08:00 |
|
fcli
|
fafc157e63
|
feat: 专项附加扣除模块
|
2022-11-09 10:40:19 +08:00 |
|
fcli
|
5e69d07b7c
|
feat: 专项附加扣除模块
|
2022-11-09 10:39:55 +08:00 |
|
Harryxzy
|
5d97954e48
|
往期累计情况一键清空和删除所选
|
2022-10-31 19:21:13 +08:00 |
|
Harryxzy
|
e8ac395300
|
fix-专项附加扣除taxAgentId为空
|
2022-10-31 16:04:06 +08:00 |
|
Harryxzy
|
e046b7e3fe
|
fix 一键清空
|
2022-10-28 16:35:51 +08:00 |
|
Harryxzy
|
09d85bdab3
|
考勤引用=编辑
|
2022-10-28 16:15:51 +08:00 |
|
Harryxzy
|
1f29ac67eb
|
累计、其他免税、往期 新增、删除、一键清空、编辑功能
|
2022-10-28 14:08:27 +08:00 |
|
Harryxzy
|
a406eed4b9
|
累计专项附加扣除-新增、删除所选、一键清空功能
|
2022-10-27 13:59:11 +08:00 |
|
Harryxzy
|
c0bb94bf71
|
editDataCollection-2
|
2022-10-26 18:35:23 +08:00 |
|
Harryxzy
|
e1239d3018
|
xzy-核算自定义列表添加分部
|
2022-08-29 14:50:26 +08:00 |
|
钱涛
|
bf31d993a7
|
薪酬报表-薪酬核算完成，将数据存储到非加密表，删除人员信息，补充：分部、部门、岗位等其他字段，供数据中心引用
|
2022-07-11 17:31:33 +08:00 |
|
钱涛
|
abdd87a005
|
fix
|
2022-06-24 18:05:08 +08:00 |
|
钱涛
|
33914eae1d
|
解密
|
2022-06-10 18:07:25 +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 |
MustangDeng
|
2d2c993f2a
|
累计附加扣除详情列表没有解密 fix
|
2022-06-09 15:22:49 +08:00 |
|
钱涛
|
cedc9f2644
|
考勤和申报表的分权
|
2022-06-07 15:43:22 +08:00 |
|
钱涛
|
be88b90f56
|
核算的分权
|
2022-06-02 17:10:54 +08:00 |
|
MustangDeng
|
a24cb2e6d6
|
加解密自测问题处理
|
2022-06-02 17:01:26 +08:00 |
|
MustangDeng
|
f80365ddd5
|
Merge branch 'develop' into feature/encrypt
|
2022-06-02 10:35:07 +08:00 |
|
钱涛
|
bb665500ae
|
档案
|
2022-06-01 19:14:05 +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 |
|
钱涛
|
3f958d2886
|
暂存
|
2022-05-31 18:27:33 +08:00 |
|
MustangDeng
|
560c3c9103
|
cmd 解密转换
|
2022-05-31 16:20:04 +08:00 |
|
MustangDeng
|
df3535c77d
|
和代码build处理
|
2022-05-31 16:02:41 +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 |
|
钱涛
|
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 |
|
钱涛
|
60ae1ff35b
|
sqlserver
适配
|
2022-05-27 18:07:26 +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 |
|
钱涛
|
e1b579d480
|
暂存
|
2022-05-25 13:10:03 +08:00 |
|
钱涛
|
bf364a7639
|
暂存
|
2022-05-24 15:20:12 +08:00 |
|
钱涛
|
f555192e70
|
升级
|
2022-05-24 11:24:21 +08:00 |
|
MustangDeng
|
05f529769c
|
加解密
|
2022-05-24 09:23:17 +08:00 |
|
钱涛
|
d77e8b0de4
|
累计扣除字段
|
2022-05-20 14:41:42 +08:00 |
|
钱涛
|
fd856e0750
|
入职日期
|
2022-05-09 14:24:40 +08:00 |
|
钱涛
|
bf37add9dd
|
修复导出异常
|
2022-05-09 14:11:07 +08:00 |
|
钱涛
|
a530532a45
|
去除run方法
|
2022-05-05 10:35:58 +08:00 |
|
钱涛
|
dff9657c3d
|
核算字段
|
2022-04-29 14:17:31 +08:00 |
|
钱涛
|
b0ee96eb41
|
导入模板改为内存生成
|
2022-04-28 17:44:26 +08:00 |
|
钱涛
|
23da0fb5e4
|
sql公式
|
2022-04-28 15:02:11 +08:00 |
|
钱涛
|
5c2bb1bf58
|
入职日期改为String
|
2022-04-28 10:05:27 +08:00 |
|
钱涛
|
01354b2be9
|
fix线下对比404
|
2022-04-27 13:33:44 +08:00 |