 钱涛
|
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 |
|
MustangDeng
|
1f7de7bc90
|
fix bug
|
2022-06-08 17:55:14 +08:00 |
|
MustangDeng
|
69edbc63d1
|
福利台账
|
2022-06-08 17:52:10 +08:00 |
|
钱涛
|
860c89b560
|
申报和往期异常
|
2022-06-08 16:36:50 +08:00 |
|
钱涛
|
d765ede418
|
默认关闭
|
2022-06-07 19:22:46 +08:00 |
|
钱涛
|
79632dd1bf
|
申报表分权
|
2022-06-07 19:10:40 +08:00 |
|
MustangDeng
|
28b49f9987
|
fix bug
|
2022-06-07 17:35:39 +08:00 |
|
钱涛
|
cedc9f2644
|
考勤和申报表的分权
|
2022-06-07 15:43:22 +08:00 |
|
MustangDeng
|
20e04f503e
|
sql server 分权脚本修改
|
2022-06-07 15:19:21 +08:00 |
|
MustangDeng
|
83c7ea3f5c
|
sql server 自增问题
|
2022-06-07 14:24:14 +08:00 |
|
MustangDeng
|
71da39d4d3
|
Merge branch 'release' into auth-fl
|
2022-06-07 13:26:40 +08:00 |
|
钱涛
|
38557e2e03
|
去除自增
|
2022-06-07 13:24:20 +08:00 |
|
MustangDeng
|
f22ac96b12
|
累计附加扣除加解密问题
|
2022-06-07 09:48:51 +08:00 |
|
MustangDeng
|
bfcb9a78f8
|
bug修改
|
2022-06-06 21:21:10 +08:00 |
|
MustangDeng
|
958ffc5aa0
|
福利台账解密问题
|
2022-06-06 20:05:37 +08:00 |
|
MustangDeng
|
a68de7d088
|
Merge branch 'develop' into feature/encrypt
|
2022-06-06 19:25:36 +08:00 |
|
钱涛
|
b20a6e4cbf
|
去重
|
2022-06-06 19:24:49 +08:00 |
|
MustangDeng
|
e306b6754d
|
福利台账解密问题
|
2022-06-06 19:08:51 +08:00 |
|
钱涛
|
eacb04388f
|
社保福利分权2.0
|
2022-06-06 19:08:39 +08:00 |
|
MustangDeng
|
d36fb221cc
|
福利档案列表
|
2022-06-06 18:17:34 +08:00 |
|
钱涛
|
dc27578ddf
|
社保福利分权1.0
|
2022-06-06 16:55:02 +08:00 |
|
MustangDeng
|
d3c82acac1
|
发送撤回工资单
|
2022-06-06 13:56:47 +08:00 |
|
MustangDeng
|
3a1ac7ca93
|
工资单部分分页调整
|
2022-06-06 11:43:46 +08:00 |
|
MustangDeng
|
d0869e5daa
|
工资单部分分页调整
|
2022-06-06 11:40:24 +08:00 |
|
MustangDeng
|
6db127d926
|
Merge branch 'develop' into feature/encrypt
|
2022-06-06 11:31:21 +08:00 |
|
MustangDeng
|
ddc4edd918
|
档案高级搜索
|
2022-06-06 11:28:18 +08:00 |
|
MustangDeng
|
24187b95bf
|
档案高级搜索
|
2022-06-06 11:24:16 +08:00 |
|
钱涛
|
88a0d08b1f
|
Merge branch 'auth-2' into release
# Conflicts:
# src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
|
2022-06-06 10:37:07 +08:00 |
|
钱涛
|
0ed51f8cf9
|
处理合并dev冲突
|
2022-06-06 10:26:31 +08:00 |
|
钱涛
|
2bfd6c90a0
|
Merge branch 'develop' into release
# Conflicts:
# src/com/engine/salary/service/impl/SISchemeServiceImpl.java
|
2022-06-06 10:23:19 +08:00 |
|
钱涛
|
3f0bbd3160
|
剔除主账号
|
2022-06-06 10:19:11 +08:00 |
|
钱涛
|
6646a2e481
|
申报表的分权
|
2022-06-02 18:02:27 +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 |