133 Commits

Author	SHA1	Message	Date
sy	efadc32622	Merge remote-tracking branch 'remotes/origin/release/2.9.8.2311.02' into feature/salary_i18 ... # Conflicts: # src/com/engine/salary/biz/AddUpDeductionBiz.java # src/com/engine/salary/biz/AddUpSituationBiz.java # src/com/engine/salary/biz/OtherDeductionBiz.java # src/com/engine/salary/biz/SalaryArchiveItemBiz.java # src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java # src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java # src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java # src/com/engine/salary/report/enums/UnitTypeEnum.java # src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java # src/com/engine/salary/service/impl/SISchemeServiceImpl.java # src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java # src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java # src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java # src/com/engine/salary/service/impl/SalaryBillServiceImpl.java # src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java # src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java # src/com/engine/salary/util/excel/ExcelUtilPlus.java # src/com/engine/salary/web/SIArchivesController.java # src/com/engine/salary/web/SISchemeController.java # src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java # src/com/engine/salary/wrapper/SalaryTemplateWrapper.java	2023-11-30 16:48:22 +08:00
Harryxzy	df25f99544	薪资核算固定列头	2023-11-29 16:48:09 +08:00
Harryxzy	97a5d4ab91	线下对比表头改造成分组的样式	2023-11-15 17:12:52 +08:00
sy	40a0f2afba	薪酬系统-多语言，薪资项目、薪资项目分组更改名称获取逻辑（适配多语言）	2023-11-14 13:49:10 +08:00
Harryxzy	f2a840576e	Merge branch 'fix/薪资核算导入下载模板bug' into release/3.0.0.2311.01	2023-11-07 11:24:25 +08:00
Harryxzy	f85f0af44a	下载核算导入模板，直接从缓存拿选的字段	2023-11-02 16:39:58 +08:00
钱涛	2b4ded9dd0	修复合计没有根据自定义字段过滤	2023-10-30 19:19:07 +08:00
sy	05fd1a0e71	Merge remote-tracking branch 'remotes/origin/release/2.9.6.2310.01' into feature/salary_i18 ... # Conflicts: # src/com/engine/salary/biz/SIAccountBiz.java # src/com/engine/salary/biz/SIArchivesBiz.java # src/com/engine/salary/biz/SISchemeBiz.java # src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java # src/com/engine/salary/entity/salaryBill/param/SalaryBaseSetSaveParam.java # src/com/engine/salary/enums/salaryformula/SalarySQLReferenceEnum.java # src/com/engine/salary/enums/salarysob/SalaryEmployeeStatusEnum.java # src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java # src/com/engine/salary/service/impl/ExtEmpServiceImpl.java # src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java # src/com/engine/salary/service/impl/SIAccountServiceImpl.java # src/com/engine/salary/service/impl/SICompensationServiceImpl.java # src/com/engine/salary/service/impl/SIExportServiceImpl.java # src/com/engine/salary/service/impl/SIImportServiceImpl.java # src/com/engine/salary/service/impl/SISchemeServiceImpl.java # src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java # src/com/engine/salary/service/impl/SalaryBillServiceImpl.java # src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java # src/com/engine/salary/service/impl/SalarySendServiceImpl.java # src/com/engine/salary/wrapper/SalaryFormulaWrapper.java # src/com/engine/salary/wrapper/SalaryItemWrapper.java	2023-10-08 12:11:06 +08:00
sy	b27a378baa	薪酬系统-多语言，薪资项目默认系统分组适配多语言逻辑	2023-10-08 10:27:27 +08:00
Harryxzy	efa818f8b9	核算结果导出数值项excel格式为数值	2023-09-21 13:36:23 +08:00
sy	baf1da3edd	Merge remote-tracking branch 'remotes/origin/release/2.9.3.2308.01' 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/dto/SalaryAccEmployeeListDTO.java # src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java # src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java # src/com/engine/salary/entity/salaryitem/dto/SalaryItemSobListDTO.java # src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java # src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java # src/com/engine/salary/enums/SalaryValueTypeEnum.java # src/com/engine/salary/service/impl/SIAccountServiceImpl.java # src/com/engine/salary/service/impl/SIImportServiceImpl.java # src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java # src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java	2023-08-14 10:01:21 +08:00
sy	94972a589f	薪酬系统-多语言，薪资项目名称相关操作进行根据薪资项目自带labelId多语言适配	2023-08-11 18:06:09 +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
sy	ea4b603c36	薪酬系统-薪资档案、核算，列表不要显示离职日期、核算人员确认页面范围列表不要显示离职日期	2023-07-24 11:26:36 +08:00
sy	f93090b063	薪酬系统-薪资核算，自定义导出字段优化未分类字段识别逻辑	2023-07-17 17:53:59 +08:00
sy	c78c8375f0	薪酬系统-薪资核算，自定义导出字段	2023-07-12 15:20:02 +08:00
sy	65da8930a1	薪酬系统-多语言，枚举类defaultLabel值获取多语言环境下的对应值的逻辑优化	2023-07-05 18:04:42 +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	5d83326d23	listByAcctEmployeeIdsAndSalaryItemIds的分片问题	2023-06-28 16:26:20 +08:00
sy	c24572d911	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
Harryxzy	155a00623a	导入编辑自动锁定 根据confValue判断	2023-06-12 10:45:01 +08:00
Harryxzy	1294e86c8c	导入自动锁定添加开关	2023-06-02 15:25:46 +08:00
Harryxzy	4e04b6e268	薪资核算导入，选择表单字段获取未分类	2023-06-01 10:30:33 +08:00
Harryxzy	c7bdbe7b85	Merge branch 'feature/V3-salaryAcctResultLog' into release/2.8.2.2305.02 ... # Conflicts: # src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java # src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java	2023-05-22 14:03:07 +08:00
Harryxzy	20262169c9	Merge branch 'fix/salaryAcctResutAutoLock' into release/2.8.2.2305.02	2023-05-22 14:02:28 +08:00
Harryxzy	7c74149184	薪资核算导入 选择字段根据分类分组	2023-05-15 18:02:22 +08:00
Harryxzy	4ff15ca651	薪资核算结果编辑导入 记录	2023-05-15 10:28:17 +08:00
钱涛	eaaf6359af	Merge branch 'feature/公式' into release/2.8.2.2305.02	2023-05-12 09:16:54 +08:00
Harryxzy	54ca46c653	薪资核算导入项自动锁定	2023-05-11 10:51:43 +08:00
钱涛	53f2c1ebb6	修复提示行号	2023-05-11 10:21:21 +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
sy	eb7014663e	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18 ... # Conflicts: # src/com/engine/salary/biz/SIArchivesBiz.java # src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java # src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java # src/com/engine/salary/service/impl/SIAccountServiceImpl.java # src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java # src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java # src/com/engine/salary/wrapper/TaxAgentSubAdminWrapper.java	2023-05-06 17:00:00 +08:00
sy	49c499e7d6	薪酬系统-多语言配置，适配部分中文字符串0425	2023-04-25 18:03:11 +08:00
sy	7ec54ea909	薪酬系统-多语言配置，适配部分中文字符串0424，调整福利台账线下对比导入相关逻辑	2023-04-24 18:22:31 +08:00
sy	f112d1ccb4	薪酬系统-多语言配置，适配部分中文字符串0423-02	2023-04-23 17:36:56 +08:00
sy	c9eb31a8c2	薪酬系统-多语言配置，适配部分中文字符串0423	2023-04-23 14:56:54 +08:00
sy	6400af416a	薪酬系统-多语言配置，适配部分中文字符串	2023-04-23 11:52:57 +08:00
钱涛	a19b19e23d	公式	2023-04-19 10:15:01 +08:00
Harryxzy	53fc815e2e	AddUpDeductionServiceImpl国际化	2023-04-14 16:49:04 +08:00
Harryxzy	82ee707f16	employebiz改成employeeservice	2023-04-12 15:27:35 +08:00
钱涛	b0284022c1	核算导出全部功能修复	2023-04-07 14:39:22 +08:00
sy	521db08cde	Merge remote-tracking branch 'remotes/origin/feature/v4-salaryExcelFormat-0328' into release/2.7.3.2304.01 ... # Conflicts: # src/com/engine/salary/service/SalaryAcctExcelService.java # src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java	2023-04-03 15:59:58 +08:00
Harryxzy	3304ffdbd5	薪资核算导入，添加表头字段缓存功能	2023-03-16 16:19:23 +08:00
sy	dc2cb5f448	薪酬系统-薪资核算，薪资核算和薪资档案导出excel通用格式改造	2023-03-16 13:51:41 +08:00
sy	acc382b835	薪酬系统-薪资核算，核算导出excel格式改造	2023-03-15 10:20:46 +08:00
Harryxzy	3b657db52a	线下对比Oracle导入报错	2023-02-10 09:59:18 +08:00
Harryxzy	6262f62292	薪资回算Excel导入BUG	2022-12-26 23:17:32 +08:00
Harryxzy	3ff3fd8e44	薪资回算-薪资核算部分（剩余核算归档）	2022-12-02 17:35:14 +08:00
钱涛	10ffe88810	核算锁定	2022-11-17 15:17:49 +08:00
钱涛	346445c70d	核算合计功能	2022-09-28 16:59:51 +08:00
sy	de150e063e	薪酬系统导入方式配置-人员筛选方法类调用优化以及调整相关调用该方法的代码	2022-09-21 15:49:55 +08:00
Harryxzy	183e63140a	xzy-月度绩效环比增加人员导出功能	2022-09-20 16:18:43 +08:00
sy	b0cc2cc19d	薪酬系统导入方式配置-人员匹配全局配置的confValue默认设为0	2022-09-19 15:11:27 +08:00
sy	280c979536	薪酬系统-修改导入信息时对于姓名字段的依赖逻辑	2022-09-16 15:03:48 +08:00
sy	478b9a3d16	薪酬系统导入方式配置-薪资核算-导入,添加导入人员筛选配置化处理	2022-09-16 13:23:37 +08:00
sy	8492c2097b	Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport	2022-09-16 09:47:15 +08:00
钱涛	d238502b2c	1、修复线下对比 ... 2、系统配置	2022-09-15 15:15:34 +08:00
sy	d491288296	薪酬系统导入方式配置-各导入模板添加工号字段	2022-09-15 10:43:34 +08:00
sy	749279e372	优化薪资核算导入相关的唯一匹配逻辑v2	2022-09-02 11:04:51 +08:00
sy	3fba03d482	优化薪资核算导入相关的唯一匹配逻辑及导入模板	2022-08-30 09:15:37 +08:00
钱涛	bfcda3525a	1、福利方案分权 ... 2、累计、往期、其他导入分权 3、导入精度	2022-08-25 16:46:12 +08:00
Harryxzy	6809839a2c	Merge branch 'feature/addSalaryShowSwitch_xzy' into develop	2022-08-25 09:38:59 +08:00
钱涛	71b2f6f41c	导入核算结果时去除多余的人员	2022-08-24 16:51:57 +08:00
钱涛	1567ecb956	核算结果的导入bug，null	2022-08-24 14:24:20 +08:00
Harryxzy	289e685e09	xzy-薪资项目显隐控制	2022-08-24 10:31:42 +08:00
钱涛	e0a031e197	oracle异常	2022-08-18 15:02:04 +08:00
钱涛	ddccbb0d78	导入核算结果时，添加sql项	2022-08-15 17:16:48 +08:00
钱涛	bf31d993a7	薪酬报表-薪酬核算完成，将数据存储到非加密表，删除人员信息，补充：分部、部门、岗位等其他字段，供数据中心引用	2022-07-11 17:31:33 +08:00
钱涛	c2c4149442	报表接口	2022-07-04 15:34:04 +08:00
钱涛	a69bd42b49	核算的分权	2022-06-01 21:21:07 +08:00
钱涛	efd31013cd	薪资账套分权	2022-05-31 21:05:59 +08:00
钱涛	99b5c36864	暂存	2022-05-31 16:41:11 +08:00
钱涛	c6ea4c5698	线下对比	2022-05-26 15:45:37 +08:00
钱涛	231961663f	核算结果导出	2022-05-05 14:10:19 +08:00
钱涛	741a81bd29	除去导入无效的代码	2022-04-26 13:36:16 +08:00
钱涛	b1b086caf1	预览	2022-04-19 19:50:00 +08:00
钱涛	dc008dad5c	核算导入	2022-04-19 19:32:09 +08:00
钱涛	c2cbdce9ec	补充列	2022-04-19 17:21:27 +08:00
钱涛	c537b7d944	补充列	2022-04-19 15:13:08 +08:00
钱涛	91da4ab831	自定义按钮	2022-04-18 17:28:34 +08:00
钱涛	a2102a49b4	核算v3	2022-04-13 14:18:00 +08:00
钱涛	692c2f5a79	核算	2022-04-12 19:25:19 +08:00