 钱涛
|
4e46d632e4
|
Merge branch 'feature/艾志-正常申报补足年终奖人员' into custom/艾志工业-个税申报
|
2023-12-28 21:00:15 +08:00 |
|
钱涛
|
7c50e38867
|
脚本
|
2023-12-28 19:19:09 +08:00 |
Harryxzy
|
0fc316f0bc
|
艾志sql
|
2023-12-28 18:38:58 +08:00 |
|
钱涛
|
4d84164d48
|
Merge branch 'feature/个税2312版本功能' into feature/艾志-正常申报补足年终奖人员
|
2023-12-28 15:49:50 +08:00 |
|
钱涛
|
4a2996e211
|
Merge branch 'release/2.9.10.2312.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
# src/com/engine/salary/util/excel/ExcelUtil.java
|
2023-12-28 15:48:54 +08:00 |
|
钱涛
|
2befcfd1f2
|
pg脚本问题
|
2023-12-28 11:08:53 +08:00 |
|
钱涛
|
1c499ffd94
|
补充正常工资薪金的申报
|
2023-12-28 09:39:09 +08:00 |
|
钱涛
|
13f310e9e4
|
记录申报表数据来源
|
2023-12-27 17:33:53 +08:00 |
|
Harryxzy
|
d1f05fa55c
|
艾志sql
|
2023-12-22 13:59:59 +08:00 |
|
Harryxzy
|
81ba840385
|
艾志 -3、薪资档案新增“首次薪资发放日期”、“末次薪资发放日期” 支持前端修改，个税申报中，“任职受雇从业日期”，“离职日期”取薪资档案中日期；
|
2023-12-22 10:45:31 +08:00 |
|
钱涛
|
9a5a0f4c00
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
|
2023-12-18 15:25:05 +08:00 |
|
钱涛
|
0856f63ca5
|
Merge branch 'release/2.9.10.2312.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/util/page/SalaryPageUtil.java
|
2023-12-14 10:41:37 +08:00 |
|
钱涛
|
bbe4b315cf
|
pg脚本异常
|
2023-12-08 11:43:19 +08:00 |
|
Harryxzy
|
ac57d4f7b7
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/service/SIArchivesService.java
# src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
# src/com/engine/salary/web/SIArchivesController.java
|
2023-11-30 11:03:45 +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 |
|
钱涛
|
addd937b7b
|
Merge branch 'feature/支持工资单短信' into release/2.9.8.2311.02
|
2023-11-22 10:40:30 +08:00 |
sy
|
30e6bed471
|
Merge remote-tracking branch 'remotes/origin/feature/231001-福利档案基数调整记录' into release/2.9.8.2311.02
|
2023-11-22 09:38:16 +08:00 |
|
钱涛
|
118e95465d
|
短信模板脚本
|
2023-11-21 16:17:47 +08:00 |
|
钱涛
|
526c8f8514
|
Merge branch 'release/3.0.0.2311.01' into release/个税版本
|
2023-11-10 15:29:39 +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 |
|
钱涛
|
e677207eac
|
新增统计维度展示
|
2023-11-08 15:59:54 +08:00 |
|
钱涛
|
27255932de
|
数据库表
|
2023-11-07 15:12:10 +08:00 |
|
Harryxzy
|
d42e9960dc
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
|
2023-11-02 16:57:27 +08:00 |
|
钱涛
|
321a565c35
|
fix个税sql错误
|
2023-10-26 14:40:56 +08:00 |
|
sy
|
5b2609d93f
|
薪酬系统-福利档案，福利档案基数调整记录表新建sql脚本
|
2023-10-25 09:49:16 +08:00 |
|
Harryxzy
|
89715c8072
|
Merge branch 'release/2.9.6.2310.01' into custom/艾志工业-个税申报
|
2023-10-17 17:16:58 +08:00 |
|
钱涛
|
e8f124d58c
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
|
2023-10-17 10:25:02 +08:00 |
|
Harryxzy
|
3c08916c84
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
|
2023-10-16 11:38:43 +08:00 |
|
钱涛
|
b4a1aa8039
|
修改系统公式异常
|
2023-10-16 10:52:28 +08:00 |
|
钱涛
|
5d3e2928c9
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
|
2023-10-13 16:54:46 +08:00 |
|
钱涛
|
855effccc5
|
修改系统公式异常
|
2023-10-13 16:54:33 +08:00 |
|
钱涛
|
053e2855d7
|
个税sql
|
2023-10-13 16:33:06 +08:00 |
|
钱涛
|
4a59859fa8
|
调薪记录
|
2023-10-12 17:34:09 +08:00 |
|
Harryxzy
|
8e8a502738
|
prop
|
2023-10-12 14:26:28 +08:00 |
|
Harryxzy
|
575fb5ea10
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
|
2023-10-11 16:53:44 +08:00 |
|
sy
|
79d28f751c
|
薪酬系统-福利方案、档案、台账，艾志二开-其他福利相关表述更换为劳务固定费
|
2023-10-10 13:46:06 +08:00 |
|
钱涛
|
59f24d3a14
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
|
2023-10-09 16:15:21 +08:00 |
|
钱涛
|
e570c1879e
|
账套保存异常
|
2023-10-09 15:35:20 +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 |
|
钱涛
|
d98933832a
|
Merge branch 'feature/生成签名pdf' into release/2.9.6.2310.01
# Conflicts:
# src/com/engine/salary/web/SalaryBillController.java
|
2023-10-07 15:19:38 +08:00 |
|
钱涛
|
89d38005cd
|
Merge branch 'release/2.9.5.2309.01' into custom/艾志工业-个税申报
# Conflicts:
# resource/WEB-INF/prop/hrmSalaryCustom.properties
|
2023-09-22 17:59:27 +08:00 |
|
钱涛
|
5602d65ed8
|
Merge branch 'release/2.9.5.2309.01' into release/个税版本
# Conflicts:
# resource/WEB-INF/prop/hrmSalaryCustom.properties
|
2023-09-22 17:59:06 +08:00 |
|
钱涛
|
7c5af2166e
|
日期格式自定义配置
|
2023-09-22 17:57:47 +08:00 |
|
钱涛
|
0545c6eb8c
|
Merge branch 'release/2.9.5.2309.01' into release/个税版本
|
2023-09-21 16:58:15 +08:00 |
|
Harryxzy
|
cdefb1d310
|
Merge branch 'feature/230902_报表共享' into release/2.9.5.2309.01
|
2023-09-21 11:45:34 +08:00 |
|
Harryxzy
|
97b451e203
|
sql
|
2023-09-21 10:05:32 +08:00 |
|
钱涛
|
b0a25f6cf0
|
删除与组织冲突sql
|
2023-09-19 11:37:37 +08:00 |
|
钱涛
|
12480f8306
|
生成工资单pdf签名
|
2023-09-18 18:45:59 +08:00 |
|
钱涛
|
464bb9d623
|
Merge branch 'release/个税二期' into release/个税版本
|
2023-09-06 17:06:07 +08:00 |
|
钱涛
|
d49b33c66f
|
Merge branch 'release/个税一期' into release/个税版本
|
2023-09-06 11:40:34 +08:00 |