3033 Commits

Author	SHA1	Message	Date
钱涛	bb76df3718	个人养老金	2023-04-04 17:29:56 +08:00
Harryxzy	accb0d3d2b	社保福利台账 - 合计列	2023-04-04 17:21:29 +08:00
sy	6a9d2a6fab	Merge remote-tracking branch 'origin/release/2.7.3.2304.01' into release/2.7.3.2304.01	2023-04-04 16:28:25 +08:00
sy	add7051759	薪酬系统, 适配金仓-个税申报单逻辑优化、薪资部分发放逻辑优化、删除initserviceimpl文件	2023-04-04 16:28:15 +08:00
钱涛	44fe9203ab	个人养老金	2023-04-04 14:21:25 +08:00
钱涛	cb46fccb16	工资单推送	2023-04-03 18:49:28 +08:00
sy	eb1d441de7	薪酬系统, 关闭加密方法优化	2023-04-03 16:07:37 +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	5847f3f449	Merge branch 'fix/salaryTemplateUpdateBug_0407' into release/2.7.3.2304.01	2023-04-03 11:31:49 +08:00
Harryxzy	c97407c2ac	工资单模板修复	2023-04-03 11:31:09 +08:00
Harryxzy	dcfe6479ed	Merge branch 'feature/cancelSuspend' into release/2.7.3.2304.01	2023-04-03 11:12:20 +08:00
Harryxzy	4faa9e36a6	取消待办优化	2023-03-31 10:17:31 +08:00
Harryxzy	2e85f72362	工资单发放系统异常	2023-03-31 09:40:55 +08:00
Harryxzy	40b38b5347	社保福利档案列表提速	2023-03-30 22:52:52 +08:00
sy	31bf7cfd99	薪酬系统-薪资核算和档案，excel导出行高自适应	2023-03-30 17:26:55 +08:00
Harryxzy	30660ce04b	工资单模板，无法修改薪资项为0时不显示	2023-03-30 13:33:52 +08:00
sy	0427ec5ed4	薪酬系统, 关闭加密方法优化	2023-03-30 11:44:21 +08:00
Harryxzy	52decb10ff	Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.3.2304.01	2023-03-30 11:03:22 +08:00
Harryxzy	f0c80f3287	薪资档案导入无法带出工号数据	2023-03-30 10:02:09 +08:00
Harryxzy	295331d1a5	按照工号导入，支持不输入姓名	2023-03-30 09:49:49 +08:00
Harryxzy	2fc4560488	薪资档案按照工号导入无效	2023-03-29 16:46:10 +08:00
Harryxzy	ef3260085f	修复重新核算，往期累计删多数据	2023-03-28 14:18:01 +08:00
Harryxzy	b331152d27	修复合计列	2023-03-28 13:59:57 +08:00
Harryxzy	d99e6147d3	Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.3.2304.01	2023-03-28 13:40:12 +08:00
Harryxzy	952a8e845c	修复合计列	2023-03-28 11:00:18 +08:00
Harryxzy	2dc40a7b91	取消待办	2023-03-28 10:10:54 +08:00
Harryxzy	95cf271c80	修复薪资档案导入，重复数据报错行数少一	2023-03-28 09:31:00 +08:00
Harryxzy	530dcd7028	Merge branch 'feature/SalaryAcctResult-ImportField-cache_0324' into release/2.7.3.2304.01	2023-03-27 17:36:41 +08:00
钱涛	9f6950d8ae	工资单发放	2023-03-20 17:36:29 +08:00
钱涛	052eebe83a	解决工资单人名缺失	2023-03-16 19:17:33 +08:00
Harryxzy	1ab7fcc7b8	Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.1.2303.02	2023-03-16 17:20:43 +08:00
钱涛	f79569fe4f	解决工资单人名缺失	2023-03-16 17:19:02 +08:00
Harryxzy	3304ffdbd5	薪资核算导入，添加表头字段缓存功能	2023-03-16 16:19:23 +08:00
钱涛	8430397d03	外部人员终极版	2023-03-16 16:10:29 +08:00
Harryxzy	e1b4927eaa	删除多余代码	2023-03-16 14:52:08 +08:00
sy	dc2cb5f448	薪酬系统-薪资核算，薪资核算和薪资档案导出excel通用格式改造	2023-03-16 13:51:41 +08:00
Harryxzy	b9c40955ac	Merge branch 'fix/AddUpSituationCantImport_0316' into release/2.7.1.2303.02	2023-03-16 11:38:38 +08:00
Harryxzy	cdf7dd916b	往期累计情况编辑	2023-03-16 11:37:43 +08:00
Harryxzy	6a7e5eacdc	社保福利台账合计列	2023-03-16 11:17:18 +08:00
Harryxzy	521de26b51	Merge branch 'fix/AddUpSituationCantImport_0316' into release/2.7.1.2303.02	2023-03-16 09:54:49 +08:00
Harryxzy	16cfe18b90	往期累计情况导入BUG	2023-03-16 09:53:46 +08:00
钱涛	62d124efb1	外部人员终极版	2023-03-15 22:48:01 +08:00
钱涛	81650888c7	非系统人员	2023-03-15 18:21:04 +08:00
钱涛	ace15ca7a1	非系统人员	2023-03-15 18:03:46 +08:00
Harryxzy	ca03e0785e	工资单发放详情导出没有部门信息	2023-03-15 17:09:02 +08:00
钱涛	50c15989c6	Merge branch 'release/2.7.1.2303.02' into feature/外部人员	2023-03-15 16:15:48 +08:00
Harryxzy	712f30ddfa	工资单发放详情合计列	2023-03-15 16:00:37 +08:00
Harryxzy	1f9597195f	外部人员-个税扣缴义务人service获取人员信息改变写法	2023-03-15 15:49:20 +08:00
Harryxzy	a9fb24145d	修复往期累计情况，无法导入编辑	2023-03-15 14:14:53 +08:00
Harryxzy	6418e4ad6e	往期累计情况，获取当月税款所属期数据无法导入bug，	2023-03-15 13:38:13 +08:00
钱涛	db09f8047e	注释	2023-03-15 11:04:54 +08:00
钱涛	6bb6e350a8	冲突	2023-03-15 10:43:05 +08:00
sy	3059829619	Merge remote-tracking branch 'remotes/origin/release/2.7.1.2303.02' into feature/v4-salaryExcelFormat-0328	2023-03-15 10:22:37 +08:00
sy	acc382b835	薪酬系统-薪资核算，核算导出excel格式改造	2023-03-15 10:20:46 +08:00
钱涛	c9f6b62b5a	Merge branch 'release/2.7.1.2303.02' into feature/外部人员 ... # Conflicts: # src/com/engine/salary/biz/SIAccountBiz.java # src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java	2023-03-15 10:15:49 +08:00
钱涛	6f9769bae2	手机号	2023-03-15 10:07:40 +08:00
钱涛	5b88cda35c	账套外部人员接入	2023-03-15 09:13:29 +08:00
钱涛	5f465aa914	外部人员范围列表和删除接口	2023-03-14 15:22:50 +08:00
钱涛	5c75b3cf8e	去除无用代码	2023-03-14 14:22:45 +08:00
钱涛	b54d754c4b	删除个税扣缴义务人人员范围改异步	2023-03-14 11:04:25 +08:00
钱涛	767fbe36f5	外部人员	2023-03-14 10:52:48 +08:00
Harryxzy	0c409c627c	employeeService查询外部 fixBug	2023-03-13 16:16:05 +08:00
Harryxzy	362f5abdf6	Merge remote-tracking branch 'origin/feature/外部人员' into feature/外部人员	2023-03-13 16:12:51 +08:00
Harryxzy	d5a97c8192	employeeService查询外部 fixBug	2023-03-13 16:12:10 +08:00
钱涛	ad616f80d3	Merge remote-tracking branch 'origin/feature/外部人员' into feature/外部人员	2023-03-13 16:04:28 +08:00
钱涛	a61b7ac7bc	外部人员	2023-03-13 16:04:19 +08:00
Harryxzy	7b0e1cb1f3	employeeService查询外部 fixBug	2023-03-13 15:57:12 +08:00
Harryxzy	32b1a2db48	employeeService查询外部	2023-03-13 15:53:56 +08:00
钱涛	2d091dbd33	异步同步人员校验	2023-03-10 17:15:15 +08:00
Harryxzy	351d892281	Merge branch 'fix/CancelSetPayEndDate' into release/2.7.1.2303.02	2023-03-10 15:43:24 +08:00
Harryxzy	7de5c1e175	Merge branch 'fix/V3_listShowChange_0309' into release/2.7.1.2303.02	2023-03-10 15:42:42 +08:00
Harryxzy	8dabfb28b9	个税扣缴义务人删除人员范围时，不设置最后发薪日期	2023-03-10 13:50:52 +08:00
钱涛	d8c13b70d2	内外部人员匹配标识	2023-03-08 18:01:19 +08:00
钱涛	cb6b53c6af	Merge remote-tracking branch 'origin/release/2.7.1.2303.02' into release/2.7.1.2303.02	2023-03-08 17:53:20 +08:00
钱涛	ff4dfe4dad	fix日期转换，申报表所属月不显示	2023-03-08 17:53:13 +08:00
sy	dbf9e878e5	Merge remote-tracking branch 'remotes/origin/feature/v4-addSiAcctLog-0309' into release/2.7.1.2303.02	2023-03-08 17:52:09 +08:00
Harryxzy	401947fabc	Merge branch 'fix/mySalaryBillNoWorkCode' into release/2.7.1.2303.02	2023-03-08 17:50:01 +08:00
钱涛	160116e946	Merge remote-tracking branch 'origin/feature/外部人员' into feature/外部人员	2023-03-08 16:37:11 +08:00
钱涛	487dd9f972	非系统人员档案自动化	2023-03-08 16:36:47 +08:00
钱涛	2c13c138a6	校验每次只能申报一个扣缴义务人	2023-03-07 17:44:21 +08:00
Harryxzy	4ce79438e6	工资单没有工号BUG	2023-03-07 17:43:51 +08:00
Harryxzy	5067d50722	EmployeeBiz修改调用方式-2	2023-03-07 17:20:30 +08:00
Harryxzy	068f7e6535	EmployeeBiz修改调用方式	2023-03-07 17:14:25 +08:00
sy	3e03b5d920	薪酬系统-社保福利，福利核算进度条逻辑优化	2023-03-07 16:52:09 +08:00
sy	b6ee197fe6	薪酬系统,梳理Mapper类使用方式	2023-03-07 14:21:01 +08:00
Harryxzy	b702286995	考勤数据，详情数据 前端渲染方式改变	2023-03-07 11:36:45 +08:00
钱涛	890ff64215	mock接口	2023-03-06 19:45:48 +08:00
钱涛	a423790a35	获取人员信息	2023-03-06 17:57:20 +08:00
钱涛	88de36f260	Merge branch 'release/2.7.1.2303.02' into feature/外部人员	2023-03-06 13:59:36 +08:00
钱涛	a5596d503f	外部人员基础信息	2023-03-03 16:57:52 +08:00
Harryxzy	762c484d36	个税扣缴义务人名称扩充至40	2023-03-03 15:47:30 +08:00
钱涛	9b8e89bf9f	去除lang3	2023-03-03 14:55:26 +08:00
钱涛	79a29df0de	暂存	2023-03-03 14:40:17 +08:00
Harryxzy	1cbd1d2958	自定义福利调整	2023-03-03 09:24:44 +08:00
钱涛	ca20ed8ca2	Merge branch 'release/2.6.3.2303.01' into feature/外部人员	2023-03-02 19:48:40 +08:00
sy	7f0d87a017	Merge remote-tracking branch 'remotes/origin/feature/v4-siArchivesChangeByTaxRange-0302' into release/2.6.3.2303.01	2023-03-02 18:14:19 +08:00
钱涛	26b8996d42	公司名	2023-03-02 17:59:58 +08:00
Harryxzy	3f0160ebe5	Merge remote-tracking branch 'origin/release/2.6.3.2303.01' into release/2.6.3.2303.01	2023-03-02 17:19:44 +08:00
Harryxzy	6fe6dd6043	Merge remote-tracking branch 'origin/fix/V3_replenSalaryTemplateItemChange_0309' into release/2.6.3.2303.01	2023-03-02 17:19:04 +08:00
Harryxzy	83d5a882b9	Merge branch 'fix/V3_addUpSituationShowAsMonth_0309' into release/2.6.3.2303.01	2023-03-02 17:18:39 +08:00
Harryxzy	50e1f2c432	Merge branch 'fix/V3_exportAddWorkCode' into release/2.6.3.2303.01	2023-03-02 17:18:10 +08:00
钱涛	6de22b142d	1、工资单模板 ... 2、一键累计	2023-03-02 17:11:42 +08:00
Harryxzy	f48e98cb11	补发工资单模块，薪资项目名称修改时，展示同步修改	2023-03-02 14:51:51 +08:00
Harryxzy	50d6cc4d9a	往期累计情况，按照税款所属期月份进行展示	2023-03-02 14:04:12 +08:00
钱涛	e73ed7142f	正常核算工资单模板同步项目名称	2023-03-02 13:37:28 +08:00
钱涛	fd9b592384	修复核算未分类项目不显示	2023-03-02 11:25:25 +08:00
Harryxzy	fdb5774ae4	考勤引用列表改造	2023-03-02 11:23:57 +08:00
Harryxzy	56399c127b	社保福利方案自定义福利列表改造	2023-03-02 10:46:53 +08:00
钱涛	a37e874614	修复工资单模板显示问题	2023-03-02 10:41:21 +08:00
钱涛	a8fc666e79	fix json转换问题	2023-03-02 10:12:00 +08:00
Harryxzy	5455bc739a	Merge branch 'fix/V3_exportAddWorkCode' into develop	2023-03-01 16:20:25 +08:00
Harryxzy	e7f2d7b496	薪资档案导出，添加工号	2023-03-01 16:19:09 +08:00
钱涛	14bee7f6d5	修复未分类无法保存	2023-03-01 09:58:55 +08:00
钱涛	1568b1e03d	外部人员基础类	2023-03-01 09:05:03 +08:00
钱涛	8c8d79aba3	档案字段删除	2023-02-27 18:27:11 +08:00
钱涛	0138351665	修复账套项目可删除	2023-02-27 17:51:26 +08:00
sy	3e2cf917ae	Merge branch 'feature/v4-siArchivesChangeByTaxRange-0302' into develop	2023-02-24 14:01:56 +08:00
sy	0e164b7989	薪酬系统-社保福利，福利档案增量数据处理直接在个税扣缴义务人人员范围变更时触发，不需打开福利档案列表触发	2023-02-24 13:53:57 +08:00
钱涛	26a6327d44	调薪bug	2023-02-23 18:09:05 +08:00
钱涛	a8cb586358	公式删除校验	2023-02-23 15:48:18 +08:00
钱涛	affa437506	加密显示配置	2023-02-23 15:18:33 +08:00
钱涛	1c2028f551	公式删除优化	2023-02-23 14:52:24 +08:00
钱涛	245803cfe8	获取人员状态	2023-02-23 10:28:27 +08:00
钱涛	e3c1efcc47	sql操作的扩展	2023-02-23 09:19:34 +08:00
钱涛	ee5e5fa127	调薪说明	2023-02-22 19:12:53 +08:00
钱涛	41c56b1bd4	调薪说明	2023-02-22 19:07:13 +08:00
钱涛	5f9a7af0fa	修复数据采集按部门搜索	2023-02-22 17:58:19 +08:00
sy	1a5afd6c6d	Merge branch 'feature/v4-siFunctionImprove2-0228' into release/2.6.2.2302.02	2023-02-22 14:10:46 +08:00
钱涛	49cd56e359	档案列表重构	2023-02-21 18:05:58 +08:00
钱涛	cb484b8ff9	回算项公式使用不可删除	2023-02-21 17:19:32 +08:00
钱涛	eac70e7cde	薪资项目和社保福利方案分权	2023-02-21 17:02:39 +08:00
钱涛	187e60ec15	薪资项目分权	2023-02-21 16:39:17 +08:00
钱涛	8e31cec138	Merge branch 'feature/公式改造' into release/2.6.2.2302.02	2023-02-21 14:48:43 +08:00
钱涛	eee39ae972	jar引用变更	2023-02-21 14:33:15 +08:00
钱涛	84e63d4d40	加密日志	2023-02-21 13:58:30 +08:00
钱涛	4f22df09f0	支持6位小数	2023-02-20 14:40:18 +08:00
钱涛	73dcd3a53a	fix账套删除人员信息字段	2023-02-20 11:54:44 +08:00
钱涛	77cff0ba24	档案字段被公式引用不允许删除	2023-02-17 18:03:46 +08:00
钱涛	bccdd07ba0	修改名称对应修改公式	2023-02-17 17:52:29 +08:00
钱涛	c7d1bbfa35	更新名称	2023-02-17 17:19:17 +08:00
钱涛	dc24b03efd	薪资项目删除校验	2023-02-17 15:58:33 +08:00
钱涛	abeb4d891d	薪资项目删除校验	2023-02-17 14:37:59 +08:00
钱涛	da9b548480	公式	2023-02-17 10:54:18 +08:00
钱涛	1d0a02554e	公式	2023-02-16 14:53:03 +08:00
sy	39cb3b0df1	薪酬系统-福利档案，方案明细中添加福利项上下限数据	2023-02-16 13:14:17 +08:00
钱涛	b57bdcc7eb	接口报错时打印参数	2023-02-16 10:47:30 +08:00
钱涛	91bd28d21a	清除公式	2023-02-16 10:44:13 +08:00
钱涛	1bdc304ddf	清除公式	2023-02-16 09:16:00 +08:00
钱涛	53c767b239	还原脚本	2023-02-15 17:36:29 +08:00
钱涛	a2e9c482a4	修复账套根据名称查询bug ... 去除调整前后值的限制	2023-02-15 16:38:54 +08:00
sy	6b34c0e916	薪酬系统-福利档案，修改福利方案传参对象	2023-02-15 15:52:49 +08:00
sy	7da1bfff6b	薪酬系统-福利台账，核算明细导出时企业年金单位数值有误相关问题修复	2023-02-15 09:55:33 +08:00
钱涛	4f0dc060ee	Merge branch 'feature/档案调整为空时不生效' into release/2.6.2.2302.02	2023-02-14 16:00:05 +08:00
钱涛	1c93dab9f0	获取人员档案	2023-02-14 15:41:03 +08:00
钱涛	0337db02df	Merge branch 'feature/通过扣缴义务人和uid获取人员档案' into release/2.6.2.2302.02	2023-02-14 15:37:17 +08:00
钱涛	dee7c11eda	修复账套新增异常	2023-02-14 10:53:58 +08:00
钱涛	44819a0903	工资单后台校验	2023-02-13 17:25:13 +08:00
钱涛	2748f04d0a	档案为空不生效	2023-02-13 17:23:05 +08:00
钱涛	8b594c1882	自发起调薪流程	2023-02-13 14:53:35 +08:00
钱涛	78cb59f07f	暂存	2023-02-13 13:27:44 +08:00
钱涛	602051e1ed	Merge branch 'release/2.6.1.2301.02' into release/2.6.2.2302.02	2023-02-13 11:02:00 +08:00
钱涛	49894ad6a2	修复申报表总数	2023-02-13 10:59:09 +08:00
钱涛	6792b4c5aa	Merge branch 'feature/通过userid查询工资单详情'	2023-02-10 16:45:45 +08:00
钱涛	d1b4ae4a0b	过滤	2023-02-10 16:38:43 +08:00
Harryxzy	3b657db52a	线下对比Oracle导入报错	2023-02-10 09:59:18 +08:00
Harryxzy	510a2e7d29	处理工资单发放历史数据执行时间提前	2023-02-09 19:43:43 +08:00
Harryxzy	d30870e28d	调薪不支持字符	2023-02-09 19:24:25 +08:00
钱涛	4186526743	Merge remote-tracking branch 'origin/release/2.6.1.2301.02' into release/2.6.1.2301.02	2023-02-09 19:04:02 +08:00
钱涛	0f9222e1e4	fix年终奖申报备注为0	2023-02-09 19:03:53 +08:00
fcli	5b50903b55	Merge branch 'feature/SalaryItemAuth&FieldManage' into release/2.6.1.2301.02	2023-02-09 18:48:35 +08:00
fcli	e99abfddcd	feat: 保存更新判断薪资档案引用	2023-02-09 18:47:48 +08:00
Harryxzy	cbc1c13e4d	Merge branch 'feature/V3-TaxAgentImport_AddState-0209' into release/2.6.1.2301.02	2023-02-09 17:40:49 +08:00
钱涛	8d011d8d49	Merge branch 'feature/账套群组不变' into release/2.6.1.2301.02	2023-02-09 17:32:00 +08:00
钱涛	995689bb1d	Merge branch 'feature/考勤引用本身报表' into release/2.6.1.2301.02	2023-02-09 17:31:42 +08:00
钱涛	5feed81803	Merge branch 'feature/通过userid查询工资单详情' into release/2.6.1.2301.02	2023-02-09 17:31:34 +08:00
sy	ba267d9dce	Merge remote-tracking branch 'remotes/origin/feature/v4-siSchemeAddPaymentCycle-0202' into release/2.6.1.2301.02	2023-02-09 17:24:29 +08:00
fcli	308a44a9a6	Merge remote-tracking branch 'origin/feature/SalaryItemAuth&FieldManage' into release/2.6.1.2301.02	2023-02-09 17:23:07 +08:00
fcli	5ee8097b3e	Merge branch 'feat/salaryBillSaveItem042' into release/2.6.1.2301.02	2023-02-09 17:22:53 +08:00
钱涛	b6429eb41c	通过id查询工资单详情	2023-02-09 17:05:07 +08:00
钱涛	2c37086e70	账套群组保持不变	2023-02-09 15:33:35 +08:00
fcli	fdf343dbbd	fix: 字段管理可以切换薪资引用	2023-02-09 11:08:03 +08:00
Harryxzy	69dd9cc61c	个税扣缴义务人、薪资账套 导入添加员工状态导入功能	2023-02-08 17:48:14 +08:00
sy	390d2d7851	薪酬系统-福利台账，补缴起始缴纳月之前的福利默认为空	2023-02-08 14:50:45 +08:00
sy	5657d5cc64	薪酬系统-福利台账，福利补缴方式一和二不允许补缴起始缴纳月之前的月份	2023-02-08 13:04:23 +08:00
Harryxzy	22027cde6b	Merge branch 'fix/MySalaryPageBug' into release/2.6.1.2301.02	2023-02-08 12:14:39 +08:00
Harryxzy	091221d0d4	我的薪资福利分页BUG	2023-02-08 12:12:45 +08:00
sy	de5b5d4c19	薪酬系统-福利台账，福利缴纳周期核算时考虑起始缴纳月相关逻辑，福利补缴不允许补缴起始缴纳月之前的月份	2023-02-08 11:33:17 +08:00
fcli	0a1198f17d	fix: 个税扣缴义务人范围非空判断	2023-02-06 17:16:11 +08:00
钱涛	2ff5ff0dce	考勤列表和导出	2023-02-06 16:28:56 +08:00
钱涛	0fb9fb51a0	修复调薪记录显示问题	2023-02-06 11:08:59 +08:00
钱涛	a3775babd3	考勤引用	2023-02-06 10:33:12 +08:00
sy	45d9fa4c12	薪酬系统-福利台账，补缴核算时按照补缴月份考虑缴纳周期	2023-02-03 17:04:30 +08:00
sy	9a4b58b2ee	薪酬系统-福利台账，只勾选医疗保险和养老保险时的补缴核算过程加入福利方案缴纳周期逻辑	2023-02-03 13:38:12 +08:00
钱涛	cdfced412f	Merge branch 'feature/年终奖' into release/2.6.1.2301.02	2023-02-02 16:13:05 +08:00
钱涛	abdd85effd	Merge branch 'feature/考勤引用本身报表' into release/2.6.1.2301.02	2023-02-02 16:12:41 +08:00
fcli	003dfe0d35	feat: 请求方式修改	2023-02-02 15:47:17 +08:00
sy	2e7ea046f2	薪酬系统-福利台账，补缴核算过程加入福利方案缴纳周期逻辑	2023-02-02 14:47:39 +08:00
钱涛	810cfe7f5e	考勤引用本身报表	2023-02-01 14:03:13 +08:00
fcli	3f145e133b	feat: 添加是否补发参数	2023-02-01 13:39:14 +08:00
fcli	5851ea20be	feat: 发放模板获取可用分组或项目	2023-02-01 13:10:05 +08:00
fcli	78f8630465	feat: 薪资账套项目列表分权	2023-02-01 11:23:43 +08:00
fcli	dec7c89856	feat: 发放模板获取可用分组或项目	2023-02-01 11:22:38 +08:00
钱涛	f76ac415ba	修复年终奖备注字符不对应	2023-02-01 10:05:02 +08:00
sy	6abc2068ea	薪酬系统-福利方案，福利方案新增、编辑、查看方法改进，福利核算加入福利方案中的缴纳周期因素	2023-01-31 17:40:34 +08:00
fcli	e92ea00b02	fix: 薪资项目公式按分权处理。 ... 薪资项目管理列表取出薪资档案引用列	2023-01-31 14:31:46 +08:00
钱涛	9bedcf6d38	年终奖	2023-01-31 14:15:27 +08:00
fcli	da47210b22	fix: 薪资档案根据薪资项目分权展示	2023-01-31 14:05:40 +08:00
钱涛	857c39bd2d	年终奖	2023-01-30 17:32:58 +08:00
sy	ae6822dc91	薪酬系统-福利方案，福利方案对象的相关数据载体（po,dto）增加缴纳周期相关新字段，并对sql中的查询字段进行添加	2023-01-30 17:29:07 +08:00
sy	63ae86978f	薪酬系统-福利档案，导出excel文件名添加日期信息	2023-01-30 09:31:31 +08:00
钱涛	d881b63327	年终奖	2023-01-29 14:58:51 +08:00
fcli	80019a029c	feat: 获取部分字段	2023-01-28 13:56:02 +08:00
Harryxzy	5bdb3ca0fe	Merge branch 'fix/setSendStatusBUG' into release/2.6.1.2301.02	2023-01-18 10:20:19 +08:00
钱涛	570065330b	修复考勤导入异常	2023-01-18 10:02:23 +08:00
fcli	bd2597541d	feat: 字段管理	2023-01-18 09:38:43 +08:00
Harryxzy	dc3bd34e0f	薪资回算sendStatus值update漏写	2023-01-14 13:59:13 +08:00
sy	57753bfb4a	Merge branch 'feature/v3-siFunctionImprove-0112' into release/2.5.3.2301.01	2023-01-12 18:32:11 +08:00
sy	3ed6c43a93	薪酬系统-福利台账，补缴原方式新增时，未设置基数情况下的逻辑优化	2023-01-12 18:31:36 +08:00
sy	3abffc2ee9	Merge branch 'feature/v3-siFunctionImprove-0112' into release/2.5.3.2301.01	2023-01-12 17:24:55 +08:00
sy	28d515b41a	薪酬系统-福利台账，补缴导入空值时处理逻辑优化	2023-01-12 17:23:26 +08:00
钱涛	2a52671451	支持钉钉打开工资单	2023-01-12 15:47:20 +08:00
fcli	24e0e180be	feat: 薪资项目分权，修改查询	2023-01-12 14:20:09 +08:00
fcli	5aff04c834	feat: 薪资项目分权oracle异常问题	2023-01-12 14:19:54 +08:00
fcli	3ec5c34589	feat: 薪资项目分权oracle异常问题	2023-01-12 14:19:50 +08:00
fcli	f1bdd0ada9	feat: 薪资项目分权，修改落库	2023-01-12 14:19:46 +08:00
fcli	4bcd355254	feat: 薪资项目分权，修改查询	2023-01-12 14:19:43 +08:00
fcli	90b2edb96c	feat: 薪资项目分权代码合并	2023-01-12 14:19:39 +08:00
钱涛	77dadfab4d	账套项目去重	2023-01-12 14:09:04 +08:00
sy	0feacffa11	Merge remote-tracking branch 'remotes/origin/feature/v3-siFunctionImprove-0112' into release/2.5.3.2301.01	2023-01-12 13:44:30 +08:00
Harryxzy	2b3752a554	Merge branch 'feature/V3-taxAgentsAddImport-0112' into release/2.5.3.2301.01	2023-01-12 09:25:06 +08:00
Harryxzy	6460edc013	去重	2023-01-11 09:47:57 +08:00
sy	197dbd8c8a	薪酬系统-福利档案，导入模板下载功能入参调整	2023-01-10 15:42:24 +08:00
sy	884da3dfb3	薪酬系统-福利档案，导入模板下载接口优化	2023-01-09 17:51:54 +08:00
sy	97230052b3	薪酬系统-福利档案，导入和导出的excel表头添加导入或导出，并且后缀添加tab页标签	2023-01-09 17:30:49 +08:00
Harryxzy	fd5048bd2d	fixBug	2023-01-09 15:20:26 +08:00
Harryxzy	fd470c56aa	薪资账套人员范围导入	2023-01-09 15:12:44 +08:00
sy	b33771d9e4	薪酬系统-福利档案，列表数据展示添加入职日期、离职日期字段	2023-01-09 14:49:58 +08:00
钱涛	830304fabb	系统配置	2023-01-09 14:41:10 +08:00
Harryxzy	c47d3f4ade	下载模板改为get请求	2023-01-09 10:30:26 +08:00
Harryxzy	09ba495bf3	个税扣缴义务人批量导入功能	2023-01-09 10:01:47 +08:00
钱涛	9dac777d5f	Merge branch 'feature/sql检查方法' into release/2.5.3.2301.01 ... # Conflicts: # src/com/engine/salary/wrapper/SalaryFormulaWrapper.java	2023-01-06 14:41:42 +08:00
sy	25ee041638	Merge branch 'feature/v3-siRepairCreate-1229' into release/2.5.3.2301.01	2023-01-06 14:07:53 +08:00
sy	f722535ba1	薪酬系统-福利台账，补缴新增仅缴纳部分福利项时的台账统计逻辑优化	2023-01-06 11:20:44 +08:00
fcli	d1f62e8b49	Merge remote-tracking branch 'origin/release/2.5.3.2301.01' into release/2.5.3.2301.01	2023-01-06 09:06:41 +08:00
fcli	d700d7a300	Merge branch 'fix/addSpecialDeduction' into release/2.5.3.2301.01	2023-01-06 09:06:20 +08:00
sy	b0436236eb	Merge branch 'feature/v3-siRepairCreate-1229' into release/2.5.3.2301.01	2023-01-05 17:24:33 +08:00
sy	6c730669c7	薪酬系统-福利台账，补缴新增方式二，按照指定核算月获取缴纳基数功能问题修复	2023-01-05 17:21:31 +08:00
钱涛	6d3c2ca856	Merge remote-tracking branch 'origin/release/2.5.3.2301.01' into release/2.5.3.2301.01	2023-01-05 16:24:51 +08:00
钱涛	dfd8f90df1	考勤同步日志控制	2023-01-05 16:24:40 +08:00
sy	d807b72ee7	Merge branch 'feature/v3-siRepairCreate-1229' into release/2.5.3.2301.01	2023-01-05 16:16:17 +08:00
sy	f1a123dfa4	Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siRepairCreate-1229	2023-01-05 16:12:47 +08:00
Harryxzy	708f1c396a	Merge branch 'fix/V3-can'tReCalcBug-0105' into release/2.5.3.2301.01	2023-01-05 15:44:21 +08:00
fcli	143de10689	Merge remote-tracking branch 'origin/fix/addUpSituationValidation' into release/2.5.3.2301.01	2023-01-05 15:42:39 +08:00
Harryxzy	dc08340c73	fix个税申报后无法重新核算bug	2023-01-05 11:50:01 +08:00
sy	ac99625e29	薪酬系统-福利台账，补缴新增社保缴纳明细保存问题修复	2023-01-05 09:53:26 +08:00
fcli	2d9ce61d5d	feat: 往期累计一键清空校验bug修复,分页解密时机修改	2023-01-05 09:49:25 +08:00
fcli	eb3c75197b	feat: 往期累计一键清空校验bug修复	2023-01-05 09:40:43 +08:00
fcli	8e0bf2b693	feat: 往期累计一键清空校验bug修复	2023-01-05 09:25:07 +08:00
sy	d25fc4a579	薪酬系统-福利台账，调差默认配置数据获取逻辑优化	2023-01-04 17:41:09 +08:00
sy	b786de5e4d	薪酬系统-福利档案，列表查询逻辑优化	2023-01-04 16:30:37 +08:00
sy	5f59ff399d	薪酬系统-福利台账，补缴功能优化只选社保或养老保险时的单位缴纳逻辑	2023-01-04 16:05:19 +08:00
fcli	3863a10c27	fix: 一月份不累计上年数据	2023-01-04 14:15:59 +08:00
sy	f53d788583	薪酬系统-福利档案，高级搜索功能支持根据个税扣缴义务人检索	2023-01-03 17:58:14 +08:00
钱涛	4a0a18bb07	修复考勤引用超出人员范围异常	2023-01-03 10:22:42 +08:00
sy	17e6e9d934	薪酬系统-福利台账，补缴获取指定月的缴纳基数，增加技术字符串判空，增加所属社保类字段	2023-01-03 10:09:14 +08:00
sy	19cca7a156	薪酬系统-福利台账，补缴获取指定月的缴纳基数，优化空数据处理	2022-12-30 18:20:10 +08:00
sy	e6e1637119	薪酬系统-福利台账，调差新增增加时判断是否已有调差数据的	2022-12-29 17:35:58 +08:00
Harryxzy	4726b9560c	Merge branch 'fix/V3-backItemImportBug-1229' into release/2.5.2.22.12.04	2022-12-29 15:05:40 +08:00
Harryxzy	dd03efaf9e	Merge branch 'feature/V3-salaryArchiveAddWorkCode-1229' into release/2.5.2.22.12.04	2022-12-29 15:04:18 +08:00
sy	ee72dcd3f0	薪酬系统-福利台账，调差列表展示默认数据时，处理核算人员外的默认人员数据逻辑优化	2022-12-29 14:43:54 +08:00
sy	ea763bd20c	Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountProcessDeal-1229' into release/2.5.2.22.12.04	2022-12-29 10:19:49 +08:00
sy	a9168afe58	薪酬系统-福利台账，初次核算前为台账项设置基础数值（socialPay,fundPay,otherPay）	2022-12-29 10:17:54 +08:00
sy	e4df660cd9	Merge branch 'feature/v3-siAccountProcessDeal-1229' into release/2.5.2.22.12.04	2022-12-29 10:07:22 +08:00
sy	42d57163a9	薪酬系统-福利台账，福利核算无核算人员时，直接进度完成	2022-12-29 10:05:52 +08:00
sy	7fba73d3f4	薪酬系统-福利台账，福利核算无核算人员时，直接进度完成	2022-12-29 09:24:07 +08:00
sy	84aeb5059f	薪酬系统-福利台账，调差方式3时的福利项	2022-12-28 17:01:15 +08:00
fcli	8ccc1a0ec3	Merge branch 'feature/加密方法&分页merge' into release/2.5.2.22.12.04	2022-12-28 15:43:33 +08:00
sy	2f4d580793	薪酬系统-福利台账，调差列表优化，默认配置带出单位缴费数据	2022-12-28 11:58:38 +08:00
sy	494462092d	薪酬系统-福利台账，补缴方式选择指定月的缴纳基数获取功能	2022-12-27 17:34:46 +08:00
sy	af15ffcc23	薪酬系统-福利台账，补缴新增功能改造v1	2022-12-27 14:01:08 +08:00
fcli	45292dfc4f	feat: null处理	2022-12-27 11:39:52 +08:00
Harryxzy	6262f62292	薪资回算Excel导入BUG	2022-12-26 23:17:32 +08:00
Harryxzy	d7127e29e4	薪资档案中默认显示工号	2022-12-26 14:58:41 +08:00
sy	c49017f63b	Merge branch 'feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03	2022-12-23 18:45:48 +08:00
sy	011d66e298	薪酬系统-福利台账，补差数据导入，过滤未启用福利项	2022-12-23 18:45:10 +08:00
sy	fe5847aed6	Merge branch 'feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03	2022-12-23 17:51:30 +08:00
sy	df2ac4754d	薪酬系统-福利台账，补差数据导入，缴纳费用非有效数值型数据，直接跳过	2022-12-23 17:50:12 +08:00
sy	cea78e6594	Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03	2022-12-23 16:35:33 +08:00
sy	5f4ddeabd4	薪酬系统-福利台账，补差数据待编辑数据过滤空值字段	2022-12-23 16:34:12 +08:00
sy	d2be8e86ea	Merge branch 'feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03	2022-12-22 09:09:00 +08:00
Harryxzy	43511f7922	Merge branch 'feature/V3-backItem-1215' into release/2.4.2.2212.03	2022-12-21 16:39:55 +08:00
sy	28d1d16844	薪酬系统-福利台账，补差数据参与薪资核算	2022-12-21 11:12:14 +08:00
钱涛	85739933a5	单次核算5000	2022-12-20 16:45:09 +08:00
sy	e75d0c5872	薪酬系统-福利台账，补差数据导入逻辑问题修复,福利类合计为0时，不允许补差其包含的福利项	2022-12-20 15:20:42 +08:00
sy	cd671b5ae2	薪酬系统-福利台账，补差数据导入逻辑问题修复	2022-12-20 09:25:55 +08:00
Harryxzy	07292531db	重新回算提示	2022-12-19 18:03:17 +08:00
sy	547e7cd662	薪酬系统-福利台账，补差数据导入时，拒绝对于未设置社保、公积金、其他福利的正常缴纳项进行补差	2022-12-19 17:26:44 +08:00
sy	2f10986e2b	薪酬系统-福利台账，重新核算时，保留已有补差数据，但是bill_batch统计信息只统计补差相关缴费数额，不统计补差相关人数信息	2022-12-19 14:47:49 +08:00
sy	53d48d63b0	薪酬系统-福利台账，补差新增数据时，过滤重复数据	2022-12-19 11:43:20 +08:00
Harryxzy	ddea8c9066	回算工资单发放调整	2022-12-19 11:12:26 +08:00
sy	8157cafc98	薪酬系统-福利档案，取消停缴功能，添加人员是否在对应的个税扣缴义务人下的判断	2022-12-19 10:01:32 +08:00
钱涛	6ce7ef0b7e	Merge branch 'hotfix/处理流程操作者' into release/2.4.2.2212.03	2022-12-16 17:58:03 +08:00
fcli	4b2549f420	Merge branch 'feature/加密方法&分页merge' into release/2.4.2.2212.03	2022-12-16 17:57:17 +08:00
Harryxzy	eaa9b7515f	工资单发放详情模板名称调整	2022-12-16 15:53:34 +08:00
Harryxzy	0ace75ab06	工资单发放模板展示	2022-12-16 14:55:11 +08:00
Harryxzy	82577f97e0	舍入规则保存错误	2022-12-16 11:22:43 +08:00
sy	69e0d7e441	薪酬系统-福利台账，补差tab添加	2022-12-16 11:13:28 +08:00
钱涛	2fbd66ac19	操作者	2022-12-16 10:32:45 +08:00
fcli	c70964a8e2	feat: 继承类问题修改	2022-12-16 10:18:26 +08:00
fcli	bf870cc9aa	feat: 继承类问题修改	2022-12-16 10:11:41 +08:00
fcli	8f39d5d12a	Merge branch 'feature/加密方法' into feature/加密方法&分页merge	2022-12-16 10:01:09 +08:00
fcli	78447c002b	feat: 继承类问题修改	2022-12-16 10:01:00 +08:00
fcli	5295821dc1	Merge branch 'feature/加密方法' into feature/加密方法&分页merge	2022-12-16 09:46:55 +08:00
fcli	68f9c8b9db	feat: 继承类问题修改	2022-12-16 09:46:39 +08:00
sy	237f42f2ae	薪酬系统-福利台账，核算进度条逻辑优化	2022-12-15 18:03:28 +08:00
sy	cf08bbd842	薪酬系统-福利台账，补差相关加解密替换为新方法	2022-12-15 17:11:38 +08:00
sy	0787fb4d05	Merge remote-tracking branch 'remotes/origin/release/2.4.1.2212.02' into feature/v3-siAccountBalance-1208 ... # Conflicts: # src/com/engine/salary/service/impl/SIAccountServiceImpl.java	2022-12-15 17:08:21 +08:00
钱涛	b59ba320df	人员去重	2022-12-15 16:59:00 +08:00
Harryxzy	b9b0a6f1c5	回算批量更新	2022-12-15 11:32:32 +08:00
Harryxzy	41a3583d61	修复回算按钮	2022-12-15 11:12:36 +08:00
Harryxzy	4ed3f47b36	薪资账套修改回算公式后不生效问题	2022-12-14 22:34:12 +08:00
Harryxzy	5f37281757	添加backcalctype	2022-12-14 18:21:25 +08:00
fcli	7f7f4442ca	Merge branch 'feature/加密方法' into feature/加密方法&分页merge	2022-12-14 14:56:24 +08:00
fcli	beeadfc35c	feat: 加解密处理	2022-12-14 14:55:57 +08:00
Harryxzy	4fa7f9a5e7	回算-加解密开关	2022-12-14 14:45:24 +08:00
Harryxzy	2136bbbd7f	Merge branch 'feature/加密方法&分页merge' into feature/V3-backItem-1215	2022-12-14 13:57:21 +08:00
Harryxzy	27602626cf	回算加密	2022-12-14 13:57:03 +08:00
fcli	b162afcbdd	Merge branch 'feature/加密方法' into feature/加密方法&分页merge	2022-12-14 13:51:22 +08:00
fcli	ad3f7595bd	feat: 空指针处理	2022-12-14 13:51:01 +08:00
Harryxzy	75220416bc	merge new解密	2022-12-14 12:32:42 +08:00
Harryxzy	0130b83f00	Merge branch 'feature/加密方法&分页merge' into feature/V3-backItem-1215 ... # Conflicts: # src/com/engine/salary/service/impl/SalarySendServiceImpl.java	2022-12-14 12:21:42 +08:00
fcli	d039781b74	feat: develop处理合并	2022-12-14 11:03:33 +08:00
fcli	dea2353ef2	Merge branch 'feature/变更分页' into feature/加密方法&分页merge ... # Conflicts: # src/com/engine/salary/biz/SIAccountBiz.java # src/com/engine/salary/biz/SalaryArchiveItemBiz.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/SpecialAddDeductionServiceImpl.java	2022-12-14 10:57:41 +08:00
fcli	d3de862d11	feat: 加密统一,薪资项目&社保档案详情...	2022-12-13 17:14:27 +08:00
sy	1e31dad7ad	薪酬系统-福利档案，待减员页面删除待办功能优化	2022-12-13 16:58:35 +08:00
Harryxzy	3b6418263f	薪资账套复制-薪资回算 ... 薪资核算-回算部分四舍五入	2022-12-13 16:39:39 +08:00
钱涛	4d677b4d58	mock公式运行	2022-12-13 16:13:45 +08:00
钱涛	c3cb3105fd	暂存	2022-12-13 10:53:43 +08:00
fcli	1c6acb497c	feat: 加密统一，累计附加扣除详细	2022-12-13 10:49:51 +08:00
fcli	eabc983100	feat: 加密统一，社保福利档案&薪资核算结果	2022-12-13 10:15:31 +08:00
sy	32cffdccf5	薪酬系统-福利档案，批量减员逻辑变更，自动减员逻辑变更，无福利方案时，不关注最终缴纳月	2022-12-12 17:53:05 +08:00
sy	1fb706b7da	薪酬系统-福利档案，删除待办功能添加批量处理逻辑	2022-12-12 16:55:22 +08:00
fcli	1431308cc5	feat: 加密统一，薪资核算结果	2022-12-12 16:42:44 +08:00
sy	1b376464c4	薪酬系统-福利档案，删除待办功能（待减员页面）	2022-12-12 15:43:12 +08:00
fcli	93db32b758	feat: 加密统一，累计附加扣除&社保福利模块	2022-12-12 15:40:01 +08:00
sy	ae72d25431	Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siAccountBalance-1208	2022-12-12 13:43:16 +08:00
钱涛	5e893160b4	加密方法	2022-12-12 10:36:06 +08:00
fcli	b58e71989d	feat: 统一修改到内存分页	2022-12-12 10:25:55 +08:00
钱涛	8dc2ddc3c8	加密方法	2022-12-12 09:37:15 +08:00
钱涛	309cb2047d	配置文件	2022-12-09 15:28:29 +08:00
sy	43157d25e3	薪酬系统-福利台账，补差列表v1	2022-12-09 14:50:29 +08:00
钱涛	77d3046966	所有个税扣缴义务人的树形	2022-12-08 17:48:46 +08:00
钱涛	30e8fd3733	流程中个税扣缴义务人已处理	2022-12-08 16:48:37 +08:00
fcli	8e2e85a986	Merge remote-tracking branch 'origin/release/2.3.2.2212.01' into release/2.3.2.2212.01	2022-12-08 16:43:06 +08:00
fcli	cc105ca051	Merge branch 'feat/SalarySendRange' into release/2.3.2.2212.01	2022-12-08 16:41:04 +08:00
fcli	269bfeee18	feat: 查询列表加快	2022-12-08 16:39:57 +08:00
fcli	89574f278b	feat: 查询列表加快	2022-12-08 16:31:16 +08:00
sy	0399731b9b	Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountCompensation-1201' into release/2.3.2.2212.01	2022-12-08 16:25:28 +08:00
sy	0210f6542f	薪酬系统-福利台账，补差数据删除v1	2022-12-08 16:23:18 +08:00
fcli	fcca6950ac	feat: 修复bug	2022-12-08 15:45:15 +08:00
Harryxzy	ce76bc8b43	薪资账套list返回个税扣缴义务人id	2022-12-08 15:42:21 +08:00
Harryxzy	8e573f8bd7	补发工资单详情查看	2022-12-08 15:25:16 +08:00
sy	ab6c0940c2	薪酬系统-福利台账，补差数据导出功能	2022-12-08 14:51:23 +08:00
钱涛	2c1421999b	Merge branch 'feature/扩展sql字符' into release/2.3.2.2212.01	2022-12-08 11:32:03 +08:00
钱涛	ea20dfb9ff	fix调薪action	2022-12-08 10:53:51 +08:00
钱涛	399563088d	流程生成人员范围	2022-12-08 10:49:51 +08:00
sy	979bb82661	薪酬系统-福利台账，调差数据保存时，增加新数据id信息的返回	2022-12-08 10:18:27 +08:00
sy	c94e28e68c	薪酬系统-福利台账，核算功能相关临时表数据删除逻辑优化	2022-12-08 10:10:48 +08:00
钱涛	fb39dbe0c4	流程生成人员范围	2022-12-07 20:16:14 +08:00
钱涛	0d417f1e49	流程生成人员范围	2022-12-07 20:15:52 +08:00
Harryxzy	aed596523f	公司单发放详情报错	2022-12-07 18:00:31 +08:00
sy	f31e176cab	薪酬系统-福利台账，billBatch统计数据刷新方法优化（不需要统计补差数据中的人数信息）	2022-12-07 17:50:25 +08:00
sy	ccfffc200e	薪酬系统-福利台账，补差数据导入功能	2022-12-07 17:09:53 +08:00
钱涛	5079753c34	sql测试	2022-12-07 16:19:22 +08:00
钱涛	f20cecf042	sql测试	2022-12-07 16:17:29 +08:00
钱涛	cdb7f3a0a2	sql测试	2022-12-07 15:47:35 +08:00
Harryxzy	ecda5027de	fix 回算归档	2022-12-07 15:27:20 +08:00
Harryxzy	c4b17974ae	fix 归档，薪资核算不存在BUG	2022-12-07 15:21:29 +08:00
Harryxzy	f89c5d2970	工资单模板编辑补发模板	2022-12-07 15:03:39 +08:00
Harryxzy	19022fc505	fix 编辑工资单模板，补发显示部分	2022-12-07 10:34:41 +08:00
钱涛	1e03eca738	单独调薪检查action	2022-12-07 09:17:31 +08:00
钱涛	b39587e19d	单独调薪action	2022-12-06 18:08:50 +08:00
Harryxzy	5078fa9b87	fix 工资单发放报错	2022-12-06 15:59:38 +08:00
sy	70a5854dc7	薪酬系统-福利台账，调差数据保存时，增加公司费用数值字段的校验	2022-12-06 15:40:40 +08:00
Harryxzy	c0d916c286	薪资回算功能，工资单部分	2022-12-06 15:29:08 +08:00
sy	3fa017b13a	薪酬系统-福利台账，补差福利项列表功能和补差模板导出功能	2022-12-06 11:44:04 +08:00
钱涛	11d1ee1a21	批量调薪action	2022-12-06 10:26:36 +08:00
钱涛	2f8f5f299e	批量调薪action	2022-12-06 09:52:55 +08:00
钱涛	5b1615675d	批量调薪action	2022-12-06 09:41:26 +08:00
fcli	2877d58a1f	feat: sqlserver bug修复	2022-12-05 17:51:28 +08:00
sy	bea06f1d88	薪酬系统-福利台账，可调差人员列表功能返回格式增加target字段	2022-12-05 16:56:05 +08:00
fcli	acab57aa36	feat: 撤回范围修复	2022-12-05 16:05:38 +08:00
钱涛	23dd15a568	批量调薪action	2022-12-05 16:01:08 +08:00
sy	a04f4a915f	薪酬系统-福利台账，可调差人员列表功能取消分页逻辑	2022-12-05 15:42:49 +08:00
fcli	ff7b1047bc	feat: 发放异常拦截	2022-12-05 14:06:22 +08:00
Harryxzy	fa6e41d62e	Merge branch 'fix/intSalaryArchiveFLOWOpenPermissions' into release/2.3.2.2212.01	2022-12-05 10:43:09 +08:00
Harryxzy	1b570fe1aa	放开管理员限制	2022-12-05 10:34:25 +08:00
Harryxzy	012d8dfb07	社保福利流程，放开个税扣缴义务人限制	2022-12-05 10:13:16 +08:00
sy	014190f6d0	薪酬系统-福利台账，补缴列表查询优化，增加缴纳状态筛选	2022-12-05 10:09:43 +08:00
Harryxzy	6fe28ec41c	定薪流程，放开个税扣缴义务人限制	2022-12-05 09:57:27 +08:00
fcli	4fa64c6a8f	feat: mapper异常修复	2022-12-05 09:52:05 +08:00
sy	33aa8ea507	薪酬系统-福利档案，档案数据通过导入excel入库前，根据人员id和个税扣缴义务人进行去重	2022-12-02 17:57:09 +08:00
Harryxzy	3ff3fd8e44	薪资回算-薪资核算部分（剩余核算归档）	2022-12-02 17:35:14 +08:00
sy	22a7258229	薪酬系统-福利台账，福利核算添加核算进度查询逻辑	2022-12-02 17:08:35 +08:00
钱涛	991338a10e	合计行异步处理	2022-12-02 16:58:19 +08:00
fcli	c7b3341a13	feat: 查询异常问题修改	2022-12-01 17:41:10 +08:00
钱涛	013f67469e	显示定制列的入职日期和离职日期	2022-12-01 14:33:21 +08:00
钱涛	ac0b0a7e25	公式提醒	2022-12-01 13:59:38 +08:00
sy	e462992206	薪酬系统-福利台账，社保调差撤回功能优化	2022-12-01 11:50:37 +08:00
sy	119640e272	薪酬系统-福利台账，在福利台账重新核算时，删除调差数据时增加人员id筛选	2022-12-01 10:50:34 +08:00
sy	da7b9d8e6a	薪酬系统-福利台账，社保调差数据删除逻辑，在福利台账重新核算时，删除已有调查记录	2022-12-01 10:22:47 +08:00
sy	5436742c74	薪酬系统-福利台账，社保调差列表查询功能优化	2022-11-30 17:57:25 +08:00
钱涛	6cffbf4db7	取消安全级别	2022-11-30 16:59:58 +08:00
sy	d3d2074aed	薪酬系统-福利台账，在社保核算月数据删除时，社保调差数据被删除	2022-11-30 15:55:23 +08:00
sy	4d01c324e0	薪酬系统-福利台账，社保调差保存功能优化	2022-11-30 15:05:24 +08:00
sy	ee7309ffd1	薪酬系统-福利台账，社保调差项公司支出费用统计功能优化，对于已存在调差项，给出提示，并且不进行计算	2022-11-30 14:07:28 +08:00
钱涛	a2ab9471be	核算记录id	2022-11-30 14:06:01 +08:00
钱涛	d8f99abb18	调薪，调薪校验流程接口	2022-11-30 11:23:58 +08:00
sy	a0bda933a1	薪酬系统-福利台账，社保调差项公司支出费用统计功能	2022-11-29 17:36:18 +08:00
sy	2ceeeb165f	薪酬系统-福利台账，社保调差列表v1	2022-11-29 15:33:57 +08:00
fcli	4f9e2d8f80	feat: 路径修改接近e10	2022-11-29 14:36:37 +08:00
sy	f68219ff87	薪酬系统-福利档案，高级搜索分部逻辑优化	2022-11-28 16:58:20 +08:00
sy	5486d3f849	薪酬系统-福利台账，社保调差字段类型调整	2022-11-28 16:25:52 +08:00
sy	d9c7a6c0e3	薪酬系统-福利台账，社保调差撤回v2	2022-11-28 15:50:52 +08:00
sy	8bc16ae470	Merge branch 'master' into feature/v3-siAccountCompensation-1201	2022-11-28 14:58:23 +08:00
sy	1747a613dd	薪酬系统-福利台账，社保调差撤回v1	2022-11-28 14:57:29 +08:00
sy	49466f9f3b	薪酬系统-福利台账，社保调差默认配置保存v1	2022-11-28 13:42:53 +08:00
sy	8d211c7db0	薪酬系统-福利台账，社保调差保存v1	2022-11-28 11:35:05 +08:00
钱涛	8f75380f67	扩展sql字符	2022-11-28 10:39:46 +08:00
sy	ff20acd15a	薪酬系统-福利台账，调差记录表po和配置表po	2022-11-28 09:55:29 +08:00
Harryxzy	85fef5c5f8	Merge branch 'master' into feature/V3-backItem-1215	2022-11-28 09:26:59 +08:00
钱涛	0b2c01fb4c	人员信息获取	2022-11-25 15:54:31 +08:00
钱涛	4b75ba67e9	人员分片	2022-11-25 14:48:49 +08:00
sy	dc69a479ec	Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountRecession-1117' into release/2.3.1.2211.04	2022-11-25 14:44:45 +08:00
sy	366c1a8367	薪酬系统-福利台账，退差数据保存优化，分批查询	2022-11-25 14:43:45 +08:00
sy	75a7497a07	Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountRecession-1117' into release/2.3.1.2211.04 ... # Conflicts: # src/com/engine/salary/mapper/datacollection/EmployMapper.java	2022-11-25 13:55:29 +08:00
sy	58c7374a64	薪酬系统-福利台账，退差数据导出，添加个税扣缴义务人筛选	2022-11-25 11:14:11 +08:00
fcli	fc81955b15	feat: 全部范围部分发放撤回功能	2022-11-25 10:53:23 +08:00
钱涛	8d43e20c84	Merge branch 'feature/同步人员' into release/2.3.1.2211.04	2022-11-25 10:44:21 +08:00
sy	eeea00a408	薪酬系统-福利台账，退差保存数据功能优化	2022-11-25 10:17:35 +08:00
sy	bc20d37797	薪酬系统-福利台账，退差保存数据来源增加个税扣缴义务人筛选	2022-11-24 20:35:51 +08:00
钱涛	7808019c43	新增核算时间变量	2022-11-24 17:33:48 +08:00
钱涛	832b40e40a	新增核算时间变量	2022-11-24 17:21:16 +08:00
sy	e412be8d5e	薪酬系统-福利台账，退差数据编辑、删除后，刷新bill_batch表中统计数据	2022-11-24 14:19:58 +08:00
sy	bbc58281f3	薪酬系统-福利台账，调差保存v2	2022-11-24 13:29:40 +08:00
sy	931b3d8a82	薪酬系统-福利台账，修改退差数据单条查看返回格式v2	2022-11-24 11:04:12 +08:00
sy	dfcd7d88b0	薪酬系统-福利台账，修改退差数据单条查看返回格式	2022-11-24 10:43:20 +08:00
钱涛	c2371ffcb3	取消缓冲时间	2022-11-24 10:30:00 +08:00
sy	a631ecc3d9	Merge branch 'feature/v3-siAccountRecession-1117' into feature/v3-siAccountCompensation-1201	2022-11-24 09:48:30 +08:00
sy	d976ede775	薪酬系统-福利台账，退差数据新增后，刷新bill_batch表中统计数据	2022-11-24 09:46:06 +08:00
sy	e736cee6fd	Merge branch 'feature/v2-addWelfareArchives-1117' into feature/v3-siAccountRecession-1117 ... # Conflicts: # src/com/engine/salary/service/SIAccountService.java # src/com/engine/salary/service/impl/SIAccountServiceImpl.java	2022-11-24 09:39:13 +08:00
sy	0f50520aa9	薪酬系统-福利台账，抽取bill_batch表中统计数据刷新方法	2022-11-24 09:31:44 +08:00
sy	27dd8b4450	薪酬系统-福利台账，调差保存v1	2022-11-24 09:17:08 +08:00
钱涛	c5aa1aded7	缓存类	2022-11-23 18:36:33 +08:00
钱涛	2ab7049fa0	单个核算	2022-11-23 18:30:53 +08:00
钱涛	5221c22b5c	优化公式选择档案项目和薪资项目	2022-11-23 17:02:17 +08:00
sy	f1bd574c81	薪酬系统-福利台账，调差v2	2022-11-23 15:39:42 +08:00
钱涛	6405610456	计划任务日志	2022-11-23 15:24:29 +08:00
sy	edf9e22d22	薪酬系统-福利台账，福利核算接口添加返回当前核算人id	2022-11-23 15:01:28 +08:00
sy	d81883e3d2	薪酬系统-福利台账，调差v1	2022-11-23 14:49:44 +08:00
钱涛	829375d314	同步人员范围定时任务	2022-11-22 16:14:54 +08:00
钱涛	1307f485eb	同步人员范围	2022-11-22 15:53:05 +08:00
钱涛	264edf1bf2	同步人员范围	2022-11-22 15:37:07 +08:00
Harryxzy	a53fa14a3d	Merge branch 'master' into feature/V3-backItem-MMdd	2022-11-22 14:37:15 +08:00
Harryxzy	036d2d540b	薪资回算-薪资账套部分	2022-11-22 14:36:59 +08:00
sy	2b29813f6b	薪酬系统-福利台账，退差数据导出	2022-11-22 13:35:09 +08:00
sy	d7a4b30185	薪酬系统-福利台账，退差数据不参与薪资核算	2022-11-22 10:26:34 +08:00
sy	7c299e6199	薪酬系统-福利台账，退差数据新增v4	2022-11-22 09:46:37 +08:00
sy	15477cc8d5	薪酬系统-福利台账，退差数据新增v3	2022-11-21 17:52:28 +08:00
Harryxzy	5a3f035a41	修复定薪流程姓名重复BUG	2022-11-21 17:19:12 +08:00
sy	aa7a3ced01	薪酬系统-福利台账，导入数据刷新统计数据优化	2022-11-21 16:53:00 +08:00
sy	955f8c255e	薪酬系统-福利台账，退差数据新增v2	2022-11-21 16:25:26 +08:00
sy	96a440a9a7	薪酬系统-福利台账，退差数据新增时的可选择人员列表v1	2022-11-21 15:27:15 +08:00
sy	9c897c87dd	Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siAccountRecession-1117	2022-11-21 09:54:44 +08:00
sy	e2a4a7157b	Merge remote-tracking branch 'remotes/origin/master' into feature/v2-addWelfareArchives-1117	2022-11-21 09:48:46 +08:00
sy	df76d24a39	薪酬系统-福利台账，退差数据编辑v1	2022-11-18 17:56:21 +08:00
sy	746ab58ed3	薪酬系统-福利台账，退差数据单条查看v2	2022-11-18 16:07:20 +08:00
Harryxzy	a5ae8c8ea6	回算薪资项（薪资账套部分），剩余处理历史数据	2022-11-18 14:20:18 +08:00
钱涛	9a9a9cdaf3	Merge branch 'feature/加锁221117' into release/2.2.2.2211.03	2022-11-17 19:05:55 +08:00
Harryxzy	188096f931	Merge branch 'fix/salaryArchiveNoDataNEW' into release/2.2.2.2211.03	2022-11-17 19:04:58 +08:00
钱涛	cc711bc411	修复加锁顺序	2022-11-17 19:04:42 +08:00
Harryxzy	f19e4c2569	fix发薪日期为一个月最后一天时，薪资档案不显示NEW	2022-11-17 19:03:59 +08:00
钱涛	d07ded883f	修复加锁顺序	2022-11-17 18:53:22 +08:00
Harryxzy	11c4b1e4f7	Merge branch 'feature/V3-editSalaryAdjustment-11-17' into release/2.2.2.2211.03	2022-11-17 18:35:12 +08:00
sy	47406b67c2	薪酬系统-福利档案，导入数据时，对于时间字符串，允许excel默认格式设置	2022-11-17 17:07:04 +08:00
钱涛	4779cc861e	相同itemid	2022-11-17 17:04:14 +08:00
Harryxzy	f762fd7030	调薪编辑、删除 放开校验限制	2022-11-17 16:51:07 +08:00
Harryxzy	57f8bb6a6a	fix immMAP	2022-11-17 16:30:29 +08:00
fcli	e6eaf96bcd	feat: 沿用上月增加校验	2022-11-17 15:39:39 +08:00
sy	e0175f3ae7	薪酬系统-福利档案，导入数据时，若设置了福利方案，则该福利类型的起始缴纳月必填	2022-11-17 15:32:43 +08:00
钱涛	10ffe88810	核算锁定	2022-11-17 15:17:49 +08:00
fcli	b03e5efbcf	feat: 沿用上月增加校验	2022-11-17 15:13:59 +08:00
fcli	0aa59757c5	feat: 沿用上月增加校验	2022-11-17 15:13:55 +08:00
sy	fee892e17b	薪酬系统-福利档案，导入数据在设置福利档案时，对其下未设置福利项数值的字段默认为0，并参与基数上下限校验	2022-11-17 15:08:30 +08:00
fcli	0f51d44cd4	Merge remote-tracking branch 'origin/release/2.2.2.2211.03' into release/2.2.2.2211.03	2022-11-17 14:43:59 +08:00
fcli	b3cd118c21	feat: 自动累计功能	2022-11-17 14:28:15 +08:00
fcli	5743fa2162	feat: 其他附加扣除沿用上月功能完成	2022-11-17 14:28:10 +08:00
Harryxzy	2bc1453ad8	Merge branch 'feature/V3-editSalaryAdjustment-11-17' into release/2.2.2.2211.03	2022-11-17 14:28:07 +08:00
fcli	0aabfcd68a	feat: 薪资范围需求	2022-11-17 14:25:10 +08:00
sy	57300125cd	薪酬系统-福利台账，正常缴纳/补缴导入时候，刷新台账统计	2022-11-17 13:39:50 +08:00
fcli	e8347b88cc	feat: 薪资范围问题	2022-11-17 11:11:58 +08:00
sy	4073907a2c	薪酬系统-福利台账，福利台账导入后刷新统计数据v1	2022-11-17 10:09:01 +08:00
Harryxzy	1eaef7fcd4	fix分页时，数据不显示	2022-11-17 09:53:40 +08:00
sy	e333f2acc2	薪酬系统-福利台账，福利档案福利基数字段显示问题	2022-11-17 09:36:00 +08:00
钱涛	271daf29be	批量锁定功能	2022-11-17 09:28:40 +08:00
Harryxzy	9f17c6e99a	fixBUG	2022-11-16 17:22:22 +08:00
sy	ad0b89b91a	薪酬系统-福利台账，退差数据单条查看v1	2022-11-16 17:02:54 +08:00
Harryxzy	1740c99df6	fix immutableBug	2022-11-16 16:47:09 +08:00
sy	002de586d5	薪酬系统-福利台账，退差数据列表功能v3	2022-11-16 16:14:21 +08:00
sy	7be9424f73	薪酬系统-福利台账，退差数据列表功能v2	2022-11-16 15:45:36 +08:00
Harryxzy	1e307e2f87	薪资回算，薪资账套中薪资回算项目展示	2022-11-16 15:18:43 +08:00
Harryxzy	1bcb02d2e0	fix薪资账套关闭状态下无法删除bug	2022-11-16 14:22:25 +08:00
Harryxzy	94f3c9720a	回算功能-fix mybatis报错	2022-11-16 14:13:50 +08:00
sy	a4924c19ee	薪酬系统-福利台账，退差数据列表功能v1	2022-11-16 14:05:43 +08:00
Harryxzy	00357cd9d8	回算功能-新建薪资账套默认	2022-11-16 10:32:05 +08:00
sy	ce37694a95	薪酬系统-福利台账，退差数据删除功能v1	2022-11-16 10:15:05 +08:00
sy	c339798dc8	薪酬系统-福利台账，退差数据导出功能v1	2022-11-16 09:48:17 +08:00
sy	b647089eaf	薪酬系统-福利台账，退差数据新增功能v1	2022-11-15 17:58:37 +08:00
Harryxzy	a3705c67a4	修改查看编辑调薪	2022-11-15 11:37:55 +08:00
sy	969bc6b413	薪酬系统-福利档案，福利档案新增接口v5	2022-11-15 11:13:16 +08:00
Harryxzy	323c1ec0e0	查看编辑调薪	2022-11-15 09:34:58 +08:00
fcli	daa3d4ca9f	feat: 薪资发放范围	2022-11-15 09:19:57 +08:00
Harryxzy	9dc6c61ed2	编辑调薪	2022-11-14 21:03:24 +08:00
sy	2e71ee7a35	薪酬系统-福利档案，福利档案新增接口v4	2022-11-14 10:22:15 +08:00
sy	f3dc63244f	薪酬系统-福利档案，福利档案新增接口v3	2022-11-11 11:15:33 +08:00
sy	86dbb87f1b	薪酬系统-福利档案，福利档案新增接口v2	2022-11-11 09:11:53 +08:00
sy	451968f122	Merge remote-tracking branch 'remotes/origin/master' into feature/v2-addWelfareArchives-1117	2022-11-11 08:56:30 +08:00
sy	647dd80a20	薪酬系统-福利档案，福利档案新增接口v1	2022-11-11 08:56:05 +08:00
Harryxzy	15749ecc10	Merge branch 'feature/V2-taxDeclarationSwitch-11-10' into release/2.1.3.2211.03 ... # Conflicts: # src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java	2022-11-10 11:25:01 +08:00
Harryxzy	c786dc2d14	个税申报功能-重启时间和薪资核算创建时间比较	2022-11-10 11:11:41 +08:00
Harryxzy	9dab99d3c5	个税申报功能-fix重启后回到开启	2022-11-10 10:28:03 +08:00
Harryxzy	1abd3d47f2	个税申报功能-重启状态前端展示开启	2022-11-10 10:14:29 +08:00
Harryxzy	3d4be3265e	个税申报功能-重启	2022-11-10 09:46:30 +08:00
fcli	459f7e5053	Merge branch 'feature/SpecialAddUpMerge' into release/2.1.3.2211.03	2022-11-10 09:33:22 +08:00
钱涛	f5622df8fe	Merge branch 'feature/report1110' into release/2.1.3.2211.03 ... # Conflicts: # src/com/engine/salary/sys/entity/param/AppSettingSaveParam.java # src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java	2022-11-09 19:03:14 +08:00
fcli	63ee9c9b8e	fix: 一键累计添加日期与校验	2022-11-09 18:57:28 +08:00
sy	23e7065403	Merge branch 'feature/v2-allAddLimit-1110' into release/2.1.3.2211.03	2022-11-09 17:42:15 +08:00
钱涛	b55c339bb0	获取上月数据	2022-11-09 17:26:51 +08:00
fcli	815e37e50b	fix: 一键累计添加日期与校验	2022-11-09 16:55:00 +08:00
Harryxzy	02a6ab11ce	Merge branch 'fix/CollectionDataLongCompare' into release/2.1.3.2211.03 ... # Conflicts: # src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java	2022-11-09 16:44:49 +08:00
Harryxzy	095a0665b8	Merge branch 'feature/V2-taxDeclarationSwitch-11-10' into release/2.1.3.2211.03	2022-11-09 16:12:35 +08:00
钱涛	e63c72f51e	逆向解密	2022-11-09 15:47:09 +08:00
fcli	bf75c3831f	fix: 一键累计添加日期	2022-11-09 15:39:00 +08:00
Harryxzy	e2e383bd79	数据采集-Fix数据采集Long类型判断	2022-11-09 15:36:07 +08:00
fcli	07f9976d63	fix: 加解密处理	2022-11-09 14:32:04 +08:00
fcli	0b26eeec7e	fix: 加解密处理	2022-11-09 14:32:00 +08:00
sy	2c691d1838	薪酬系统-福利档案增员问题修复	2022-11-09 11:25:46 +08:00
fcli	e3b7f7c732	fix: sql优化	2022-11-09 10:41:06 +08:00
fcli	dd5c2ba4ce	fix: 管理员可以编辑该扣缴义务人数据，其他人可以编辑本人数据&一键累计所有个税扣缴义务人下的人员	2022-11-09 10:41:00 +08:00
fcli	eb7311f0f3	fix: 管理员可以编辑该扣缴义务人数据，其他人可以编辑本人数据&一键累计所有个税扣缴义务人下的人员	2022-11-09 10:40:55 +08:00
fcli	07a07d2be8	feat: 专项附加扣除模块, 权限限制，导入导出优化，添加一键累计	2022-11-09 10:40:48 +08:00
fcli	9b77bf7139	feat: 专项附加扣除模块, 一键清空、分页bug等	2022-11-09 10:40:38 +08:00
fcli	92a6512dc8	feat: 专项附加扣除模块,去除月份，添加普通用户登录查看本人记录功能	2022-11-09 10:40:28 +08:00
fcli	fafc157e63	feat: 专项附加扣除模块	2022-11-09 10:40:19 +08:00
fcli	dffee9206f	feat: 专项附加扣除模块	2022-11-09 10:40:05 +08:00
fcli	171f726bd3	feat: 专项附加扣除模块	2022-11-09 10:40:01 +08:00
fcli	5e69d07b7c	feat: 专项附加扣除模块	2022-11-09 10:39:55 +08:00
Harryxzy	775580f994	---	2022-11-09 10:20:46 +08:00
sy	b66fe2b593	薪酬系统-福利档案导入，增加对社保、公积金、其他福利方案设置是否为正确的福利类型	2022-11-09 09:53:13 +08:00
Harryxzy	8a704a9f5b	个税申报开关-添加新建判断	2022-11-08 16:27:29 +08:00
Harryxzy	0630fb7b7d	个税申报开关-查询是否开启	2022-11-08 13:58:21 +08:00
Harryxzy	1fb96be58b	个税申报开关	2022-11-08 11:22:56 +08:00
钱涛	21ccf6cbcb	sql解密	2022-11-08 11:10:56 +08:00
钱涛	729389dcef	Merge branch 'release/2.1.3.2211.03' into feature/report1110	2022-11-08 09:33:00 +08:00
sy	defa7dacc3	薪酬系统-福利档案全量增员、全量减员添加个税扣缴义务人筛选逻辑	2022-11-07 17:15:42 +08:00
钱涛	457fe51239	处理薪资档案重复数据	2022-11-07 17:05:50 +08:00
钱涛	2da0455c46	修复薪资档案个税扣缴义务人不显示的问题 ... 处理历史数据改为异步	2022-11-07 15:11:24 +08:00
钱涛	f2fdbca8f7	脱敏表配置	2022-11-07 11:31:21 +08:00
sy	dc4f4d9032	薪酬系统-福利模块bug修复v11，基数上下限约束问题修复	2022-11-04 11:28:29 +08:00
sy	65aff3e5be	Merge remote-tracking branch 'remotes/origin/feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01	2022-11-04 11:08:54 +08:00
sy	f8aa2b423a	薪酬系统-福利模块bug修复v10，增量数据处理逻辑修复	2022-11-04 11:07:43 +08:00
钱涛	c3e6c9d83c	Merge remote-tracking branch 'origin/release/2.1.2.2211.01' into release/2.1.2.2211.01	2022-11-04 10:42:12 +08:00
钱涛	86e3214d8e	核算日志	2022-11-04 10:42:05 +08:00
sy	a331afe72d	Merge remote-tracking branch 'remotes/origin/feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01	2022-11-04 10:23:58 +08:00
sy	e09cc6955e	薪酬系统-福利模块bug修复v9，历史数据处理触发全量增员逻辑调整	2022-11-04 10:23:22 +08:00
sy	784399a936	Merge branch 'feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01	2022-11-04 09:18:37 +08:00
sy	49e1f7624f	薪酬系统-福利模块bug修复v8，历史数据处理触发全量增员逻辑调整，基数上下限逻辑调整	2022-11-04 09:17:49 +08:00
钱涛	5f749e4646	错误日志	2022-11-03 21:37:25 +08:00
sy	b1f1da3686	Merge remote-tracking branch 'remotes/origin/feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01	2022-11-03 21:05:44 +08:00
sy	d279884168	薪酬系统-福利模块bug修复v7	2022-11-03 21:04:47 +08:00
钱涛	f1f8ae53af	档案项目默认生效时间取起始缴纳日期	2022-11-03 19:32:51 +08:00
sy	25d87c3480	Merge branch 'feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01	2022-11-03 19:04:32 +08:00
sy	f6141a894e	薪酬系统-福利模块bug修复v6,历史数据生成为“待增员”，并触发一次全量增员	2022-11-03 19:03:41 +08:00
钱涛	0cd5f1d4d8	一键发薪bug	2022-11-03 17:16:37 +08:00
sy	51a181f3d1	薪酬系统-福利模块bug修复v5，根据福利方案id、险种id、缴纳对象、缴费状态查询明细	2022-11-03 17:05:11 +08:00
sy	35022f7d09	Merge branch 'feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01	2022-11-03 16:19:59 +08:00
sy	73289ecef3	薪酬系统-福利模块bug修复v4	2022-11-03 16:17:59 +08:00
sy	278a01de01	薪酬系统-福利模块bug修复v4	2022-11-03 16:17:03 +08:00
sy	f22b4be74d	Merge remote-tracking branch 'remotes/origin/feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01	2022-11-03 13:33:00 +08:00
sy	6571320e81	薪酬系统-福利模块bug修复v3	2022-11-03 13:32:31 +08:00
sy	7f4de3a209	Merge branch 'feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01	2022-11-03 13:24:12 +08:00
sy	1292aea8c7	薪酬系统-福利模块bug修复v2	2022-11-03 13:22:15 +08:00
sy	65208fb265	Merge remote-tracking branch 'remotes/origin/feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01	2022-11-03 11:37:03 +08:00
sy	b0d55cd227	Merge branch 'release/2.1.2.2211.01' into feature/v2-welHistoryDetail-1104	2022-11-03 11:15:51 +08:00
sy	40462d9fec	薪酬系统-福利模块bug修复v1	2022-11-03 11:14:59 +08:00
钱涛	54e64f58cb	申报表导出bug	2022-11-03 10:36:50 +08:00
sy	0c8c3b0c04	Merge branch 'feature/v2-welHistoryDetail-1104' into release/2.1.2.2211.01	2022-11-02 20:22:29 +08:00
sy	0895c653b0	薪酬系统-福利模块历史数据分片	2022-11-02 20:22:03 +08:00
钱涛	1f2c2433e4	Merge remote-tracking branch 'origin/release/2.1.2.2211.01' into release/2.1.2.2211.01	2022-11-02 20:10:28 +08:00
钱涛	c29ee34c1e	分片删除	2022-11-02 20:10:16 +08:00
sy	3f6b549789	薪酬系统-福利模块基数保存问题	2022-11-02 20:08:04 +08:00
sy	553564a6b6	薪酬系统-福利模块档案一对多-公积金/其他福利档案个税扣缴义务人默认设置	2022-11-02 19:28:56 +08:00
钱涛	33e2e0e933	修复冲突	2022-11-02 17:36:34 +08:00
fcli	8873224123	Merge remote-tracking branch 'origin/release/2.1.2.2211.01' into release/2.1.2.2211.01	2022-11-02 17:33:26 +08:00
fcli	11f0a2c418	Merge branch 'fix/089' into release/2.1.2.2211.01	2022-11-02 17:32:49 +08:00
fcli	59f030adf8	Merge branch 'fix/104' into release/2.1.2.2211.01 ... # Conflicts: # src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java	2022-11-02 17:32:42 +08:00
sy	d3a9d71942	Merge remote-tracking branch 'remotes/origin/feature/v2-welfareBaseLimit-1104' into release/2.1.2.2211.01	2022-11-02 17:30:37 +08:00
sy	3cbf9b10e5	Merge branch 'feature/v2-oneToMoreBaseInfo-1104' into release/2.1.2.2211.01	2022-11-02 17:30:21 +08:00
钱涛	28be5f8e41	Merge branch 'hotfix/工资单发放合并计税bug' into release/2.1.2.2211.01	2022-11-02 17:22:19 +08:00
钱涛	73c24bcac5	工资单发放合并计税bug	2022-11-02 17:20:34 +08:00
Harryxzy	b7597ee826	Merge branch 'feature/V2-editDataCollection-11-03' into release/2.1.2.2211.01	2022-11-02 16:00:20 +08:00
sy	ac241262f8	薪酬系统-福利档案展示问题修复	2022-11-02 14:14:12 +08:00
sy	18bf4a8c51	薪酬系统-福利档案福利基数变更触发基数上下限约束相关逻辑优化	2022-11-02 11:48:15 +08:00
Harryxzy	b2f4ac314a	fix-serverBug	2022-11-01 17:52:11 +08:00
sy	eda168e617	薪酬系统-福利档案列表功能中历史数据处理逻辑顺序调整	2022-11-01 17:37:47 +08:00
sy	51412603e5	薪酬系统-福利档案基数上下限相关逻辑	2022-11-01 17:17:33 +08:00
Harryxzy	5d97954e48	往期累计情况一键清空和删除所选	2022-10-31 19:21:13 +08:00
钱涛	4c1ccc1efb	Merge branch 'hotfix/1031' into release	2022-10-31 18:34:05 +08:00
钱涛	78392b50dd	修复权限问题	2022-10-31 18:29:39 +08:00
fcli	81d91a3a2c	fix: 我的调薪记录问题修改,设置分页默认值	2022-10-31 16:37:39 +08:00
sy	126a048a76	薪酬系统-福利档案选中导出功能优化	2022-10-31 16:30:59 +08:00
Harryxzy	e8ac395300	fix-专项附加扣除taxAgentId为空	2022-10-31 16:04:06 +08:00
sy	60652dfbde	薪酬系统-福利档案高级搜索增加分部字段及相关逻辑	2022-10-31 16:00:46 +08:00
Harryxzy	317fb5e8ac	数据采集-编辑前查看功能	2022-10-31 14:50:54 +08:00
sy	cfb682655e	薪酬系统-福利档案全部导出问题修复	2022-10-31 14:46:32 +08:00
钱涛	4d981a0aa0	fix in out 1000	2022-10-31 14:34:09 +08:00
sy	b28887bde9	薪酬系统-福利方案基数上下限v1	2022-10-31 14:18:53 +08:00
sy	9c54d1872f	Merge remote-tracking branch 'remotes/origin/feature/v2-baseInfoOneToMore' into feature/v2-oneToMoreBaseInfo-1104	2022-10-31 09:56:58 +08:00
Harryxzy	d525c59d6d	Merge branch 'feature/V2-editDataCollection-11-03-tempDev' into feature/V2-editDataCollection-11-03	2022-10-28 16:38:17 +08:00
Harryxzy	e046b7e3fe	fix 一键清空	2022-10-28 16:35:51 +08:00
Harryxzy	09d85bdab3	考勤引用=编辑	2022-10-28 16:15:51 +08:00
sy	d6ec6ca25d	薪酬系统-福利台账核算一对多改造，在正常缴纳和补缴核算功能中，获取带核算数据增加筛选项（个税扣缴义务人）	2022-10-28 15:25:58 +08:00
sy	ab6811b818	薪酬系统-福利台账线下对比，数据对比逻辑优化	2022-10-28 15:23:03 +08:00
sy	747ac233ad	薪酬系统-福利档案一对多改造，福利档案待减员数据oracle数据库获取失败问题修复	2022-10-28 15:21:38 +08:00
Harryxzy	1f29ac67eb	累计、其他免税、往期 新增、删除、一键清空、编辑功能	2022-10-28 14:08:27 +08:00
sy	541afcf303	薪酬系统-福利档案一对多改造，福利档案增量数据对于删除数据处理逻辑调整	2022-10-28 10:24:43 +08:00
钱涛	e4200ee9f2	定薪流程	2022-10-28 10:19:06 +08:00
钱涛	4d540e113b	fix xml bug	2022-10-28 10:03:23 +08:00
fcli	31982fc1db	fix: 工资单发放页高级搜索功能不生效	2022-10-28 09:39:31 +08:00
sy	54a3f31cc2	薪酬系统-福利档案一对多改造，福利档案增量数据处理功能逻辑调整	2022-10-27 18:21:53 +08:00
李栋	ce96bcf276	加密字段xml更新otherPaymentBaseString	2022-10-27 18:16:54 +08:00
Harryxzy	ddd0c49cdd	其他免税扣除-新增、删除所选、一键清空功能	2022-10-27 18:02:05 +08:00
sy	7b4bc74c0b	薪酬系统-福利档案一对多改造，福利档案增员功能逻辑调整	2022-10-27 18:00:05 +08:00
sy	825c72a892	薪酬系统-福利档案一对多改造，福利档案减员功能逻辑调整	2022-10-27 17:43:52 +08:00
sy	743bffb089	薪酬系统-福利档案一对多改造，福利档案编辑tab展示和保存相关逻辑调整	2022-10-27 16:23:54 +08:00
钱涛	104213fc04	1、提示优化 ... 2、导入模板 3、定薪流程	2022-10-27 15:17:22 +08:00
Harryxzy	a406eed4b9	累计专项附加扣除-新增、删除所选、一键清空功能	2022-10-27 13:59:11 +08:00
sy	85239c8e47	薪酬系统-福利档案一对多改造，社保/公积金/其他福利档案保存功能添加个税扣缴义务人筛选	2022-10-27 13:35:39 +08:00
sy	5daf7a1aff	Merge remote-tracking branch 'remotes/origin/develop' into feature/v2-baseInfoOneToMore	2022-10-26 20:02:54 +08:00
sy	78f1d02e6d	Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy	2022-10-26 19:04:06 +08:00
Harryxzy	934c0b8914	fixbug	2022-10-26 18:59:32 +08:00
sy	6227fef1c7	薪酬系统-福利档案改造，批量插入福利档案基础信息表	2022-10-26 18:57:23 +08:00
sy	47220181ec	薪酬系统-福利档案一对多改造v2	2022-10-26 18:51:36 +08:00
Harryxzy	c0bb94bf71	editDataCollection-2	2022-10-26 18:35:23 +08:00
钱涛	d72362f7b7	档案模板注释	2022-10-26 18:05:04 +08:00
fcli	6f09d25077	fix: 我的调薪记录问题修改	2022-10-26 17:48:59 +08:00
sy	5a408e8bfc	薪酬系统-福利档案一对多改造v1,档案删除逻辑修改，档案id获取逻辑修改	2022-10-26 15:08:17 +08:00
钱涛	7a817af154	档案导入	2022-10-26 13:46:36 +08:00
sy	7279cfae05	薪酬系统-福利档案改造，增量逻辑调整，已有待增员档案直接删除，已有待减员档案不处理	2022-10-24 15:48:34 +08:00
sy	f75e7ebf32	薪酬系统-福利档案改造，列表tab页导入逻辑调整，对已有其他个税扣缴义务人的员工福利档案，不进行导入处理	2022-10-24 14:13:26 +08:00
sy	0000e52433	薪酬系统-福利档案改造，增量数据处理逻辑调整，对已有其他个税扣缴义务人的员工福利档案，不进行增量处理	2022-10-24 14:12:28 +08:00
sy	b1122ae391	薪酬系统-福利档案改造，增量数据处理逻辑修复（待增员转换到停止缴纳）	2022-10-21 15:51:08 +08:00
sy	6941999a09	Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy	2022-10-21 15:23:43 +08:00
sy	44d79dd5df	薪酬系统-福利方案，复制方案和编辑方案时，增加对方案名称中的空格删除处理	2022-10-21 15:23:22 +08:00
sy	755aff52ba	薪酬系统-福利台账，修复线下对比列表排序问题	2022-10-21 14:15:03 +08:00
sy	3ad40774dd	薪酬系统-福利档案,编辑栏字段显示null问题修复	2022-10-21 10:27:32 +08:00
sy	59ba439290	薪酬系统-福利档案改造，福利台账补缴页补缴人员添加功能，增加校验福利档案状态是否为正在缴纳或待减员状态	2022-10-21 09:50:18 +08:00
sy	21a4159ffa	薪酬系统-福利档案改造，福利台账补缴页列表、导入模板带出数据和导出功能添加runStatus约束	2022-10-20 17:33:29 +08:00
sy	24e5c97197	薪酬系统-福利档案改造，福利台账正常缴纳页导入模板带出数据和导出功能添加runStatus约束	2022-10-20 16:29:49 +08:00
sy	2a7c6cac42	薪酬系统-福利档案改造，福利台账线下对比列表仅展示处于在缴人员的数据	2022-10-20 16:08:48 +08:00
李栋	36ab692f9c	Merge remote-tracking branch 'origin/develop' into develop	2022-10-20 14:27:41 +08:00
sy	99e0c22b4b	薪酬系统-福利档案改造，添加个税扣缴义务人删除人员时，待增员转为停止缴纳的逻辑	2022-10-20 14:09:36 +08:00
sy	2a6d556929	薪酬系统-福利台账核算和正常缴纳人员列表功能添加基础信息表runStatus字段的筛选逻辑	2022-10-20 11:27:27 +08:00
钱涛	a2716c4330	处理档案重复生成的问题	2022-10-19 13:36:31 +08:00
李栋	aead513c9c	Merge branch 'develop' into dev-LeeD ... # Conflicts: # src/com/engine/salary/encrypt/AESEncryptUtil.java	2022-10-19 11:26:24 +08:00
钱涛	705a28e563	Merge remote-tracking branch 'origin/develop' into develop	2022-10-19 09:41:48 +08:00
钱涛	61a35854b9	Merge branch 'feature/archive' into develop	2022-10-19 09:41:31 +08:00
钱涛	0e6ec32c12	档案导出	2022-10-19 09:39:01 +08:00
李栋	039c789181	薪资档案加密设置	2022-10-19 09:25:45 +08:00
李栋	9b9daab149	薪资档案加密设置	2022-10-18 18:02:04 +08:00
李栋	f45dac865c	薪资档案加密设置复原	2022-10-18 18:01:17 +08:00
李栋	30eb74c97c	Merge branch 'develop' into dev-LeeD	2022-10-18 17:16:55 +08:00
钱涛	47e390eb28	Merge branch 'feature/archive' into develop	2022-10-18 16:47:54 +08:00
钱涛	1f48539e1c	删除待定薪代办 ... 删除待停薪代办	2022-10-18 16:44:31 +08:00
李栋	b577295a5d	薪资档案加密设置复原	2022-10-18 15:42:49 +08:00
sy	a371ccc992	Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy	2022-10-18 15:33:46 +08:00
sy	e59627776d	薪酬系统-福利档案结构改造，社保、公积金、其他福利信息编辑后的保存功能优化	2022-10-18 15:33:27 +08:00
钱涛	6edd65a77e	Merge branch 'feature/archive' into develop	2022-10-18 15:04:45 +08:00
钱涛	a29670d752	修复停薪	2022-10-18 15:04:29 +08:00
李栋	9b119a43df	薪资档案加密设置多余字段	2022-10-18 11:42:54 +08:00
sy	833163f77a	Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy	2022-10-18 10:52:52 +08:00
钱涛	4b37775f78	档案发薪设置	2022-10-18 09:43:58 +08:00
李栋	95dc67e067	Merge branch 'dev-LeeD' into develop	2022-10-17 19:04:36 +08:00
李栋	679e13c310	薪资档案加密设置bug	2022-10-17 19:04:14 +08:00
sy	b04a9d39de	薪酬系统-福利档案结构改造，正在缴纳页导入功能优化	2022-10-17 17:53:05 +08:00
sy	dad2751490	Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy	2022-10-17 17:24:51 +08:00
sy	21fa422350	薪酬系统-福利档案结构改造，取消停缴功能优化和导入功能添加runStatus条件	2022-10-17 17:24:40 +08:00
李栋	ab074a0354	薪资档案加密设置bug	2022-10-17 14:18:01 +08:00
李栋	40720fc3e9	薪资档案加密设置bug	2022-10-17 14:15:20 +08:00
李栋	b11ef914b5	薪资档案加密设置bug	2022-10-17 13:53:37 +08:00
李栋	1910a77ce1	薪资档案加密设置	2022-10-17 11:46:59 +08:00
李栋	5c3fe06b62	Merge branch 'develop' into dev-LeeD	2022-10-17 11:14:33 +08:00
李栋	fc94b50c60	薪资档案加密设置	2022-10-17 11:14:21 +08:00
sy	b16133f61a	Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy	2022-10-17 10:13:59 +08:00
sy	8fa59c2cf9	薪酬系统-福利档案结构改造，增员、减员接口返回结果格式调整	2022-10-17 10:13:38 +08:00
钱涛	5102d51b09	Merge branch 'feature/archive' into develop	2022-10-17 10:03:58 +08:00
sy	8d9a00bfff	薪酬系统-福利档案结构改造，取消停缴、增员、减员接口入参格式调整	2022-10-14 18:00:22 +08:00
sy	3d714c2b8d	Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy	2022-10-14 16:34:25 +08:00
sy	8a0e72f99c	薪酬系统-福利档案结构改造，档案列表接口返回结果优化	2022-10-14 16:34:10 +08:00
钱涛	77fc944491	获取保存档案配置表单 ... 保存档案配置	2022-10-14 16:18:55 +08:00
Harryxzy	5233c85c81	Merge branch 'origin/feature/updateAndDeleteCustomCategory_xzy' into develop	2022-10-14 15:32:30 +08:00
Harryxzy	989dd13216	xzy-修改自定义福利名称	2022-10-14 15:17:56 +08:00
sy	4701c4de5c	Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy	2022-10-14 14:31:35 +08:00
sy	e61d4f21c7	薪酬系统-福利档案结构改造，待减员页面的减员功能	2022-10-14 14:31:09 +08:00
Harryxzy	ab4565f5ce	xzy-编辑自定义福利	2022-10-13 20:38:05 +08:00
sy	0e6520f838	薪酬系统-福利档案结构改造，批量更改福利档案状态功能和取消停缴功能	2022-10-13 17:36:15 +08:00
钱涛	0e05185599	操作接口	2022-10-13 16:24:59 +08:00
sy	b1cdeb0a4f	薪酬系统-福利档案结构改造，福利档案中增量数据自动处理功能v2	2022-10-13 16:04:54 +08:00
sy	1aaa8ce43e	Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy	2022-10-13 14:58:42 +08:00
钱涛	68076fc724	fix sqlserver增量数据空	2022-10-13 14:57:52 +08:00
sy	053ac67604	Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy	2022-10-13 14:45:38 +08:00
sy	fd63c16b93	薪酬系统-福利档案结构改造，福利档案中增量数据自动处理功能	2022-10-13 14:45:18 +08:00
sy	8d26f2ac46	薪酬系统-福利档案结构改造，福利档案中待减员数据自动处理功能	2022-10-12 17:17:06 +08:00
李栋	918441fb38	薪资档案加密设置加进度	2022-10-12 14:36:21 +08:00
李栋	708a947449	薪资档案加密设置加进度	2022-10-12 14:24:01 +08:00
李栋	3026833d2b	薪资档案加密设置更新	2022-10-12 11:17:30 +08:00
李栋	9ebe1acda9	薪资档案加密设置更新	2022-10-12 10:55:39 +08:00
李栋	df20bc83e4	薪资档案加密设置更新	2022-10-12 10:44:39 +08:00
sy	187508c0f9	薪酬系统-福利档案结构改造，福利档案各tap页记录数统计功能	2022-10-12 10:38:41 +08:00
李栋	2677d40503	Merge branch 'develop' into dev-LeeD	2022-10-11 17:41:12 +08:00
李栋	9f651b173e	薪资档案加密设置更新	2022-10-11 17:41:00 +08:00
钱涛	4e06cd585e	Merge remote-tracking branch 'origin/develop' into develop	2022-10-11 15:07:47 +08:00
sy	0688b86cc2	Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy	2022-10-11 14:50:12 +08:00
sy	e86dba922a	薪酬系统-福利档案结构改造，runStatus字段获取问题修复	2022-10-11 14:49:54 +08:00
钱涛	a18b008581	Merge branch 'develop' into feature/archive	2022-10-11 14:43:21 +08:00
李栋	dc541e8e00	Merge branch 'develop' into dev-LeeD	2022-10-11 09:40:32 +08:00
李栋	7960f74308	薪资档案加密设置更新	2022-10-11 09:40:23 +08:00
sy	b2284d6669	Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy	2022-10-11 09:03:46 +08:00
钱涛	ab575db152	Merge branch 'develop' into feature/archive	2022-10-10 17:36:29 +08:00
李栋	dea9fffe7e	Merge branch 'dev-LeeD' into develop	2022-10-10 17:34:37 +08:00
李栋	e384c6c1c3	薪资档案加密设置更新	2022-10-10 17:29:36 +08:00
李栋	4a9a3bcd83	Merge remote-tracking branch 'origin/develop' into develop	2022-10-10 17:16:00 +08:00
李栋	f8d151e639	薪资档案加密设置更新	2022-10-10 17:15:20 +08:00
sy	a7b47a8bfe	薪酬系统-福利档案结构改造，档案列表导出增加runstatus条件、并将导入和历史数据生成的福利档案基础信息的默认runStatus置为2	2022-10-10 17:11:44 +08:00
钱涛	2de432dc03	Merge remote-tracking branch 'origin/develop' into develop	2022-10-10 17:08:28 +08:00
钱涛	212631c9e5	Merge branch 'hotfix-1010' into develop	2022-10-10 17:08:22 +08:00
钱涛	c5870f17a2	处理考勤值为空	2022-10-10 17:07:51 +08:00
sy	b24c08474c	薪酬系统-福利档案结构改造，档案列表接口入参将runStatus调整为runStatuses，并修改对应逻辑	2022-10-10 16:58:43 +08:00
李栋	4b30bca5d1	薪资档案加密设置更新	2022-10-10 16:44:17 +08:00
李栋	a9c0168a69	Merge branch 'develop' into dev-LeeD	2022-10-10 16:43:00 +08:00
Harryxzy	f217867969	xzy-fix-salarysobutil	2022-10-10 16:41:01 +08:00
钱涛	9781b67ddb	Merge branch 'develop' into feature/archive	2022-10-10 15:41:31 +08:00
钱涛	824c3ca565	薪资列表	2022-10-10 15:40:51 +08:00
钱涛	816885609d	薪资列表	2022-10-10 15:15:23 +08:00
钱涛	41203342d0	薪资列表	2022-10-10 14:58:29 +08:00
李栋	5a613183d7	Merge branch 'develop' into dev-LeeD	2022-10-10 14:55:46 +08:00
李栋	bf494588f7	薪资档案加密设置更新	2022-10-10 14:55:36 +08:00
sy	ed00d3fe89	薪酬系统-福利档案结构改造，福利台账核算中的补缴人元添加时判断是否已存在福利档案的数据源调整为福利档案基础信息表	2022-10-10 14:20:02 +08:00
sy	d6c6f446a9	薪酬系统-福利档案结构改造，恢复社保、公积金、其他福利档案表在档案导入时的个税扣缴义务人设置逻辑	2022-10-10 11:49:18 +08:00
sy	49502a2f70	薪酬系统-福利档案结构改造，通过福利档案人员状态枚举类设置档案基础信息的runStatus字段值	2022-10-10 11:27:08 +08:00
Harryxzy	5c4380cbe0	xzy-fix-薪资档案中人员范围更新时bug	2022-10-10 10:53:51 +08:00
sy	a80c92c907	薪酬系统-福利档案结构改造,福利台账核算对于个税扣缴义务人的匹配源调整为福利档案基础信息表	2022-10-10 10:11:30 +08:00
李栋	f0b2c73cb6	Merge branch 'develop' into dev-LeeD	2022-10-10 10:01:09 +08:00
李栋	4f4535778e	薪资档案加密设置	2022-10-10 10:00:59 +08:00
sy	02d1822cff	Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy	2022-10-10 09:53:16 +08:00
钱涛	ed454da0f0	福利档案状态枚举	2022-10-10 09:49:22 +08:00
钱涛	5431ed9506	历史数据处理	2022-10-10 09:47:09 +08:00
李栋	c92f4f0b28	Merge branch 'develop' into dev-LeeD	2022-10-10 09:44:03 +08:00
李栋	60396e90a3	薪资档案加密设置	2022-10-10 09:43:57 +08:00
sy	9b1c6222ed	Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy	2022-10-10 09:37:03 +08:00
sy	85d46938da	薪酬系统-福利档案导入改造，增加基础信息表数据插入逻辑	2022-10-10 09:36:34 +08:00
Harryxzy	7c358fe3a0	xzy-fix-薪资档案中默认人员范围	2022-10-09 17:51:30 +08:00
Harryxzy	8c4050fe73	xzy-fix-薪资账套人员状态传参问题	2022-10-09 15:20:04 +08:00
sy	7ac7d58a5f	薪酬系统-福利档案列表查询改造	2022-10-09 15:12:54 +08:00
Harryxzy	e3a2a52ab8	xzy-fix-薪资账套人员错误问题	2022-10-09 13:32:05 +08:00
钱涛	1f0bf061dd	历史数据处理	2022-10-09 10:55:35 +08:00
sy	ad16c96910	薪酬系统-福利档案基础信息表实体和mapper	2022-10-09 09:22:37 +08:00
Harryxzy	b2b0abcaf5	xzy-fix-处理Employee_statuses历史数据	2022-10-08 17:21:38 +08:00
Harryxzy	6dcecfb1c1	xzy-fix-薪资账套	2022-10-08 16:00:08 +08:00
钱涛	4a20105260	Merge branch 'develop' into feature/archive	2022-10-08 11:42:54 +08:00
sy	7ffd295be0	Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport	2022-10-08 09:14:54 +08:00
钱涛	521801849f	兼容5.7	2022-10-08 09:14:13 +08:00
sy	98a297ef27	薪酬系统-福利台账-正常缴纳导入模板数据未带出问题修复	2022-09-30 15:40:15 +08:00
sy	2f0090d3a0	薪酬系统-福利档案，福利档案按照工号查询无法实现模糊查询bug修复	2022-09-30 14:14:39 +08:00
sy	dad3197c3a	薪酬系统-福利档案，导入模板表头字段提示bug修复	2022-09-30 11:44:51 +08:00
sy	2725fc8444	薪酬系统-福利台账，线下对比导入取消表id自增，修改对比数据查询参数格式	2022-09-30 10:55:46 +08:00
sy	0cfd2fc081	Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport	2022-09-29 17:32:22 +08:00
sy	1e476e06a5	薪酬系统-福利台账，线下对比结果列表导出v1	2022-09-29 17:32:04 +08:00
李栋	96684b8ea3	Merge branch 'feature-LeeD' into develop	2022-09-29 16:21:22 +08:00
李栋	35e75dbba0	薪资档案引用时不能删除	2022-09-29 16:21:02 +08:00
钱涛	5285e518d9	fix核算合计	2022-09-29 15:34:21 +08:00
sy	5f9d929865	Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport	2022-09-29 15:11:31 +08:00
sy	a44a48450b	薪酬系统-福利台账，线下对比结果列表开发优化v1	2022-09-29 15:11:13 +08:00
sy	44e4afbf72	Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport ... # Conflicts: # src/com/engine/salary/mapper/InsuranceExportMapper.java # src/com/engine/salary/mapper/InsuranceExportMapper.xml # src/com/engine/salary/service/impl/SIAccountServiceImpl.java	2022-09-29 11:29:17 +08:00
钱涛	c270ecac82	新建福利方案去除名字空格	2022-09-29 11:16:56 +08:00
sy	cec887a214	薪酬系统-福利台账，线下对比结果列表开发	2022-09-29 11:13:49 +08:00
钱涛	919d08a496	修复工资单查询	2022-09-29 10:28:46 +08:00
钱涛	92b2774ebf	三个数据采集模块删除无效的查询条件	2022-09-29 10:03:51 +08:00
钱涛	f8bb262906	档案	2022-09-29 09:32:29 +08:00
钱涛	d20ebb5a2a	Merge branch 'develop' into feature/archive	2022-09-28 17:19:54 +08:00
钱涛	346445c70d	核算合计功能	2022-09-28 16:59:51 +08:00
钱涛	e0d68d6417	档案状态	2022-09-28 15:11:15 +08:00
钱涛	e48f576617	显示应用设置接口	2022-09-28 10:08:51 +08:00
钱涛	dfeb3fc5e4	修复薪资档案导出全部	2022-09-28 09:26:26 +08:00
钱涛	321b6ef0b2	修复重新核算会删除申报表	2022-09-27 18:20:40 +08:00
sy	1a60f36778	薪酬系统-福利台账，线下对比excel数据在入库前进行部分字段加密处理	2022-09-27 17:54:24 +08:00
钱涛	23a1396c12	核算列表求和	2022-09-27 17:43:43 +08:00
sy	78ce712116	薪酬系统-福利台账，线下对比excel数据导入功能	2022-09-27 17:36:06 +08:00
钱涛	1d635f1423	核算列表求和	2022-09-27 15:47:13 +08:00
钱涛	72c1d2b463	fix排序	2022-09-27 14:28:21 +08:00
sy	bd3e44442d	薪酬系统-福利台账，正常缴纳导出添加工号信息	2022-09-27 11:39:57 +08:00
钱涛	08ac0e8b84	fix离职日期	2022-09-27 10:57:02 +08:00
sy	314dc8803c	薪酬系统-福利台账，正常缴纳线下对比模板下载功能	2022-09-27 10:55:57 +08:00
钱涛	66a39a07a3	Merge branch 'feature/order' into develop ... # Conflicts: # src/com/engine/salary/biz/SIAccountBiz.java	2022-09-27 10:25:12 +08:00
钱涛	e2db30c816	排序	2022-09-27 10:19:09 +08:00
钱涛	6e726366ad	排序	2022-09-26 18:51:17 +08:00
sy	0a900905bd	薪酬系统-数据采集-累计专项附加扣除、往期累计情况、考勤引用三处导入模板均增加基本信息的带出	2022-09-26 13:46:43 +08:00
钱涛	55945a9186	薪资档案排序	2022-09-26 13:45:32 +08:00
sy	ccd0d5a358	Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport	2022-09-23 16:09:03 +08:00
sy	e6c2dd502c	薪酬系统-数据采集-其他免税扣除导入模板带出数据重复bug修复	2022-09-23 16:08:41 +08:00
sy	2d11bad723	薪酬系统-社保福利台账-核算-补缴项删除功能bug修复	2022-09-23 16:07:10 +08:00
sy	d38a50cc56	薪酬系统-社保福利台账-核算-补缴人员新建，添加人员是否已有社保档案校验	2022-09-23 11:37:56 +08:00
Harryxzy	600cb3c37f	xzy-fix-社保福利台账添加补缴时核算人数错误问题	2022-09-23 11:37:24 +08:00
Harryxzy	df15afc29e	xzy-fix-社保福利台账总览中人数计算0.0问题	2022-09-22 17:39:32 +08:00
钱涛	31317fe8ac	福利台账列表人数统计	2022-09-22 17:01:21 +08:00
钱涛	89893288e9	补缴未设置档案产生的bug	2022-09-22 16:48:59 +08:00
Harryxzy	8dc2db8729	xzy-fix-社保福利台账人数核算	2022-09-22 16:14:42 +08:00
钱涛	6717a8235a	我的薪资福利翻页问题	2022-09-22 16:04:48 +08:00
钱涛	6ee777ebb5	fix线下对比翻页问题	2022-09-22 15:31:28 +08:00
sy	1e9ad0727e	Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport	2022-09-22 14:49:30 +08:00
sy	3452f9ab96	薪酬系统-社保福利台账-核算-删除功能优化	2022-09-22 14:49:12 +08:00
钱涛	68142b4bbb	补缴必填校验	2022-09-22 14:25:50 +08:00
sy	83d5533322	Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport	2022-09-22 14:01:12 +08:00
sy	e75c7eefab	薪酬系统-社保福利档案-高级搜索工号搜索不生效bug修复	2022-09-22 13:59:55 +08:00
钱涛	7e2463cf10	人员状态枚举适配	2022-09-22 11:54:10 +08:00
钱涛	1573fc5bcf	人员状态枚举适配	2022-09-22 11:42:02 +08:00
sy	f10a320a62	Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport	2022-09-22 11:15:12 +08:00
sy	49e3b77995	薪酬系统-薪资档案-初始化导入模板表头属性优化	2022-09-22 10:25:31 +08:00
钱涛	b812454cd3	人员校验规则	2022-09-22 10:10:18 +08:00
Harryxzy	26c3f4580e	Merge branch 'origin/feature/salarySobCopyHide_xzy' into develop	2022-09-22 09:39:22 +08:00
Harryxzy	f2b83bf837	xzy-删除薪资账套时，删除对应的薪资项目隐藏信息	2022-09-22 09:35:52 +08:00
Harryxzy	d647f9fcc3	xzy-复制薪资账套时，复制薪资项目隐藏选项	2022-09-22 09:06:53 +08:00
钱涛	63c7577ef8	工资单不显示空项功能	2022-09-21 19:13:17 +08:00
钱涛	f779b1bb11	工资单不显示空项功能	2022-09-21 19:08:44 +08:00
sy	0003057021	Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport	2022-09-21 17:27:22 +08:00
sy	b2ea7ebd29	薪酬系统-人员匹配枚举类	2022-09-21 17:26:49 +08:00
Harryxzy	4c7216e0bf	Merge branch 'origin/fix/socialBonusUserCount_xzy' into develop	2022-09-21 15:54:40 +08:00
Harryxzy	06175bfa82	xzy-fix-社保福利台账中总览人数不正确问题	2022-09-21 15:52:36 +08:00
sy	de150e063e	薪酬系统导入方式配置-人员筛选方法类调用优化以及调整相关调用该方法的代码	2022-09-21 15:49:55 +08:00
钱涛	a1cecd4041	申报表日志	2022-09-21 14:58:59 +08:00
sy	ad3a2b4f69	Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport	2022-09-21 14:48:49 +08:00
sy	ad79cb2b3e	薪酬系统导入方式配置-数据采集-考勤引用-导入,添加导入人员筛选配置化处理	2022-09-21 14:47:26 +08:00
钱涛	d27e4685c5	方案过滤异常	2022-09-21 14:42:39 +08:00
sy	87b2bab9a9	薪酬系统导入方式配置-数据采集-往期累计情况-导入,添加导入人员筛选配置化处理	2022-09-21 13:57:58 +08:00
钱涛	57e4360030	通过员工id导入	2022-09-21 13:40:43 +08:00
sy	d49d187506	薪酬系统导入方式配置-数据采集-其他免税扣除-导入,添加导入人员筛选配置化处理	2022-09-21 13:38:06 +08:00
钱涛	19ea334d57	获取员工信息方法	2022-09-21 11:52:06 +08:00
钱涛	0045a0dd59	福利的重新核算功能异常	2022-09-21 11:12:05 +08:00
sy	b06eae55d8	Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport	2022-09-21 10:47:49 +08:00
sy	78d1bf0554	薪酬系统-福利台账导入数据允许出现负数	2022-09-21 10:47:07 +08:00
钱涛	c08a660fa0	调薪异常	2022-09-20 19:07:56 +08:00
Harryxzy	550eec9198	Merge branch 'origin/fix/oracle_accountingArchive_xzy' into develop	2022-09-20 18:03:31 +08:00
Harryxzy	5c80188165	xzy-fix-oracle数据库中薪资核算归档时报错	2022-09-20 18:03:07 +08:00
钱涛	90c18ec201	定薪	2022-09-20 18:02:45 +08:00
钱涛	22b03f8f7e	调薪	2022-09-20 17:38:21 +08:00
sy	a2b936ba23	Merge branch 'feature/checkImport' into develop	2022-09-20 16:56:59 +08:00
sy	16d141980d	薪酬系统-人员匹配方式枚举类	2022-09-20 16:56:40 +08:00
sy	d64b73290a	薪酬系统-薪资档案调薪导入，关闭部分调整数据前后一致校验	2022-09-20 16:54:42 +08:00
sy	b8a87d2fd8	Merge remote-tracking branch 'origin/develop' into develop	2022-09-20 16:37:21 +08:00
sy	546e976543	薪酬系统-福利台账-补缴导入,新旧数据整合bug修复	2022-09-20 16:36:01 +08:00
钱涛	f302654d0a	排序	2022-09-20 16:32:52 +08:00
Harryxzy	1db57838eb	Merge branch 'origin/feature/addedemployeeExport' into develop	2022-09-20 16:19:22 +08:00
Harryxzy	183e63140a	xzy-月度绩效环比增加人员导出功能	2022-09-20 16:18:43 +08:00
钱涛	8ef4c37112	Merge remote-tracking branch 'origin/develop' into develop	2022-09-20 15:47:28 +08:00
钱涛	f8f50380f7	排序	2022-09-20 15:47:22 +08:00
sy	5a1f92c3f0	Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport	2022-09-20 15:27:11 +08:00
sy	882b1306b0	薪酬系统-薪资档案导入bug修复	2022-09-20 15:26:47 +08:00
钱涛	3a91225d65	排序	2022-09-20 15:07:42 +08:00
sy	5b74873a6e	Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport	2022-09-20 10:34:43 +08:00
sy	7f557903a8	薪酬系统-福利台账-补缴导入	2022-09-20 10:13:05 +08:00
Harryxzy	5866136334	Merge branch 'origin/fix/archivePower' into develop	2022-09-20 09:41:04 +08:00
Harryxzy	2c795fe94a	xzy-fix-社保福利中社保方案、公积金方案等选择权限问题	2022-09-20 09:20:17 +08:00
钱涛	f678aa46d6	薪资档案排序	2022-09-19 18:21:34 +08:00
sy	7120d80689	薪酬系统-福利台账-补缴导入模板开发	2022-09-19 17:59:12 +08:00
钱涛	bc1e874a1c	Merge remote-tracking branch 'origin/develop' into develop ... # Conflicts: # src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java	2022-09-19 16:45:10 +08:00
钱涛	830e099b57	排序规则	2022-09-19 16:44:32 +08:00
Harryxzy	44b3c76a8e	xzy-同比增加人员	2022-09-19 16:05:59 +08:00
sy	ff4884fbb9	Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport	2022-09-19 15:13:42 +08:00
sy	f54481bbf1	薪酬系统-福利台账补缴功能开发v1	2022-09-19 15:13:30 +08:00
sy	b0cc2cc19d	薪酬系统导入方式配置-人员匹配全局配置的confValue默认设为0	2022-09-19 15:11:27 +08:00
sy	eb033d64fd	薪酬系统-福利台账，补缴页新增补缴数据时，校验数据库中是否已有该组信息的补缴数据	2022-09-19 14:14:17 +08:00
钱涛	b464240ff7	Merge remote-tracking branch 'origin/develop' into develop	2022-09-19 13:45:14 +08:00
钱涛	a7bd4a43d6	排序规则	2022-09-19 13:41:09 +08:00
sy	86ba593d1f	薪酬系统导入方式配置-数据采集-累计附加专项扣除-导入,添加导入人员筛选配置化处理	2022-09-19 11:01:17 +08:00
sy	280c979536	薪酬系统-修改导入信息时对于姓名字段的依赖逻辑	2022-09-16 15:03:48 +08:00
sy	0d1a77d81b	薪酬系统-修复工号字段信息映射有误的问题	2022-09-16 14:22:11 +08:00
sy	4d9b7af975	薪酬系统-福利台账导入项添加社保合计、公积金合计、其他福利合计、合计四个字段可以选择，并增加这四个字段的更新逻辑	2022-09-16 14:21:15 +08:00
sy	478b9a3d16	薪酬系统导入方式配置-薪资核算-导入,添加导入人员筛选配置化处理	2022-09-16 13:23:37 +08:00
sy	7daa256584	薪酬系统-福利台账导入涉及的sql优化	2022-09-16 11:41:09 +08:00
sy	8492c2097b	Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport	2022-09-16 09:47:15 +08:00
sy	a3ec7caf44	薪酬系统导入方式配置-薪资档案调薪/初始化-导入,添加导入人员筛选配置化处理	2022-09-15 17:54:59 +08:00
钱涛	d88e2bff4e	薪资档案列表按人事排序正序排列	2022-09-15 17:09:38 +08:00
sy	c13ca103f3	薪酬系统导入方式配置-社保福利台账核算导入,添加导入人员筛选配置化处理	2022-09-15 16:14:34 +08:00
钱涛	23e89d15ec	定制	2022-09-15 15:43:47 +08:00
钱涛	b61b83976d	1、系统详情接口	2022-09-15 15:41:48 +08:00
sy	3c007f8e0b	薪酬系统导入方式配置-社保福利档案导入,添加导入人员筛选配置化处理	2022-09-15 15:31:34 +08:00
钱涛	d238502b2c	1、修复线下对比 ... 2、系统配置	2022-09-15 15:15:34 +08:00
sy	d491288296	薪酬系统导入方式配置-各导入模板添加工号字段	2022-09-15 10:43:34 +08:00
sy	8eb769ee05	Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport	2022-09-14 14:37:19 +08:00
sy	a6028c51e7	福利核算干预数据导入功能优化v2-针对单个保险种类的数值未填值时，默认取数据库中原有数值	2022-09-14 14:36:05 +08:00
钱涛	8c0b9038d6	1、系统配置列表 ... 2、修复调薪周期对于核算的结果不准确	2022-09-14 11:28:17 +08:00
钱涛	198075209e	1、核算、合并计税使用税款所属期作为依据 ... 2、核算列表分页	2022-09-13 16:03:55 +08:00
钱涛	32f5f25341	防止未归档时合并计税异常	2022-09-08 16:26:24 +08:00
钱涛	28551918c2	修复部门id和岗位id不显示	2022-09-08 10:13:57 +08:00
sy	6a52554d71	Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport	2022-09-08 09:44:14 +08:00
sy	8c7a5d477a	福利核算干预数据导入功能优化v1	2022-09-08 09:43:46 +08:00
钱涛	243d8e0d6b	批量调薪前置校验	2022-09-07 16:35:57 +08:00
钱涛	572c4cb9f1	调薪前置校验	2022-09-07 16:12:43 +08:00
sy	1b34914e13	Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport	2022-09-07 14:57:46 +08:00
sy	8f9a335dd0	福利核算干预数据导入预览	2022-09-07 14:57:07 +08:00
钱涛	06f6dcf8f2	Merge remote-tracking branch 'origin/develop' into develop	2022-09-07 09:46:02 +08:00
钱涛	8ff4e9e231	停薪操作	2022-09-07 09:45:37 +08:00
sy	d4886c0d46	Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport	2022-09-06 17:14:31 +08:00
sy	5a6df5a257	福利核算结果干预功能，福利核算项列表接口、福利核算导入模板下载接口、福利核算干预数据导入接口	2022-09-06 17:13:33 +08:00
钱涛	c84836d490	修复调薪导致起始缴纳日期消失	2022-09-06 17:12:56 +08:00
钱涛	e372173b74	获取系统配置接口	2022-09-05 17:20:57 +08:00
钱涛	299bbf1f66	达梦适配	2022-09-05 15:50:01 +08:00
sy	3445642489	优化薪资核算导入相关的唯一匹配逻辑v3	2022-09-02 15:40:05 +08:00
sy	85566329d9	Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport	2022-09-02 12:47:36 +08:00
sy	dd721aa314	Merge branch 'hotfix/checkImport0902' into develop	2022-09-02 12:45:11 +08:00
sy	43bf76b036	Merge remote-tracking branch 'remotes/origin/develop' into hotfix/checkImport0902	2022-09-02 12:43:53 +08:00
Harryxzy	0269506f78	xzy-fix当用户发薪日期为一个月最后一天时，薪资核算无数据bug	2022-09-02 12:41:58 +08:00
sy	a1f310775d	优化薪资核算导入相关的唯一匹配逻辑v3	2022-09-02 12:41:22 +08:00
sy	79cab3629e	福利核算干预功能开发v1	2022-09-02 11:53:38 +08:00
sy	749279e372	优化薪资核算导入相关的唯一匹配逻辑v2	2022-09-02 11:04:51 +08:00
Harryxzy	40728ea598	Merge branch 'origin/fix/salaryArchiveImportDate_xzy' into develop	2022-09-01 17:07:18 +08:00
Harryxzy	38edb1bbb8	xzy-fix薪资档案导入时添加起始发薪日期格式校验	2022-09-01 17:06:30 +08:00
钱涛	cc24406319	向上求偶	2022-09-01 16:17:27 +08:00
Harryxzy	0d3f76c414	Merge branch 'origin/feature/addSubComSearchCondition_xzy' into develop	2022-09-01 09:22:11 +08:00
钱涛	c0498052cb	Merge branch 'hotfix/0831' into develop	2022-08-31 17:23:32 +08:00
钱涛	c3201b66a3	fix福利人员导入异常	2022-08-31 17:19:12 +08:00
Harryxzy	387b6a2897	xzy-在薪资档案以及薪资核算的高级搜索中,增加分部搜索条件	2022-08-31 15:06:49 +08:00
Harryxzy	5ade93de8c	Merge branch 'fix/peopleCount' into develop	2022-08-30 10:00:16 +08:00
sy	457f144bc6	Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport	2022-08-30 09:30:38 +08:00
Harryxzy	feb1e14c29	xzy-fix社保福利台账人数错误	2022-08-30 09:19:29 +08:00
sy	3fba03d482	优化薪资核算导入相关的唯一匹配逻辑及导入模板	2022-08-30 09:15:37 +08:00
钱涛	a13d56063b	fix累计已预扣预缴税额，带入个税调差	2022-08-29 16:06:56 +08:00
Harryxzy	e1239d3018	xzy-核算自定义列表添加分部	2022-08-29 14:50:26 +08:00
钱涛	f71e222c73	fix导入	2022-08-26 14:06:21 +08:00
sy	8ea34ef7dd	Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport	2022-08-26 09:18:06 +08:00
钱涛	aab48a1733	1、可见性范围回显	2022-08-25 17:34:30 +08:00
钱涛	60fb7fb110	1、可见性范围回显	2022-08-25 17:05:36 +08:00
钱涛	7cd4981a5a	Merge remote-tracking branch 'origin/develop' into develop	2022-08-25 16:46:26 +08:00
钱涛	bfcda3525a	1、福利方案分权 ... 2、累计、往期、其他导入分权 3、导入精度	2022-08-25 16:46:12 +08:00
Harryxzy	14b0797128	xzy-fix薪资项目保存报错	2022-08-25 15:44:00 +08:00
Harryxzy	bc794b4585	xzy-fix社保福利方案无法新建自定义福利	2022-08-25 11:52:24 +08:00
sy	2041031e92	薪酬模块导入按钮匹配项优化 ... 姓名-部门-手机号 涉及接口，薪资档案导入接口、数据采集子菜单中的四个导入接口	2022-08-25 11:43:52 +08:00
Harryxzy	8b84f0b15f	xzy-fix北京城建集团-考勤引用中引用时报错问题	2022-08-25 09:59:19 +08:00
Harryxzy	6809839a2c	Merge branch 'feature/addSalaryShowSwitch_xzy' into develop	2022-08-25 09:38:59 +08:00
Harryxzy	9244440a0d	xzy-薪资项目显隐控制(修改传参itemHide为字符串)	2022-08-25 09:20:51 +08:00
钱涛	a4e6042adf	调薪流程按钮	2022-08-24 20:00:57 +08:00
钱涛	7a052e5ce0	Merge branch 'hotfix/0801' into develop	2022-08-24 17:12:11 +08:00
钱涛	71b2f6f41c	导入核算结果时去除多余的人员	2022-08-24 16:51:57 +08:00
钱涛	378d3a49e9	Merge branch 'hotfix/0801' into develop	2022-08-24 14:49:57 +08:00
钱涛	1567ecb956	核算结果的导入bug，null	2022-08-24 14:24:20 +08:00
钱涛	7dfe9ee732	福利方案分权	2022-08-24 12:03:04 +08:00
Harryxzy	289e685e09	xzy-薪资项目显隐控制	2022-08-24 10:31:42 +08:00
钱涛	0f62239d4e	fix离职日期 ... 福利档案导出	2022-08-23 14:16:20 +08:00
钱涛	bdd9b5aa07	修复申报时人员数量和核算时不一致	2022-08-22 10:47:22 +08:00
钱涛	b2704a84a4	Merge remote-tracking branch 'origin/develop' into develop	2022-08-18 15:05:46 +08:00
钱涛	e0a031e197	oracle异常	2022-08-18 15:02:04 +08:00
Harryxzy	4d0a73e030	xzy-解决社保福利方案删除时校验问题	2022-08-18 12:26:53 +08:00
钱涛	1969b44804	见分进角规则	2022-08-17 18:33:46 +08:00
Harryxzy	e539c07162	Merge branch 'hotfix/batchSaveOracle' into develop	2022-08-17 13:29:24 +08:00
Harryxzy	bf2f05e9ab	'xzy-解决oracle批量添加问题'	2022-08-17 13:28:33 +08:00
钱涛	5124520850	1、其他福利单位合计导出错误 ... 2、方案删除错误	2022-08-17 11:46:35 +08:00
钱涛	bf28368845	fix oracle批量插入	2022-08-16 20:01:47 +08:00
钱涛	8f1e5a61bb	fix档案搜索 ... fix账套人员分页	2022-08-16 17:26:16 +08:00
钱涛	1d464e5138	fix档案分页	2022-08-16 15:49:15 +08:00
钱涛	061eb55ac3	考勤引用	2022-08-16 14:42:31 +08:00
钱涛	5a99061306	1、薪资档案oracle查询异常	2022-08-16 12:01:04 +08:00
钱涛	a7c022f38d	1、批量插入报表支持oracle ... 2、累计、往期返聘人员适配	2022-08-16 10:39:45 +08:00
钱涛	ddccbb0d78	导入核算结果时，添加sql项	2022-08-15 17:16:48 +08:00
钱涛	20967f04ab	环比减少人员	2022-08-11 16:57:12 +08:00
钱涛	3ec90b3727	去除字符串空格	2022-08-11 14:12:37 +08:00
钱涛	7d79dcdfc2	修复社保福利列表高级搜索	2022-08-11 10:27:15 +08:00
钱涛	65cfe6c28a	去除无效代码	2022-08-09 16:54:29 +08:00
钱涛	4b800c436d	核算时只获取对应分部的档案	2022-08-09 16:45:22 +08:00
钱涛	deffd8e41f	薪资档案增加分部列	2022-08-09 10:09:55 +08:00
钱涛	d62473c356	修复往期累计情况	2022-08-08 17:45:18 +08:00
钱涛	24806d67f5	删除福利的扣缴义务人	2022-08-08 09:28:58 +08:00
钱涛	a91b411c08	去除千分位	2022-08-04 16:17:05 +08:00
钱涛	bdadbf4ca0	Merge remote-tracking branch 'origin/develop' into develop	2022-08-04 15:09:57 +08:00
钱涛	1eba64edd6	1、福利列表统一为个税扣缴义务人 ... 2、补缴导出无数据	2022-08-04 15:09:40 +08:00
liuliang	b2d8e371d1	Merge branch 'feature_liuliang_salaryAccounting' into develop	2022-08-04 14:54:47 +08:00
liuliang	f86fcd29f2	修改核算范围bug	2022-08-04 14:53:06 +08:00
钱涛	d9bfd4d617	1、档案接口增强 ... 2、sql支持大写 3、合并计税搜索	2022-08-04 11:45:26 +08:00
钱涛	07614d318f	1、福利核算人员修正	2022-08-04 09:55:10 +08:00
liuliang	e4cdddc005	Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop	2022-08-03 17:28:03 +08:00
liuliang	a4adb0da84	优化导入	2022-08-03 17:27:44 +08:00
钱涛	a340f1aaaf	1、薪资核算时取账套下的人员范围，且这个人需要再账套所属的扣缴义务人下由档案，且起始发薪和最后发薪日期在这个薪资周期内 ... 2、福利核算的范围需要在扣缴义务人下，且三个起始结束日期在核算周期内	2022-08-03 17:02:03 +08:00
钱涛	e6207ad846	fix工资单列表缺少工号	2022-08-03 15:08:34 +08:00
钱涛	11ac3d6d51	Merge branch 'feature/outdatasource' into develop ... # Conflicts: # src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java	2022-08-03 15:06:16 +08:00
钱涛	184bbe1e0b	fix工资单列表缺少工号	2022-08-03 11:44:30 +08:00
钱涛	591c59228f	fix工资单列表缺少工号	2022-08-03 11:42:49 +08:00
钱涛	a05425837d	Merge branch 'hotfix/sqlserver' into develop	2022-08-03 11:08:50 +08:00
钱涛	7c5d7bba35	fix批量发放工资单	2022-08-03 11:08:23 +08:00
钱涛	99c0806b73	支持外部数据源	2022-08-03 10:47:26 +08:00
钱涛	c4831a1612	支持外部数据源	2022-08-03 10:08:43 +08:00
liuliang	90c1ad1c6c	优化代码和指定	2022-08-02 18:02:53 +08:00
liuliang	6a42f1c7c6	修改bug	2022-08-02 17:57:29 +08:00
钱涛	e9c95918eb	1、核算表头带上公式 ... 2、修复核算时取福利台账人员信息不准确	2022-08-02 14:58:18 +08:00
钱涛	6d5e848a65	Merge remote-tracking branch 'origin/develop' into develop	2022-08-02 11:00:08 +08:00
钱涛	ab87e5cf08	劳务申报表列表	2022-08-02 10:59:12 +08:00
liuliang	e06b341023	Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop	2022-08-01 14:35:39 +08:00
liuliang	b516b06d8b	去除各种组织合并成个税扣缴义务人	2022-08-01 14:35:07 +08:00
钱涛	1d676365c7	Merge remote-tracking branch 'origin/develop' into develop	2022-08-01 14:16:08 +08:00
钱涛	a252d055ab	1、核算接口代理 ... 2、获取异常真实信息	2022-08-01 14:15:09 +08:00
liuliang	50f047fb6f	Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop	2022-07-29 17:19:41 +08:00
liuliang	ea8a41d930	社保福利档案bug修复	2022-07-29 17:18:38 +08:00
钱涛	3f4c6954d1	Merge remote-tracking branch 'origin/develop' into develop	2022-07-29 10:34:11 +08:00
钱涛	b60758cd28	修复往期累计列表显示异常	2022-07-29 10:33:54 +08:00
liuliang	c6c180afef	Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop	2022-07-28 17:57:10 +08:00
liuliang	089cb2aa11	删除社保福利方案测试	2022-07-28 17:56:42 +08:00
钱涛	03f7efa2c9	Merge remote-tracking branch 'origin/develop' into develop	2022-07-28 17:20:41 +08:00
钱涛	c92a215bca	薪资档案导出全部时范围修改	2022-07-28 17:20:24 +08:00
liuliang	35fc07bb9a	社保福利方案bug修复	2022-07-28 17:18:51 +08:00
liuliang	28cc6e67f4	Merge branch 'feature_liuliang_20220726' into develop	2022-07-28 16:31:02 +08:00
liuliang	f8c0f1b59d	Merge branch 'fixbug_liuliang_recalculate' into develop	2022-07-28 16:30:27 +08:00
liuliang	1effdf42aa	liuliang	2022-07-28 16:28:53 +08:00
钱涛	c14cca9b08	核算时添加核算人员过滤不是扣缴义务人下的人员	2022-07-28 16:23:39 +08:00
钱涛	b6f8e857d2	1、档案导入初始化修复 ... 2、核算档案 3、取消入职、离职日期作为核算人员的筛选条件	2022-07-28 15:42:25 +08:00
钱涛	36e2f96ae5	社保方案起始缴纳和最后缴纳生效	2022-07-28 14:22:59 +08:00
钱涛	d1e6cec693	增加join	2022-07-28 14:17:30 +08:00
钱涛	259c40758f	1、薪资项目增加系统名 ... 2、薪资项目增加申报项目名 3、账套对应字段	2022-07-27 16:56:13 +08:00
liuliang	f74f70250d	Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop	2022-07-27 09:29:26 +08:00
liuliang	12d6f733a6	工资单发放范围修正	2022-07-27 09:27:47 +08:00
钱涛	e7968f2545	1、公共枚举接口 ... 2、薪资档案封存标识	2022-07-26 18:01:39 +08:00
liuliang	62d8e6589f	liuliang	2022-07-26 16:19:13 +08:00
liuliang	eb6f0b81ca	删除社保方案福利功能	2022-07-26 16:14:24 +08:00
钱涛	e01a575d58	初始化和调薪档案范围调整	2022-07-25 16:29:20 +08:00
钱涛	92e7ac17c1	档案状态	2022-07-25 15:56:21 +08:00
钱涛	db31190b9e	调整sql配置	2022-07-25 15:01:10 +08:00
liuliang	9602ed1d87	Merge branch 'feature_liuliang_20220720' into develop	2022-07-25 14:34:31 +08:00
liuliang	c8ae60533e	导入修改	2022-07-25 14:33:35 +08:00
liuliang	d26ded2261	Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop	2022-07-25 11:14:48 +08:00
liuliang	03c163bd91	Merge branch 'feature_liuliang_20220720' into develop	2022-07-25 11:14:24 +08:00
liuliang	e03c24dfbf	社保福利导入	2022-07-25 11:13:18 +08:00
钱涛	eb957fbfec	修复档案初始化	2022-07-25 10:45:13 +08:00
liuliang	341b122fe7	导入可以带出数据功能	2022-07-25 09:57:15 +08:00
钱涛	3ced92cfc5	修复福利核算	2022-07-21 17:28:47 +08:00
钱涛	8e69159900	薪资档案代码合并	2022-07-21 10:51:38 +08:00
钱涛	b90953873c	薪资档案代码合并	2022-07-21 09:48:40 +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
钱涛	a7b61dc7da	限制福利核算时的扣缴义务人	2022-07-20 18:01:00 +08:00
liuliang	4ff9290d73	Merge branch 'feature_liuliang_20220705' into develop	2022-07-20 16:06:27 +08:00
liuliang	32c15c1c35	Merge branch 'feature_liuliang_20220705' into develop	2022-07-20 15:58:49 +08:00
liuliang	71728b20e9	Merge branch 'feature_liuliang_20220718' into develop	2022-07-20 15:42:14 +08:00
liuliang	6b2c5ba314	社保福利台账重新核算	2022-07-20 15:40:51 +08:00
钱涛	967413827e	修改社保个人实际承担方为个人	2022-07-20 14:25:01 +08:00
钱涛	27c84676b7	修复工资单撤回	2022-07-20 11:50:09 +08:00
钱涛	d1770aadbb	薪资档案定薪调薪适配多个扣缴义务人	2022-07-19 18:40:41 +08:00
liuliang	6cda380aa2	Merge branch 'fix_liuliang_20220719' into develop	2022-07-19 14:23:08 +08:00
liuliang	76661474c4	修改社保福利台账导出按钮无法正确导出bug	2022-07-19 14:05:25 +08:00
钱涛	cd7684120b	福利核算	2022-07-19 11:36:19 +08:00
钱涛	f65f3c01eb	流程对接	2022-07-19 10:20:21 +08:00
钱涛	2275f53861	档案设置	2022-07-18 19:14:02 +08:00
钱涛	a721898d3d	薪资档案增加起始发薪和最后发薪	2022-07-18 18:08:59 +08:00
liuliang	b9528442f9	薪酬档案导入对接流程-liuliang	2022-07-18 16:19:15 +08:00
钱涛	136641649d	薪资档案	2022-07-18 09:38:12 +08:00
钱涛	9dcebdc994	暂存	2022-07-15 10:15:59 +08:00
钱涛	92977e81c3	更新历史版本排序权重	2022-07-14 15:56:48 +08:00
钱涛	c8aa08fc9f	档案列表显示扣缴义务人	2022-07-14 14:32:59 +08:00
钱涛	01bd6fefd4	支持人员可在多个扣缴单位	2022-07-14 10:36:51 +08:00
liuliang	758a78996d	导入薪酬档案对接流程功能	2022-07-13 18:59:30 +08:00
钱涛	bb8c863bcc	薪酬报表与解密方法	2022-07-13 13:55:31 +08:00
钱涛	1d5c69278f	描述异常	2022-07-13 11:45:16 +08:00
钱涛	057ca97c9e	修复往期累计不显示的问题	2022-07-13 10:13:49 +08:00
钱涛	1d90bb148e	修复往期累计导入数量限制	2022-07-13 09:53:11 +08:00
钱涛	4258e7f545	薪酬版本功能	2022-07-12 17:42:33 +08:00
钱涛	c8d056ee2f	薪酬版本记录	2022-07-12 17:28:06 +08:00
钱涛	91f1fda342	核算档案项不可编辑	2022-07-11 18:24:12 +08:00
钱涛	bf31d993a7	薪酬报表-薪酬核算完成，将数据存储到非加密表，删除人员信息，补充：分部、部门、岗位等其他字段，供数据中心引用	2022-07-11 17:31:33 +08:00
钱涛	97763cc280	定时同步人员范围	2022-07-11 09:39:57 +08:00
钱涛	075f70b0fd	修复福利导入提示行号错误	2022-07-08 14:57:57 +08:00
钱涛	12917f4f8b	去除无用todo	2022-07-08 11:30:10 +08:00
钱涛	f3a216027f	修复福利台账的分权	2022-07-08 11:19:08 +08:00
钱涛	6967a7224c	优化往期删除逻辑	2022-07-07 20:26:43 +08:00
钱涛	eab3e9a6a9	1、福利列表显示扣税扣缴义务人 ... 2、导入限制 3、修改福利查询异常 4、核算人员范围限制	2022-07-07 18:29:52 +08:00
钱涛	16c43f8679	考勤引用适配加班数据	2022-07-07 14:37:10 +08:00
钱涛	b23f790fc9	去除Spring注解	2022-07-06 17:36:30 +08:00
钱涛	24853722cb	1、去除@resource	2022-07-06 17:33:45 +08:00
钱涛	7301ee1033	1、福利档案限制缴纳组织必须为扣税扣缴义务人 ... 2、福利档案人员限制为个税扣缴义务人下 3、个税扣缴义务人单个申报	2022-07-06 16:42:13 +08:00
钱涛	3c3c679757	获取个税扣缴义务人下的实际人员配置接口	2022-07-06 10:52:37 +08:00
钱涛	9bd1074258	1、档案限制应为个税扣缴义务人下的人员 ... 2、个税扣缴义务人未开启分权的情况下显示管理员	2022-07-06 10:13:06 +08:00
钱涛	48d70400e5	薪资档案验证人员是否在义务扣缴人下	2022-07-05 19:19:17 +08:00
钱涛	053c436d49	获取薪酬版本信息	2022-07-05 16:56:09 +08:00
钱涛	190d6da1b2	操作实际管理的个税扣缴人	2022-07-05 15:31:18 +08:00
钱涛	d244883190	薪酬对外提供的解密方法	2022-07-05 15:08:59 +08:00
钱涛	03ba0418ab	福利核算精度异常	2022-07-05 15:04:00 +08:00
钱涛	47113434ad	薪酬报表	2022-07-04 19:21:44 +08:00
钱涛	4fe3a61d5d	修复核算工号不显示的问题	2022-07-04 18:58:49 +08:00
钱涛	c2c4149442	报表接口	2022-07-04 15:34:04 +08:00
钱涛	3f086e154d	sql执行	2022-07-04 13:44:17 +08:00
钱涛	c372fff59c	系统异常处理	2022-07-01 15:18:29 +08:00
钱涛	6262aeeb01	1、合并计税处理 ... 2、考勤引用不生成空记录	2022-06-30 16:15:19 +08:00
钱涛	7f7cdaf4a8	修复考勤引用删除适配问题	2022-06-30 14:21:29 +08:00
钱涛	317c04a121	公式编辑器，防止参数名和字段名呈现一对多的问题	2022-06-30 11:10:46 +08:00
钱涛	7b468045c8	1、限制核算的人员范围 ... 2、薪资工资单的导出功能 3、修复工资单批量发放和撤回的问题 4、核算时取各个扣缴义务人的数据	2022-06-29 17:38:00 +08:00
钱涛	3e300e62eb	修复福利台账补缴功能异常	2022-06-29 14:13:23 +08:00
钱涛	f34eaa7c6f	修复福利台账总览数据	2022-06-28 18:21:44 +08:00
钱涛	4be0d70c4d	fix	2022-06-28 16:46:42 +08:00
钱涛	63ce165a74	修复sql的XSS	2022-06-28 16:08:20 +08:00
钱涛	b64f34a14c	福利核算时只核算当前扣缴义务人的	2022-06-28 11:26:01 +08:00
钱涛	43175f6e40	处理福利带名字查询失败	2022-06-28 10:35:30 +08:00
钱涛	12fe1405ba	修复工资单导出	2022-06-27 18:34:41 +08:00
钱涛	75c84566b6	考勤导出自定义字段	2022-06-27 16:01:33 +08:00
钱涛	bcc44fe65e	fix	2022-06-27 14:45:23 +08:00
钱涛	e7dc9e1a57	限制个税扣缴名字个备注字符数量	2022-06-27 13:17:15 +08:00
钱涛	7f3cc0a82a	fix	2022-06-27 10:58:16 +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
钱涛	31a8b4bff9	fix	2022-06-23 17:15:39 +08:00
钱涛	b357bd18a6	fix	2022-06-23 14:08:55 +08:00
钱涛	e1a075cab3	fix	2022-06-22 19:26:05 +08:00
钱涛	15fbf8ac91	fix	2022-06-22 13:45:26 +08:00
钱涛	a577645329	fix	2022-06-22 10:58:18 +08:00
钱涛	fc35eff75d	fix	2022-06-21 22:37:22 +08:00
钱涛	e1629a021e	oracle错误和薪资项目错误	2022-06-21 15:08:23 +08:00
钱涛	ff88b1f9ca	员工字段不可重复	2022-06-21 11:38:55 +08:00
钱涛	3363120c44	修复核算分权的问题	2022-06-20 19:39:01 +08:00
钱涛	5cea57d477	fix bug	2022-06-17 17:22:48 +08:00
MustangDeng	c701314f15	fix bug 福利方案删除多余的编辑	2022-06-16 22:09:50 +08:00
MustangDeng	e49f68b842	fix bug 45	2022-06-16 21:04:06 +08:00
钱涛	dfe8fdf57c	fixbug	2022-06-16 19:06:45 +08:00
钱涛	035503f26c	fixbug	2022-06-16 17:55:26 +08:00
钱涛	5396d7bee3	加解密	2022-06-16 14:22:01 +08:00
钱涛	3e93a85873	Merge branch 'feature/authitem' into release	2022-06-16 14:21:38 +08:00
钱涛	b5871e1ea9	权限项	2022-06-16 14:13:22 +08:00
MustangDeng	f51a4e4fd7	加解密	2022-06-16 11:30:28 +08:00
MustangDeng	9042a9bbed	加解密	2022-06-16 11:01:03 +08:00
MustangDeng	bd99d3ccf8	加解密问题	2022-06-16 10:31:11 +08:00
MustangDeng	fc3cbe8111	Merge remote-tracking branch 'origin/release' into release	2022-06-16 10:24:58 +08:00
MustangDeng	2badaab552	加解密问题	2022-06-16 10:24:43 +08:00
钱涛	17dbef3ef2	sql	2022-06-15 17:53:12 +08:00
MustangDeng	3c13b90a4d	Merge remote-tracking branch 'origin/release' into release	2022-06-15 17:04:03 +08:00
MustangDeng	62054871ce	发送工资单	2022-06-15 17:03:48 +08:00
钱涛	2731e4eddd	sql	2022-06-15 16:31:40 +08:00
钱涛	455ff23134	申报表导出修改	2022-06-15 16:02:34 +08:00
钱涛	f5b8806eff	账套	2022-06-15 15:27:23 +08:00
钱涛	b42586600a	fix申报表	2022-06-15 12:03:17 +08:00
钱涛	baa06f4011	Merge remote-tracking branch 'origin/release' into release	2022-06-15 11:02:55 +08:00
钱涛	cfe2d3c1dc	fix申报表	2022-06-15 11:02:44 +08:00
MustangDeng	0e0cc9f97b	福利档案列表	2022-06-15 11:01:09 +08:00
钱涛	fda668ba90	Merge remote-tracking branch 'origin/release' into release	2022-06-15 10:24:54 +08:00
钱涛	7955d67da6	fix申报表	2022-06-15 10:24:46 +08:00
MustangDeng	d5228ff1bf	福利档案列表	2022-06-15 10:23:39 +08:00
钱涛	8d6a3c41d7	fix人员同步	2022-06-15 09:29:43 +08:00
钱涛	5634377e47	Merge remote-tracking branch 'origin/release' into release	2022-06-14 16:05:58 +08:00
钱涛	0e8c916262	保存	2022-06-14 16:05:47 +08:00
MustangDeng	8846346dda	台账核算回滚数据	2022-06-14 16:05:23 +08:00
钱涛	811a90f50d	账套项目的顺序性	2022-06-14 11:13:31 +08:00
钱涛	bf7d8dd634	导入时人员唯一校验	2022-06-13 17:05:36 +08:00
钱涛	b78e96c875	考勤列表适配sqlserver	2022-06-13 15:37:52 +08:00
钱涛	081747b334	考勤引用修复	2022-06-13 10:52:32 +08:00
钱涛	1aee6f7ef0	往期累计	2022-06-10 18:16:11 +08:00
钱涛	99e7c1eaef	Merge remote-tracking branch 'origin/release' into release	2022-06-10 18:07:36 +08:00
钱涛	33914eae1d	解密	2022-06-10 18:07:25 +08:00
MustangDeng	3bedc88f44	福利加解密	2022-06-10 18:01:55 +08:00
MustangDeng	fcb55bc269	fix 冲突	2022-06-10 17:15:19 +08:00
钱涛	df7e3febc3	冲突	2022-06-10 17:03:25 +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
钱涛	6ddf483767	加解密	2022-06-10 16:43:38 +08:00
MustangDeng	9315882742	福利档案列表log	2022-06-10 16:35:01 +08:00
钱涛	e83714ba4f	Merge branch 'feature/encrypt' into release ... # Conflicts: # src/com/engine/salary/biz/AddUpSituationBiz.java # src/com/engine/salary/biz/SIArchivesBiz.java # src/com/engine/salary/cmd/datacollection/OtherDeductionGetDetailListCmd.java # src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java # src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java # src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java # src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java # src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java # src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java # src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.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/SISchemeServiceImpl.java # src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java # src/com/engine/salary/service/impl/TaxAgentServiceImpl.java # src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java # src/com/engine/salary/wrapper/TaxDeclarationWrapper.java	2022-06-10 15:26:43 +08:00
MustangDeng	ca1c20329c	fix 福利档案导入bug	2022-06-10 15:12:56 +08:00
钱涛	f1fac5ae90	Merge branch 'feature/申报表' into release ... # Conflicts: # resource/sql/申报表.sql	2022-06-10 14:40:14 +08:00
钱涛	d09856c390	人员范围保存校验	2022-06-10 14:21:21 +08:00
钱涛	ec3838a292	申报表	2022-06-10 13:33:48 +08:00
MustangDeng	e1440e9203	台账归档删除	2022-06-10 11:46:57 +08:00
MustangDeng	3d43cc3f56	归档删除	2022-06-10 10:56:09 +08:00
钱涛	382620c589	申报表	2022-06-09 19:02:18 +08:00
MustangDeng	85f0b1164c	福利台账分权	2022-06-09 18:31:36 +08:00
钱涛	b8972bcd43	分权v3	2022-06-09 17:45:28 +08:00
MustangDeng	2d2c993f2a	累计附加扣除详情列表没有解密 fix	2022-06-09 15:22:49 +08:00
MustangDeng	2fe1613868	台账核算	2022-06-09 15:16:33 +08:00
钱涛	7f8d317846	冲突	2022-06-08 18:53:30 +08:00
钱涛	b832910af9	Merge branch 'develop' into release ... # Conflicts: # src/com/engine/salary/biz/SIArchivesBiz.java	2022-06-08 18:48:23 +08:00
钱涛	61346f139b	申报和往期异常	2022-06-08 17:59:30 +08:00
MustangDeng	1f7de7bc90	fix bug	2022-06-08 17:55:14 +08:00
MustangDeng	69edbc63d1	福利台账	2022-06-08 17:52:10 +08:00
钱涛	860c89b560	申报和往期异常	2022-06-08 16:36:50 +08:00
钱涛	d765ede418	默认关闭	2022-06-07 19:22:46 +08:00
钱涛	79632dd1bf	申报表分权	2022-06-07 19:10:40 +08:00
MustangDeng	28b49f9987	fix bug	2022-06-07 17:35:39 +08:00
钱涛	cedc9f2644	考勤和申报表的分权	2022-06-07 15:43:22 +08:00
MustangDeng	20e04f503e	sql server 分权脚本修改	2022-06-07 15:19:21 +08:00
MustangDeng	83c7ea3f5c	sql server 自增问题	2022-06-07 14:24:14 +08:00
MustangDeng	71da39d4d3	Merge branch 'release' into auth-fl	2022-06-07 13:26:40 +08:00
钱涛	38557e2e03	去除自增	2022-06-07 13:24:20 +08:00
MustangDeng	f22ac96b12	累计附加扣除加解密问题	2022-06-07 09:48:51 +08:00
MustangDeng	bfcb9a78f8	bug修改	2022-06-06 21:21:10 +08:00
MustangDeng	958ffc5aa0	福利台账解密问题	2022-06-06 20:05:37 +08:00
MustangDeng	a68de7d088	Merge branch 'develop' into feature/encrypt	2022-06-06 19:25:36 +08:00
钱涛	b20a6e4cbf	去重	2022-06-06 19:24:49 +08:00
MustangDeng	e306b6754d	福利台账解密问题	2022-06-06 19:08:51 +08:00
钱涛	eacb04388f	社保福利分权2.0	2022-06-06 19:08:39 +08:00
MustangDeng	d36fb221cc	福利档案列表	2022-06-06 18:17:34 +08:00
钱涛	dc27578ddf	社保福利分权1.0	2022-06-06 16:55:02 +08:00
MustangDeng	d3c82acac1	发送撤回工资单	2022-06-06 13:56:47 +08:00
MustangDeng	3a1ac7ca93	工资单部分分页调整	2022-06-06 11:43:46 +08:00
MustangDeng	d0869e5daa	工资单部分分页调整	2022-06-06 11:40:24 +08:00
MustangDeng	6db127d926	Merge branch 'develop' into feature/encrypt	2022-06-06 11:31:21 +08:00
MustangDeng	ddc4edd918	档案高级搜索	2022-06-06 11:28:18 +08:00
MustangDeng	24187b95bf	档案高级搜索	2022-06-06 11:24:16 +08:00
钱涛	88a0d08b1f	Merge branch 'auth-2' into release ... # Conflicts: # src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml # src/com/engine/salary/mapper/datacollection/EmployMapper.xml	2022-06-06 10:37:07 +08:00
钱涛	0ed51f8cf9	处理合并dev冲突	2022-06-06 10:26:31 +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
钱涛	3f0bbd3160	剔除主账号	2022-06-06 10:19:11 +08:00
钱涛	6646a2e481	申报表的分权	2022-06-02 18:02:27 +08:00
钱涛	be88b90f56	核算的分权	2022-06-02 17:10:54 +08:00
MustangDeng	a24cb2e6d6	加解密自测问题处理	2022-06-02 17:01:26 +08:00
MustangDeng	f80365ddd5	Merge branch 'develop' into feature/encrypt	2022-06-02 10:35:07 +08:00
MustangDeng	c55cd2d85d	工资单详情高级搜索样式优化	2022-06-02 10:34:24 +08:00
钱涛	a69bd42b49	核算的分权	2022-06-01 21:21:07 +08:00
钱涛	77645074c5	核算的分权	2022-06-01 21:15:48 +08:00
钱涛	758e64e6bc	档案导入	2022-06-01 20:46:51 +08:00
钱涛	bb665500ae	档案	2022-06-01 19:14:05 +08:00
MustangDeng	da2a0e5d22	工资单及福利问题修复	2022-06-01 19:13:20 +08:00
钱涛	37a73b94df	同步人员	2022-06-01 17:45:49 +08:00
钱涛	e66c86d32c	fix	2022-06-01 15:18:10 +08:00
MustangDeng	4430d50492	工资单及福利问题修复	2022-06-01 14:53:16 +08:00
钱涛	7ffc241b0a	管理	2022-05-31 21:48:00 +08:00
钱涛	084b1e1a99	fix管理员异常	2022-05-31 21:15:33 +08:00
钱涛	efd31013cd	薪资账套分权	2022-05-31 21:05:59 +08:00
钱涛	5596d88c6f	adminUser->AdminUserIds	2022-05-31 20:12:25 +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
钱涛	3f958d2886	暂存	2022-05-31 18:27:33 +08:00
钱涛	99b5c36864	暂存	2022-05-31 16:41:11 +08:00
MustangDeng	560c3c9103	cmd 解密转换	2022-05-31 16:20:04 +08:00
MustangDeng	df3535c77d	和代码build处理	2022-05-31 16:02:41 +08:00
MustangDeng	fd36c67fc6	和代码build处理	2022-05-31 11:45:43 +08:00
MustangDeng	68994ee304	Merge branch 'develop' into feature/encrypt ... # Conflicts: # resource/ecology9/WEB-INF/prop/hrmSalary.properties # 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/SIAccountBiz.java # src/com/engine/salary/biz/SalaryArchiveItemBiz.java # src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java # src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java # src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java # src/com/engine/salary/wrapper/TaxDeclarationWrapper.java	2022-05-31 11:33:36 +08:00
钱涛	019ad96871	其他扣除	2022-05-31 11:21:51 +08:00
钱涛	72d1b48126	fix	2022-05-31 11:03:56 +08:00
钱涛	0898055d77	fix	2022-05-31 10:29:18 +08:00
钱涛	76b05e3d38	fix	2022-05-31 09:59:32 +08:00
钱涛	8b14038b90	分权	2022-05-31 09:58:35 +08:00
钱涛	5925fb5606	分权	2022-05-30 20:13:03 +08:00
钱涛	e38841f280	合并auth	2022-05-30 18:59:48 +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
钱涛	25991fe675	Merge remote-tracking branch 'origin/develop' into develop	2022-05-30 18:03:36 +08:00
钱涛	3907ac49d9	fix bug	2022-05-30 18:03:20 +08:00
MustangDeng	0af5199d9b	Merge remote-tracking branch 'origin/develop' into develop	2022-05-30 17:31:40 +08:00
MustangDeng	4e4c190f31	bug修改	2022-05-30 17:31:29 +08:00
钱涛	c7a4f8a8e1	档案导入提示优化	2022-05-30 16:25:27 +08:00
钱涛	6986b39231	暂存	2022-05-30 14:17:02 +08:00
MustangDeng	597e2206e9	like 修改	2022-05-30 13:43:28 +08:00
钱涛	7e09b283da	暂存	2022-05-30 13:33:22 +08:00
钱涛	6470346ed0	oracle的like	2022-05-30 13:30:51 +08:00
钱涛	4baa1643f6	oracle适配	2022-05-30 11:51:00 +08:00
MustangDeng	bd7c3e45a5	台账核算	2022-05-30 11:27:39 +08:00
MustangDeng	2ccc30db96	Merge remote-tracking branch 'origin/develop' into develop	2022-05-30 09:14:33 +08:00
MustangDeng	d48ef0aeec	oracle 适配	2022-05-30 09:14:12 +08:00
钱涛	60ae1ff35b	sqlserver ... 适配	2022-05-27 18:07:26 +08:00
钱涛	841ca27c84	暂存	2022-05-27 17:21:39 +08:00
钱涛	71ea4b8609	导入	2022-05-27 15:43:38 +08:00
MustangDeng	224c823590	oracle 自增返回	2022-05-27 15:01:44 +08:00
钱涛	be4ed2229d	暂存	2022-05-27 14:51:53 +08:00
钱涛	c4c04ac87a	暂存	2022-05-27 14:46:01 +08:00
钱涛	ad991954cd	暂存	2022-05-27 11:49:23 +08:00
钱涛	d776220cae	fix	2022-05-27 09:33:40 +08:00
钱涛	b5d6adfbde	暂存	2022-05-26 18:16:48 +08:00
钱涛	c6ea4c5698	线下对比	2022-05-26 15:45:37 +08:00
钱涛	cf5e914318	Merge remote-tracking branch 'origin/develop' into develop	2022-05-26 13:42:44 +08:00
钱涛	6103c9233e	批量操作数量限制	2022-05-26 13:41:58 +08:00
MustangDeng	968a48eed2	取消福利归档前异常数据校验	2022-05-26 13:30:23 +08:00
钱涛	f6eb69e62a	暂存	2022-05-26 11:02:55 +08:00
MustangDeng	615bb51a59	Merge remote-tracking branch 'origin/develop' into develop	2022-05-26 11:00:58 +08:00
MustangDeng	05dc46894d	总览数据不对问题	2022-05-26 11:00:38 +08:00
钱涛	8e2e420d6a	处理sqlserver参数过多异常	2022-05-25 17:15:16 +08:00
钱涛	586fad5f2c	分权累计专项附加扣除	2022-05-25 16:51:43 +08:00
钱涛	90a6bd9921	暂存	2022-05-25 13:49:25 +08:00
MustangDeng	5abd648e9b	Merge remote-tracking branch 'origin/develop' into develop	2022-05-25 13:23:15 +08:00
MustangDeng	402a3304cc	福利核算数据量过大的情况	2022-05-25 13:23:02 +08:00
钱涛	f066d1ef64	fix档案分页	2022-05-25 13:13:03 +08:00
钱涛	e1b579d480	暂存	2022-05-25 13:10:03 +08:00
钱涛	99fda7ecc3	修复调薪记录	2022-05-25 11:09:48 +08:00
钱涛	bf364a7639	暂存	2022-05-24 15:20:12 +08:00
MustangDeng	5cd4e46b8a	Merge remote-tracking branch 'origin/develop' into develop	2022-05-24 13:42:25 +08:00
MustangDeng	fe1cb27004	修复 自定义福利中已经停用某项福利，但新增方案时候还能引用	2022-05-24 13:42:15 +08:00
钱涛	895d258a44	分权基本控制开发完毕	2022-05-24 13:25:56 +08:00
钱涛	082d02ae67	Merge branch 'develop' into auth	2022-05-24 11:26:37 +08:00
钱涛	f555192e70	升级	2022-05-24 11:24:21 +08:00
钱涛	705f10f153	Merge remote-tracking branch 'origin/develop' into develop	2022-05-24 10:54:58 +08:00
钱涛	bccd246b2c	fix分页异常	2022-05-24 10:54:46 +08:00
MustangDeng	78234f7554	工资单默认模板	2022-05-24 10:24:17 +08:00
MustangDeng	05f529769c	加解密	2022-05-24 09:23:17 +08:00
钱涛	cb1a53c649	暂存	2022-05-24 09:14:26 +08:00
MustangDeng	46a0b77611	Merge remote-tracking branch 'origin/develop' into develop	2022-05-23 13:39:08 +08:00
MustangDeng	5f2c20eaec	默认不启用非标功能	2022-05-23 13:38:48 +08:00
钱涛	49cd388df1	暂存	2022-05-20 15:58:58 +08:00
钱涛	4f36f89e53	Merge branch 'develop' into auth	2022-05-20 14:56:25 +08:00
钱涛	d77e8b0de4	累计扣除字段	2022-05-20 14:41:42 +08:00
钱涛	ac934c901c	暂存	2022-05-19 16:56:57 +08:00
钱涛	2c03d4bc27	暂存	2022-05-19 16:36:18 +08:00
MustangDeng	6b9200121e	福利台账归档	2022-05-19 16:32:33 +08:00
钱涛	ed0ba7ed6d	暂存	2022-05-19 14:50:01 +08:00
MustangDeng	1f636c28d6	福利台账异动清单	2022-05-19 11:23:25 +08:00
MustangDeng	6024a69e84	福利档案导出	2022-05-19 10:20:23 +08:00
MustangDeng	0909e37741	数据采集高级搜索	2022-05-19 09:45:02 +08:00
MustangDeng	69246485ee	福利导入模板	2022-05-19 09:33:07 +08:00
MustangDeng	f8105537c9	福利导入	2022-05-18 18:53:30 +08:00
MustangDeng	14daede3d0	Merge remote-tracking branch 'origin/develop' into develop	2022-05-18 16:37:34 +08:00
MustangDeng	fcbc6c7202	福利方案分页创建	2022-05-18 16:37:23 +08:00
钱涛	647d4ae28b	Merge remote-tracking branch 'origin/develop' into develop	2022-05-18 16:08:13 +08:00
钱涛	bb66f80906	fix 新增系统薪资项目，模糊搜索	2022-05-18 16:07:51 +08:00
MustangDeng	51e5649dd8	Merge remote-tracking branch 'origin/develop' into develop	2022-05-18 14:36:46 +08:00
MustangDeng	604d3d453e	福利方案判断重复	2022-05-18 14:36:37 +08:00
钱涛	dc1c865a4b	账套项目删除bug	2022-05-18 14:34:06 +08:00
钱涛	fa4d605c8d	暂存	2022-05-18 09:19:50 +08:00
钱涛	27b04da333	Merge remote-tracking branch 'origin/develop' into develop	2022-05-16 17:04:19 +08:00
钱涛	a4c285dfd4	异常	2022-05-16 17:03:17 +08:00
MustangDeng	4bd082efb0	福利档案导出	2022-05-13 16:29:18 +08:00
钱涛	9540b0a2ce	自增bug	2022-05-13 11:27:25 +08:00
钱涛	022a78b659	Merge remote-tracking branch 'origin/develop' into develop	2022-05-13 11:22:18 +08:00
钱涛	282c0abc22	薪资项目不使用自增	2022-05-13 11:22:10 +08:00
MustangDeng	ed9a9012ad	Merge remote-tracking branch 'origin/develop' into develop	2022-05-13 10:32:06 +08:00
MustangDeng	0750ea0f51	福利档案列表报错问题	2022-05-13 10:31:51 +08:00
钱涛	e49bc9943f	薪酬核算第一步不使用线程池	2022-05-12 15:41:12 +08:00
钱涛	a2c59d15f4	项目分类bug	2022-05-12 14:36:16 +08:00
钱涛	83cc76ba77	个税扣缴义务人不存在提醒	2022-05-11 11:23:28 +08:00
钱涛	9dc5a396f2	Merge remote-tracking branch 'origin/develop' into develop	2022-05-10 17:27:10 +08:00
钱涛	c440ccd0a6	修复	2022-05-10 17:26:58 +08:00
MustangDeng	b3ca582e3a	我的薪资列表调薪记录	2022-05-10 16:17:37 +08:00
MustangDeng	c68af43652	Merge remote-tracking branch 'origin/develop' into develop	2022-05-10 10:55:02 +08:00
MustangDeng	fbf6baa676	我的薪资列表工资单列表	2022-05-10 10:54:41 +08:00
钱涛	08ff95bf77	Merge remote-tracking branch 'origin/develop' into develop	2022-05-09 17:47:37 +08:00
钱涛	6f3d8e85c0	个税申报bug	2022-05-09 17:47:19 +08:00
MustangDeng	db4cbea487	Merge branch '20220505' into develop	2022-05-09 16:40:48 +08:00
MustangDeng	733bd2b034	档案导入模板调整	2022-05-09 16:40:14 +08:00
钱涛	2c432ab1c0	可删除	2022-05-09 16:39:04 +08:00
钱涛	fd856e0750	入职日期	2022-05-09 14:24:40 +08:00
钱涛	bf37add9dd	修复导出异常	2022-05-09 14:11:07 +08:00
MustangDeng	c287aca4a8	工资单撤回	2022-05-09 12:28:59 +08:00
MustangDeng	9dd71e5045	工资单撤回	2022-05-09 12:15:13 +08:00
钱涛	d2a37df97f	申报表异常	2022-05-09 11:46:49 +08:00
MustangDeng	22de36ce59	Merge branch '20220505' into develop	2022-05-09 11:19:35 +08:00