sy
|
8b1b52a6f2
|
薪酬系统-多语言，适配部分中文表述、薪资项目中excel函数多语言
|
2023-08-09 16:20:32 +08:00 |
|
sy
|
88325889c1
|
薪酬系统-多语言，合并最新release230702改动，并处理冲突，适配中文表述
|
2023-07-28 15:22:26 +08:00 |
|
sy
|
438b86e2e1
|
Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into feature/salary_i18
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/biz/SICategoryBiz.java
# src/com/engine/salary/entity/salaryBill/param/SalaryBaseSetSaveParam.java
# src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java
# src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
# src/com/engine/salary/enums/salaryarchive/SalaryArchiveListTypeEnum.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java
# src/com/engine/salary/web/SalaryArchiveController.java
# src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
# src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
|
2023-07-28 11:13:09 +08:00 |
 钱涛
|
a643f43656
|
修复档案模板名称异常
|
2023-07-20 16:46:12 +08:00 |
|
钱涛
|
d068ce0744
|
修复档案模板名称异常
|
2023-07-20 16:43:50 +08:00 |
|
sy
|
c7fe4fee23
|
Merge branches 'feature/230701-社保福利-核算记录的校验' and 'feature/230701-薪资核算-导出功能可选择字段导出' into release/2.9.2.2307.02
|
2023-07-20 10:19:40 +08:00 |
|
钱涛
|
01b02531ce
|
Merge branch 'feature/外部人员' into release/2.9.2.2307.02
# Conflicts:
# src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/sys/service/SalarySysConfService.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
|
2023-07-20 10:08:05 +08:00 |
|
sy
|
4b503513f2
|
Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into feature/230701-薪资核算-导出功能可选择字段导出
|
2023-07-19 10:04:58 +08:00 |
Harryxzy
|
1ea80b8fe9
|
工资单反馈
|
2023-07-17 15:01:14 +08:00 |
|
sy
|
5c99dddd00
|
薪酬系统-多语言，合并最新release230701改动，并处理冲突
|
2023-07-14 10:42:24 +08:00 |
|
sy
|
70ff1295f0
|
Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into feature/salary_i18
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
|
2023-07-14 09:42:34 +08:00 |
|
sy
|
b007b1b351
|
薪酬系统-薪资核算，自定义导出字段
|
2023-07-13 14:43:54 +08:00 |
|
钱涛
|
888938f150
|
系统设置接口
|
2023-07-13 11:33:58 +08:00 |
|
sy
|
c78c8375f0
|
薪酬系统-薪资核算，自定义导出字段
|
2023-07-12 15:20:02 +08:00 |
|
钱涛
|
89ecf0984d
|
fix外部人员
|
2023-07-12 09:45:00 +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
|
33a0723ad2
|
Merge branch 'release/2.9.1.2307.01' into feature/230701-工资单反馈
|
2023-07-11 15:29:21 +08:00 |
|
Harryxzy
|
be895829c2
|
工资单反馈
|
2023-07-11 15:29:13 +08:00 |
|
sy
|
fd9a9aef72
|
Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01
|
2023-07-11 11:31:29 +08:00 |
|
sy
|
ad37ba9af0
|
薪酬系统-薪资档案，高级搜索中工号、分部筛选问题修复
|
2023-07-11 11:30:57 +08:00 |
|
sy
|
a55ca5182e
|
Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01
|
2023-07-11 09:59:29 +08:00 |
|
sy
|
e67530eb87
|
薪酬系统-福利档案，导出加高级搜索问题修复
|
2023-07-10 17:20:04 +08:00 |
|
sy
|
b705161492
|
薪酬系统-薪资核算、薪资档案、福利档案，高级搜索功能问题修复
|
2023-07-10 14:33:43 +08:00 |
|
Harryxzy
|
467746f7df
|
Merge branch 'release/2.9.1.2307.01' into feature/230701-工资单反馈
|
2023-07-10 11:12:03 +08:00 |
|
Harryxzy
|
584ebbc562
|
暂存
|
2023-07-10 11:11:52 +08:00 |
|
Harryxzy
|
0e2a6c8368
|
Merge branch 'feature/taxDeclarationWithdraw' into release/2.9.1.2307.01
# Conflicts:
# src/com/engine/salary/sys/constant/SalarySysConstant.java
# src/com/engine/salary/sys/entity/vo/AppSettingVO.java
# src/com/engine/salary/sys/service/SalarySysConfService.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/web/SalarySystemConfigController.java
# src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
|
2023-07-10 11:10:10 +08:00 |
|
Harryxzy
|
e90bd66489
|
Merge branch 'feature/230701-删除档案' into release/2.9.1.2307.01
|
2023-07-10 10:09:38 +08:00 |
|
sy
|
b92c7ff599
|
薪酬系统-薪资核算、薪资档案、福利档案，高级搜索中的状态条件改为数组类型的入参
|
2023-07-07 15:32:12 +08:00 |
|
sy
|
fa28db9c79
|
薪酬系统-薪资核算，高级搜索和导出带入筛选条件未生效问题修复
|
2023-07-07 10:15:23 +08:00 |
|
sy
|
68bcfeb2c6
|
薪酬系统-多语言，文字转义优化以及导出excel列宽设置优化
|
2023-07-06 16:52:08 +08:00 |
|
sy
|
c79563d606
|
薪酬系统-多语言，优化英文版系统中导出excel文件名取值逻辑
|
2023-07-04 13:46:06 +08:00 |
|
钱涛
|
82ab6c1e11
|
非系统算税功能
|
2023-07-04 09:32:12 +08:00 |
|
sy
|
b5eeb97d3d
|
Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java
# src/com/engine/salary/entity/salaryBill/param/SalarySendWithdrawParam.java
# src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
# src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java
# src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java
# src/com/engine/salary/enums/salaryformula/SalaryFormulaReferenceEnum.java
# src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java
# src/com/engine/salary/report/enums/UnitTypeEnum.java
# src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
# src/com/engine/salary/report/wrapper/SalaryStatisticsDimensionWrapper.java
# src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java
# src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java
# src/com/engine/salary/service/impl/SISchemeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctProgressServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
# src/com/engine/salary/web/SalaryAcctController.java
# src/com/engine/salary/web/SalaryFormulaController.java
# src/com/engine/salary/web/SalaryProgressController.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
# src/com/engine/salary/wrapper/SalarySobItemWrapper.java
|
2023-06-30 11:37:39 +08:00 |
|
Harryxzy
|
04592a58b4
|
Merge branch 'release/2.8.4.2306.02' into feature/taxDeclarationWithdraw
# Conflicts:
# src/com/engine/salary/sys/constant/SalarySysConstant.java
# src/com/engine/salary/sys/service/SalarySysConfService.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/web/SalarySystemConfigController.java
# src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
|
2023-06-29 16:40:07 +08:00 |
|
Harryxzy
|
ba85231656
|
个税申报撤回开关-1
|
2023-06-29 16:38:50 +08:00 |
|
Harryxzy
|
2735661b4a
|
删除薪资档案
|
2023-06-29 10:35:55 +08:00 |
|
Harryxzy
|
822ad87451
|
薪资核算结果校验拦截
|
2023-06-27 14:58:33 +08:00 |
|
钱涛
|
6f3593f44b
|
Merge branch 'feature/短信验证码' into release/2.8.4.2306.02
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/sys/constant/SalarySysConstant.java
|
2023-06-26 13:54:56 +08:00 |
|
Harryxzy
|
7c44a2ad6b
|
Merge branch 'feature/waterMark' into release/2.8.4.2306.02
# Conflicts:
# src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
# src/com/engine/salary/web/SalaryBillController.java
|
2023-06-26 13:28:21 +08:00 |
|
Harryxzy
|
a43123efc0
|
Merge branch 'fix/DBType修改' into release/2.8.4.2306.02
|
2023-06-26 13:26:27 +08:00 |
|
Harryxzy
|
3be6eaa16f
|
Merge branch 'feature/核算人员匹配规则（是否包含停薪列）' into release/2.8.4.2306.02
|
2023-06-26 13:26:03 +08:00 |
|
Harryxzy
|
5ecba7fa3e
|
Merge branch 'feature/taxDeclarationWithdraw' into release/2.8.4.2306.02
|
2023-06-26 13:25:01 +08:00 |
|
sy
|
c24572d911
|
薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑
|
2023-06-21 14:51:41 +08:00 |
|
Harryxzy
|
0e601e3967
|
修改DBType的写法
|
2023-06-19 13:59:24 +08:00 |
|
钱涛
|
8612f0e5b2
|
Merge branch 'release/2.8.4.2306.02' into feature/短信验证码
|
2023-06-16 14:54:24 +08:00 |
|
Harryxzy
|
3096954628
|
核算人员匹配规则（是否包含停薪列表）暂存
|
2023-06-16 14:40:36 +08:00 |
|
钱涛
|
2480525fa6
|
修复同步档案bug
缓存公共接口
|
2023-06-15 10:44:31 +08:00 |
|
钱涛
|
912c80c97f
|
验证方式
|
2023-06-14 16:15:05 +08:00 |
|
钱涛
|
57798a8e3e
|
短信验证码功能
|
2023-06-14 15:51:26 +08:00 |
|
Harryxzy
|
b544c5e2c1
|
水印预览
|
2023-06-13 10:02:11 +08:00 |