 钱涛
|
bb751c0df3
|
Merge branch 'release/个税版本' into custom/艾志工业
# Conflicts:
# src/com/engine/salary/entity/datacollection/AddUpSituation.java
|
2024-05-21 13:28:13 +08:00 |
|
钱涛
|
79cfa0cbc0
|
删除往期累计多余项目
往期累计别名设置
|
2024-05-21 10:50:17 +08:00 |
|
钱涛
|
b136c71814
|
Merge branch 'release/个税版本' into custom/艾志工业
|
2024-05-08 13:48:03 +08:00 |
|
钱涛
|
591555fa8a
|
更新sql
|
2024-04-23 17:47:02 +08:00 |
|
钱涛
|
1c2f0f516a
|
删除重复sql
|
2024-04-23 11:39:41 +08:00 |
|
钱涛
|
8f76daf0d1
|
Merge branch 'feature/外籍人员' into release/个税版本
|
2024-04-23 11:15:37 +08:00 |
|
钱涛
|
b8fb4457e6
|
Merge branch 'feature/外籍人员' into custom/艾志工业-0412
# Conflicts:
# src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
|
2024-04-12 17:58:05 +08:00 |
|
钱涛
|
12d832c693
|
Merge branch 'release/2.12.1.2403.02' into custom/艾志工业
|
2024-04-12 17:53:40 +08:00 |
|
钱涛
|
0e6449e1e2
|
外籍人员
|
2024-04-12 17:46:53 +08:00 |
Harryxzy
|
a9dd2c2cb3
|
Merge branch 'release/2.12.1.2403.02' into release/个税版本
|
2024-04-08 15:53:13 +08:00 |
|
Harryxzy
|
422cc687e9
|
Merge branch 'release/个税版本' into custom/艾志工业
# Conflicts:
# src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
# src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.java
# src/com/engine/salary/service/SalaryArchiveService.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
|
2024-04-02 13:52:46 +08:00 |
|
Harryxzy
|
4ccfac80f5
|
sql
|
2024-04-01 16:33:13 +08:00 |
|
钱涛
|
2a692b13b4
|
外籍人员v1
|
2024-03-29 10:44:55 +08:00 |
|
钱涛
|
3a79ed9574
|
Merge branch 'release/2.11.2.2403.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
|
2024-03-15 15:44:15 +08:00 |
|
Harryxzy
|
c3800881bc
|
sql
|
2024-03-15 09:31:04 +08:00 |
|
Harryxzy
|
878735cbc8
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报-0308bak
# Conflicts:
# src/com/engine/salary/entity/datacollection/AddUpSituation.java
# src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRefresh.java
# src/com/engine/salary/service/SIArchivesService.java
# src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
# src/com/engine/salary/service/impl/SISchemeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/wrapper/SalaryFormulaWrapper.java
|
2024-03-08 09:59:40 +08:00 |
|
钱涛
|
72861b9a93
|
Merge branch 'release/3.0.0.2403.01' into release/个税版本
|
2024-03-07 16:57:03 +08:00 |
|
钱涛
|
e81937c4dd
|
去除报表原先的表
|
2024-03-07 11:45:26 +08:00 |
|
钱涛
|
5a9d45f92b
|
Merge branch 'release/2.11.1.2402.01' into release/个税版本
# Conflicts:
# resource/WEB-INF/prop/hrmSalaryCustom.properties
# src/com/engine/salary/entity/datacollection/AddUpSituation.java
# src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java
# src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
# src/com/engine/salary/formlua/entity/parameter/ExcelFuncs.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
# src/com/engine/salary/util/page/SalaryPageUtil.java
|
2024-03-06 15:54:07 +08:00 |
|
钱涛
|
1c62be09d1
|
Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01
|
2024-03-05 13:58:50 +08:00 |
|
钱涛
|
022b904581
|
添加账套筛选条件sql
|
2024-02-28 14:54:13 +08:00 |
|
Harryxzy
|
bec6443dcf
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
# src/com/engine/salary/service/impl/SIImportServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/web/SIArchivesController.java
|
2024-02-22 14:57:39 +08:00 |
|
钱涛
|
53806d9262
|
Merge branch 'release/2.10.1.2401.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/util/excel/ExcelUtil.java
|
2024-02-21 15:28:33 +08:00 |
|
Harryxzy
|
117dbeb211
|
Merge branch 'fix/240101_考勤引用查看数据报错' into feature/操作日志组件
|
2024-02-20 10:10:22 +08:00 |
|
Harryxzy
|
b4f36ab101
|
Merge branch 'feature/240102_工资单确认和反馈按钮分开' into release/2.10.1.2401.01
|
2024-02-20 09:51:00 +08:00 |
|
Harryxzy
|
c64e9b4b76
|
工资单确认反馈sql
|
2024-02-19 14:01:30 +08:00 |
|
钱涛
|
9824a70cce
|
修复脚本错误
|
2024-02-18 09:50:32 +08:00 |
sy
|
f4ecb19ef2
|
Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件
|
2024-02-01 10:21:47 +08:00 |
|
Harryxzy
|
acbffb205b
|
sql
|
2024-01-30 16:00:50 +08:00 |
|
钱涛
|
e1ca39e859
|
elog脚本
|
2024-01-23 15:00:46 +08:00 |
|
钱涛
|
858ac8f005
|
申报表对比功能sql
|
2024-01-18 11:44:57 +08:00 |
|
钱涛
|
4846cfcf18
|
Merge branch 'release/2.9.10.2312.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
|
2024-01-17 14:14:32 +08:00 |
|
sy
|
be68f01145
|
薪酬系统-福利档案，mysql环境中sql脚本优化
|
2024-01-15 09:45:19 +08:00 |
|
Harryxzy
|
5f7c1c641b
|
Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02
|
2024-01-08 15:33:11 +08:00 |
|
Harryxzy
|
c0c93490fe
|
sql
|
2024-01-08 15:32:49 +08:00 |
|
sy
|
a16ed64ac0
|
Merge remote-tracking branch 'remotes/origin/feature/231201-福利档案拆分个人和公司福利基数' into release/2.9.10.2312.02
|
2024-01-08 13:54:25 +08:00 |
|
钱涛
|
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 |
|
sy
|
e97dab27fc
|
薪酬系统-福利档案，拆分个人和公司福利基数逻辑相关sql脚本
|
2023-12-13 10:51:24 +08:00 |
|
钱涛
|
bbe4b315cf
|
pg脚本异常
|
2023-12-08 11:43:19 +08:00 |