 钱涛
|
259c40758f
|
1、薪资项目增加系统名
2、薪资项目增加申报项目名
3、账套对应字段
|
2022-07-27 16:56:13 +08:00 |
|
钱涛
|
db31190b9e
|
调整sql配置
|
2022-07-25 15:01:10 +08:00 |
|
钱涛
|
8e69159900
|
薪资档案代码合并
|
2022-07-21 10:51:38 +08:00 |
|
钱涛
|
77ca4c2848
|
Merge branch 'develop' into feature/personIn2taxAgent
# Conflicts:
# src/com/engine/salary/service/SalaryArchiveService.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
|
2022-07-21 09:43:02 +08:00 |
|
钱涛
|
967413827e
|
修改社保个人实际承担方为个人
|
2022-07-20 14:25:01 +08:00 |
|
钱涛
|
a721898d3d
|
薪资档案增加起始发薪和最后发薪
|
2022-07-18 18:08:59 +08:00 |
|
钱涛
|
01bd6fefd4
|
支持人员可在多个扣缴单位
|
2022-07-14 10:36:51 +08:00 |
|
钱涛
|
48d70400e5
|
薪资档案验证人员是否在义务扣缴人下
|
2022-07-05 19:19:17 +08:00 |
|
钱涛
|
317c04a121
|
公式编辑器，防止参数名和字段名呈现一对多的问题
|
2022-06-30 11:10:46 +08:00 |
|
钱涛
|
739414dd04
|
fix
|
2022-06-24 18:41:24 +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 |
|
钱涛
|
e1629a021e
|
oracle错误和薪资项目错误
|
2022-06-21 15:08:23 +08:00 |
|
钱涛
|
ff88b1f9ca
|
员工字段不可重复
|
2022-06-21 11:38:55 +08:00 |
|
钱涛
|
3f8ab52b8c
|
分权
|
2022-06-20 15:17:08 +08:00 |
|
钱涛
|
3ab0440078
|
分权
|
2022-06-20 14:09:18 +08:00 |
|
钱涛
|
b5871e1ea9
|
权限项
|
2022-06-16 14:13:22 +08:00 |
|
钱涛
|
2731e4eddd
|
sql
|
2022-06-15 16:31:40 +08:00 |
|
钱涛
|
f5b8806eff
|
账套
|
2022-06-15 15:27:23 +08:00 |
|
钱涛
|
8d6a3c41d7
|
fix人员同步
|
2022-06-15 09:29:43 +08:00 |
|
钱涛
|
926bfbce16
|
sql
|
2022-06-14 17:39:23 +08:00 |
|
钱涛
|
24e6792818
|
sql
|
2022-06-10 18:59:06 +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 |
|
钱涛
|
d09856c390
|
人员范围保存校验
|
2022-06-10 14:21:21 +08:00 |
|
钱涛
|
382620c589
|
申报表
|
2022-06-09 19:02:18 +08:00 |
|
钱涛
|
860c89b560
|
申报和往期异常
|
2022-06-08 16:36:50 +08:00 |
|
钱涛
|
6c54847f88
|
默认关闭
|
2022-06-07 19:16:13 +08:00 |
|
钱涛
|
79632dd1bf
|
申报表分权
|
2022-06-07 19:10:40 +08:00 |
MustangDeng
|
20e04f503e
|
sql server 分权脚本修改
|
2022-06-07 15:19:21 +08:00 |
|
MustangDeng
|
38c08b6e79
|
sql server 分权sql
|
2022-06-07 13:26:00 +08:00 |
|
钱涛
|
eacb04388f
|
社保福利分权2.0
|
2022-06-06 19:08:39 +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 |
|
钱涛
|
364bf58bda
|
fix
|
2022-06-01 15:59:56 +08:00 |
|
钱涛
|
7633a06636
|
Merge branch 'develop' into release
|
2022-05-31 20:07:33 +08:00 |
|
钱涛
|
2c71590c98
|
暂存
|
2022-05-31 19:29:45 +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 |
|
钱涛
|
3471783d65
|
薪酬还原脚本
|
2022-05-31 13:53:57 +08:00 |
|
钱涛
|
45c3f91145
|
其他扣除
|
2022-05-31 11:43:45 +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 |
|
MustangDeng
|
e0e19d616e
|
oracle脚本调整位置
|
2022-05-30 17:34:53 +08:00 |
|
钱涛
|
f6eb69e62a
|
暂存
|
2022-05-26 11:02:55 +08:00 |
|
钱涛
|
cb1a53c649
|
暂存
|
2022-05-24 09:14:26 +08:00 |
|
钱涛
|
4f36f89e53
|
Merge branch 'develop' into auth
|
2022-05-20 14:56:25 +08:00 |
|
钱涛
|
d77e8b0de4
|
累计扣除字段
|
2022-05-20 14:41:42 +08:00 |
|
钱涛
|
dc1c865a4b
|
账套项目删除bug
|
2022-05-18 14:34:06 +08:00 |
|
钱涛
|
fa4d605c8d
|
暂存
|
2022-05-18 09:19:50 +08:00 |
|
钱涛
|
a4c285dfd4
|
异常
|
2022-05-16 17:03:17 +08:00 |
|
钱涛
|
282c0abc22
|
薪资项目不使用自增
|
2022-05-13 11:22:10 +08:00 |