 钱涛
|
b23f790fc9
|
去除Spring注解
|
2022-07-06 17:36:30 +08:00 |
|
钱涛
|
24853722cb
|
1、去除@resource
|
2022-07-06 17:33:45 +08:00 |
|
钱涛
|
7301ee1033
|
1、福利档案限制缴纳组织必须为扣税扣缴义务人
2、福利档案人员限制为个税扣缴义务人下
3、个税扣缴义务人单个申报
|
2022-07-06 16:42:13 +08:00 |
|
钱涛
|
3c3c679757
|
获取个税扣缴义务人下的实际人员配置接口
|
2022-07-06 10:52:37 +08:00 |
|
钱涛
|
9bd1074258
|
1、档案限制应为个税扣缴义务人下的人员
2、个税扣缴义务人未开启分权的情况下显示管理员
|
2022-07-06 10:13:06 +08:00 |
|
钱涛
|
48d70400e5
|
薪资档案验证人员是否在义务扣缴人下
|
2022-07-05 19:19:17 +08:00 |
|
钱涛
|
053c436d49
|
获取薪酬版本信息
|
2022-07-05 16:56:09 +08:00 |
|
钱涛
|
190d6da1b2
|
操作实际管理的个税扣缴人
|
2022-07-05 15:31:18 +08:00 |
|
钱涛
|
d244883190
|
薪酬对外提供的解密方法
|
2022-07-05 15:08:59 +08:00 |
|
钱涛
|
03ba0418ab
|
福利核算精度异常
|
2022-07-05 15:04:00 +08:00 |
|
钱涛
|
47113434ad
|
薪酬报表
|
2022-07-04 19:21:44 +08:00 |
|
钱涛
|
4fe3a61d5d
|
修复核算工号不显示的问题
|
2022-07-04 18:58:49 +08:00 |
|
钱涛
|
c2c4149442
|
报表接口
|
2022-07-04 15:34:04 +08:00 |
|
钱涛
|
3f086e154d
|
sql执行
|
2022-07-04 13:44:17 +08:00 |
|
钱涛
|
c372fff59c
|
系统异常处理
|
2022-07-01 15:18:29 +08:00 |
|
钱涛
|
6262aeeb01
|
1、合并计税处理
2、考勤引用不生成空记录
|
2022-06-30 16:15:19 +08:00 |
|
钱涛
|
7f7cdaf4a8
|
修复考勤引用删除适配问题
|
2022-06-30 14:21:29 +08:00 |
|
钱涛
|
317c04a121
|
公式编辑器，防止参数名和字段名呈现一对多的问题
|
2022-06-30 11:10:46 +08:00 |
|
钱涛
|
7b468045c8
|
1、限制核算的人员范围
2、薪资工资单的导出功能
3、修复工资单批量发放和撤回的问题
4、核算时取各个扣缴义务人的数据
|
2022-06-29 17:38:00 +08:00 |
|
钱涛
|
3e300e62eb
|
修复福利台账补缴功能异常
|
2022-06-29 14:13:23 +08:00 |
|
钱涛
|
f34eaa7c6f
|
修复福利台账总览数据
|
2022-06-28 18:21:44 +08:00 |
|
钱涛
|
4be0d70c4d
|
fix
|
2022-06-28 16:46:42 +08:00 |
|
钱涛
|
63ce165a74
|
修复sql的XSS
|
2022-06-28 16:08:20 +08:00 |
|
钱涛
|
b64f34a14c
|
福利核算时只核算当前扣缴义务人的
|
2022-06-28 11:26:01 +08:00 |
|
钱涛
|
43175f6e40
|
处理福利带名字查询失败
|
2022-06-28 10:35:30 +08:00 |
|
钱涛
|
12fe1405ba
|
修复工资单导出
|
2022-06-27 18:34:41 +08:00 |
|
钱涛
|
75c84566b6
|
考勤导出自定义字段
|
2022-06-27 16:01:33 +08:00 |
|
钱涛
|
bcc44fe65e
|
fix
|
2022-06-27 14:45:23 +08:00 |
|
钱涛
|
e7dc9e1a57
|
限制个税扣缴名字个备注字符数量
|
2022-06-27 13:17:15 +08:00 |
|
钱涛
|
7f3cc0a82a
|
fix
|
2022-06-27 10:58:16 +08:00 |
|
钱涛
|
abdd87a005
|
fix
|
2022-06-24 18:05:08 +08:00 |
|
钱涛
|
3682ebd4f2
|
fix
|
2022-06-24 15:18:00 +08:00 |
|
钱涛
|
f680aa27d9
|
fix
|
2022-06-23 18:05:48 +08:00 |
|
钱涛
|
31a8b4bff9
|
fix
|
2022-06-23 17:15:39 +08:00 |
|
钱涛
|
b357bd18a6
|
fix
|
2022-06-23 14:08:55 +08:00 |
|
钱涛
|
e1a075cab3
|
fix
|
2022-06-22 19:26:05 +08:00 |
|
钱涛
|
15fbf8ac91
|
fix
|
2022-06-22 13:45:26 +08:00 |
|
钱涛
|
a577645329
|
fix
|
2022-06-22 10:58:18 +08:00 |
|
钱涛
|
fc35eff75d
|
fix
|
2022-06-21 22:37:22 +08:00 |
|
钱涛
|
e1629a021e
|
oracle错误和薪资项目错误
|
2022-06-21 15:08:23 +08:00 |
|
钱涛
|
ff88b1f9ca
|
员工字段不可重复
|
2022-06-21 11:38:55 +08:00 |
|
钱涛
|
3363120c44
|
修复核算分权的问题
|
2022-06-20 19:39:01 +08:00 |
|
钱涛
|
5cea57d477
|
fix bug
|
2022-06-17 17:22:48 +08:00 |
MustangDeng
|
c701314f15
|
fix bug 福利方案删除多余的编辑
|
2022-06-16 22:09:50 +08:00 |
|
MustangDeng
|
e49f68b842
|
fix bug 45
|
2022-06-16 21:04:06 +08:00 |
|
钱涛
|
dfe8fdf57c
|
fixbug
|
2022-06-16 19:06:45 +08:00 |
|
钱涛
|
035503f26c
|
fixbug
|
2022-06-16 17:55:26 +08:00 |
|
钱涛
|
5396d7bee3
|
加解密
|
2022-06-16 14:22:01 +08:00 |
|
钱涛
|
3e93a85873
|
Merge branch 'feature/authitem' into release
|
2022-06-16 14:21:38 +08:00 |
|
钱涛
|
b5871e1ea9
|
权限项
|
2022-06-16 14:13:22 +08:00 |
|
MustangDeng
|
f51a4e4fd7
|
加解密
|
2022-06-16 11:30:28 +08:00 |
|
MustangDeng
|
9042a9bbed
|
加解密
|
2022-06-16 11:01:03 +08:00 |
|
MustangDeng
|
bd99d3ccf8
|
加解密问题
|
2022-06-16 10:31:11 +08:00 |
|
MustangDeng
|
fc3cbe8111
|
Merge remote-tracking branch 'origin/release' into release
|
2022-06-16 10:24:58 +08:00 |
|
MustangDeng
|
2badaab552
|
加解密问题
|
2022-06-16 10:24:43 +08:00 |
|
钱涛
|
17dbef3ef2
|
sql
|
2022-06-15 17:53:12 +08:00 |
|
MustangDeng
|
3c13b90a4d
|
Merge remote-tracking branch 'origin/release' into release
|
2022-06-15 17:04:03 +08:00 |
|
MustangDeng
|
62054871ce
|
发送工资单
|
2022-06-15 17:03:48 +08:00 |
|
钱涛
|
2731e4eddd
|
sql
|
2022-06-15 16:31:40 +08:00 |
|
钱涛
|
455ff23134
|
申报表导出修改
|
2022-06-15 16:02:34 +08:00 |
|
钱涛
|
f5b8806eff
|
账套
|
2022-06-15 15:27:23 +08:00 |
|
钱涛
|
b42586600a
|
fix申报表
|
2022-06-15 12:03:17 +08:00 |
|
钱涛
|
baa06f4011
|
Merge remote-tracking branch 'origin/release' into release
|
2022-06-15 11:02:55 +08:00 |
|
钱涛
|
cfe2d3c1dc
|
fix申报表
|
2022-06-15 11:02:44 +08:00 |
|
MustangDeng
|
0e0cc9f97b
|
福利档案列表
|
2022-06-15 11:01:09 +08:00 |
|
钱涛
|
fda668ba90
|
Merge remote-tracking branch 'origin/release' into release
|
2022-06-15 10:24:54 +08:00 |
|
钱涛
|
7955d67da6
|
fix申报表
|
2022-06-15 10:24:46 +08:00 |
|
MustangDeng
|
d5228ff1bf
|
福利档案列表
|
2022-06-15 10:23:39 +08:00 |
|
钱涛
|
8d6a3c41d7
|
fix人员同步
|
2022-06-15 09:29:43 +08:00 |
|
钱涛
|
5634377e47
|
Merge remote-tracking branch 'origin/release' into release
|
2022-06-14 16:05:58 +08:00 |
|
钱涛
|
0e8c916262
|
保存
|
2022-06-14 16:05:47 +08:00 |
|
MustangDeng
|
8846346dda
|
台账核算回滚数据
|
2022-06-14 16:05:23 +08:00 |
|
钱涛
|
811a90f50d
|
账套项目的顺序性
|
2022-06-14 11:13:31 +08:00 |
|
钱涛
|
bf7d8dd634
|
导入时人员唯一校验
|
2022-06-13 17:05:36 +08:00 |
|
钱涛
|
b78e96c875
|
考勤列表适配sqlserver
|
2022-06-13 15:37:52 +08:00 |
|
钱涛
|
081747b334
|
考勤引用修复
|
2022-06-13 10:52:32 +08:00 |
|
钱涛
|
1aee6f7ef0
|
往期累计
|
2022-06-10 18:16:11 +08:00 |
|
钱涛
|
99e7c1eaef
|
Merge remote-tracking branch 'origin/release' into release
|
2022-06-10 18:07:36 +08:00 |
|
钱涛
|
33914eae1d
|
解密
|
2022-06-10 18:07:25 +08:00 |
|
MustangDeng
|
3bedc88f44
|
福利加解密
|
2022-06-10 18:01:55 +08:00 |
|
MustangDeng
|
fcb55bc269
|
fix 冲突
|
2022-06-10 17:15:19 +08:00 |
|
钱涛
|
df7e3febc3
|
冲突
|
2022-06-10 17:03:25 +08:00 |
|
钱涛
|
e6c6b8eb57
|
Merge branch 'auth-fl' into release
# Conflicts:
# resource/sql/分权.sql
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/mapper/taxagent/TaxAgentMapper.xml
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SIExportServiceImpl.java
|
2022-06-10 16:58:45 +08:00 |
|
钱涛
|
6ddf483767
|
加解密
|
2022-06-10 16:43:38 +08:00 |
|
MustangDeng
|
9315882742
|
福利档案列表log
|
2022-06-10 16:35:01 +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 |
|
MustangDeng
|
ca1c20329c
|
fix 福利档案导入bug
|
2022-06-10 15:12:56 +08:00 |
|
钱涛
|
f1fac5ae90
|
Merge branch 'feature/申报表' into release
# Conflicts:
# resource/sql/申报表.sql
|
2022-06-10 14:40:14 +08:00 |
|
钱涛
|
d09856c390
|
人员范围保存校验
|
2022-06-10 14:21:21 +08:00 |
|
钱涛
|
ec3838a292
|
申报表
|
2022-06-10 13:33:48 +08:00 |
|
MustangDeng
|
e1440e9203
|
台账归档删除
|
2022-06-10 11:46:57 +08:00 |
|
MustangDeng
|
3d43cc3f56
|
归档删除
|
2022-06-10 10:56:09 +08:00 |
|
钱涛
|
382620c589
|
申报表
|
2022-06-09 19:02:18 +08:00 |
|
MustangDeng
|
85f0b1164c
|
福利台账分权
|
2022-06-09 18:31:36 +08:00 |
|
钱涛
|
b8972bcd43
|
分权v3
|
2022-06-09 17:45:28 +08:00 |
|
MustangDeng
|
2d2c993f2a
|
累计附加扣除详情列表没有解密 fix
|
2022-06-09 15:22:49 +08:00 |
|
MustangDeng
|
2fe1613868
|
台账核算
|
2022-06-09 15:16:33 +08:00 |
|
钱涛
|
7f8d317846
|
冲突
|
2022-06-08 18:53:30 +08:00 |
|
钱涛
|
b832910af9
|
Merge branch 'develop' into release
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
|
2022-06-08 18:48:23 +08:00 |
|
钱涛
|
61346f139b
|
申报和往期异常
|
2022-06-08 17:59:30 +08:00 |