 钱涛
|
873b90474f
|
Merge branch 'feature/230701qt' into feature/外部人员
|
2023-07-13 16:55:36 +08:00 |
|
钱涛
|
d5977c053b
|
添加删除脚本
|
2023-07-13 09:19:16 +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
|
287fcae68e
|
工资单定时发送sql
|
2023-07-11 10:22:14 +08:00 |
sy
|
a429c271f4
|
Merge branch 'feature/230602-数据库适配-PG' into release/2.8.4.2306.02
|
2023-06-29 15:12:48 +08:00 |
|
钱涛
|
b130fb0121
|
海康包冲突jar
|
2023-06-28 18:11:53 +08:00 |
|
sy
|
cdf4421ac2
|
薪酬系统-pg数据库适配，初始化sql脚本
|
2023-06-28 15:56:30 +08:00 |
|
钱涛
|
abd8431d49
|
水印上线脚本
|
2023-06-26 16:22:19 +08:00 |
|
钱涛
|
f5ce086535
|
上线脚本
|
2023-06-26 15:48:25 +08:00 |
|
钱涛
|
1cdbe4d19d
|
薪酬开关配置
|
2023-06-14 16:26:25 +08:00 |
|
钱涛
|
34046646b3
|
还原脚本
|
2023-06-12 15:17:21 +08:00 |
|
钱涛
|
7b0648cc68
|
拦截工资单demo
|
2023-06-08 10:40:00 +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 |
|
钱涛
|
aa8f46e84f
|
删除sql，修改签名
|
2023-05-05 14:08:37 +08:00 |
|
钱涛
|
3e8ac01049
|
公式描述
|
2023-05-04 18:07:35 +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 |
|
钱涛
|
14fca43e18
|
暂存
|
2023-04-26 15:17:08 +08:00 |
|
钱涛
|
5cb6752c4c
|
Merge branch 'release/2.7.3.2304.01' into feature/外部人员
|
2023-04-13 17:32:17 +08:00 |
|
钱涛
|
a87c344581
|
个人养老金
|
2023-04-13 17:14:58 +08:00 |
|
钱涛
|
9549e75e00
|
Merge branch 'release/2.7.3.2304.01' into feature/外部人员
|
2023-04-13 14:48:43 +08:00 |
|
钱涛
|
f0eb9c8994
|
养老金最终版
|
2023-04-12 13:57:13 +08:00 |
|
钱涛
|
671bbc6bfb
|
养老金最终版
|
2023-04-12 10:51:52 +08:00 |
|
钱涛
|
58dbdb0d05
|
养老金
|
2023-04-12 09:39:53 +08:00 |
|
钱涛
|
a4a829d201
|
年终奖数据
|
2023-04-11 17:24:31 +08:00 |
|
钱涛
|
09b2bf54e1
|
暂存
|
2023-04-11 09:22:09 +08:00 |
|
钱涛
|
b30a58c1d9
|
报表功能
|
2023-04-07 14:38:38 +08:00 |
|
钱涛
|
487dd9f972
|
非系统人员档案自动化
|
2023-03-08 16:36:47 +08:00 |
|
钱涛
|
79a29df0de
|
暂存
|
2023-03-03 14:40:17 +08:00 |
|
钱涛
|
6de22b142d
|
1、工资单模板
2、一键累计
|
2023-03-02 17:11:42 +08:00 |
|
钱涛
|
a8fc666e79
|
fix json转换问题
|
2023-03-02 10:12:00 +08:00 |
|
钱涛
|
c7d1bbfa35
|
更新名称
|
2023-02-17 17:19:17 +08:00 |
|
钱涛
|
258c880543
|
申报表字段缺失
|
2023-02-03 15:14:04 +08:00 |
|
钱涛
|
31a075cee5
|
删除配置
|
2023-01-06 14:40:23 +08:00 |
|
钱涛
|
c71b73799a
|
取消插件
|
2022-12-14 15:02:22 +08:00 |
|
钱涛
|
389022e0ea
|
配置文件
|
2022-12-09 10:12:25 +08:00 |
|
Harryxzy
|
1fb96be58b
|
个税申报开关
|
2022-11-08 11:22:56 +08:00 |
|
钱涛
|
d72362f7b7
|
档案模板注释
|
2022-10-26 18:05:04 +08:00 |
|
钱涛
|
a2716c4330
|
处理档案重复生成的问题
|
2022-10-19 13:36:31 +08:00 |
|
钱涛
|
4b37775f78
|
档案发薪设置
|
2022-10-18 09:43:58 +08:00 |
|
钱涛
|
919d08a496
|
修复工资单查询
|
2022-09-29 10:28:46 +08:00 |
|
钱涛
|
299bbf1f66
|
达梦适配
|
2022-09-05 15:50:01 +08:00 |
|
钱涛
|
0629b7323a
|
升级分页插件版本和jsqlparse版本
|
2022-09-02 17:30:39 +08:00 |
|
钱涛
|
e0a031e197
|
oracle异常
|
2022-08-18 15:02:04 +08:00 |
|
钱涛
|
ab87e5cf08
|
劳务申报表列表
|
2022-08-02 10:59:12 +08:00 |
|
钱涛
|
a252d055ab
|
1、核算接口代理
2、获取异常真实信息
|
2022-08-01 14:15:09 +08:00 |
|
钱涛
|
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 |
|
钱涛
|
cea24499f7
|
sql
|
2022-06-13 09:23:48 +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 |
|
钱涛
|
e6da6a3ff1
|
fix
|
2022-06-01 15:52:37 +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
|
6ee93fdeea
|
默认不开启非标
|
2022-05-30 17:35:40 +08:00 |
|
MustangDeng
|
e0e19d616e
|
oracle脚本调整位置
|
2022-05-30 17:34:53 +08:00 |
|
钱涛
|
bccda4c7a3
|
sql
|
2022-05-30 14:46:52 +08:00 |
|
钱涛
|
843db8db35
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-30 13:47:38 +08:00 |
|
钱涛
|
2c1d1a31dc
|
sql
|
2022-05-30 13:47:31 +08:00 |
|
MustangDeng
|
597e2206e9
|
like 修改
|
2022-05-30 13:43:28 +08:00 |
|
MustangDeng
|
5fe3b59ad5
|
oracle sql修改
|
2022-05-30 12:10:07 +08:00 |
|
MustangDeng
|
b80f31c6f8
|
oracle sql修改
|
2022-05-30 12:08:14 +08:00 |
|
MustangDeng
|
1ccb2b94b2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-30 11:53:01 +08:00 |
|
MustangDeng
|
bc590ef10d
|
oracle sql修改
|
2022-05-30 11:52:46 +08:00 |
|
钱涛
|
4baa1643f6
|
oracle适配
|
2022-05-30 11:51:00 +08:00 |