qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,334 Commits 293 Branches 39 Tags 49 MiB
Commit Graph

1353 Commits

Author SHA1 Message Date
Harryxzy d53d7a33d7 删除锁定多余代码 2023-06-02 14:47:15 +08:00
钱涛 0da2bfa55a 邮件暂存 2023-06-02 14:38:56 +08:00
Harryxzy 74c5b4f19f 薪资项目 和 字段管理的排序 2023-06-01 17:52:31 +08:00
钱涛 4be4acc5d8 Merge branch 'release/2.8.3.2306.01' into feature/短信邮件 
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
 2023-06-01 11:49:16 +08:00
Harryxzy 4e04b6e268 薪资核算导入，选择表单字段获取未分类 2023-06-01 10:30:33 +08:00
sy fb03cf98a7 薪酬系统，福利台账、薪资档案、薪资核算增加工号查询 2023-05-31 11:49:40 +08:00
Harryxzy 601b90d188 薪资档案薪资项目排序 2023-05-31 09:55:24 +08:00
Harryxzy 0ec6e740d3 Merge branch 'fix/backCalcSumRow' into release/2.8.3.2306.01 2023-05-29 16:48:18 +08:00
Harryxzy a2f4653411 当薪资档案列表为0时，由于查询了全量数据，导致速度慢 2023-05-29 16:17:13 +08:00
Harryxzy 7e841f6fd3 修复回算工资单合计列 2023-05-26 15:13:56 +08:00
钱涛 fef828ef1d 人员明细列表展示账套和核算记录信息、自定义列功能 2023-05-26 11:17:25 +08:00
Harryxzy b26e6069ad Merge branch 'fix/salaryAcctResultEdit' into release/2.8.3.2306.01 2023-05-25 17:11:58 +08:00
Harryxzy 25ffd06dd4 修复编辑薪资核算没有未分类 2023-05-25 17:06:03 +08:00
钱涛 ec90e31695 Merge branch 'release/2.8.3.2306.01' into feature/短信邮件 2023-05-24 16:20:39 +08:00
钱涛 74c4305b9d 优化核算异常提示 2023-05-23 15:15:55 +08:00
Harryxzy a916e061d8 Merge branch 'fix/deleteBackCalcRecordBUG' into release/2.8.2.2305.02 2023-05-22 14:03:22 +08:00
Harryxzy c7bdbe7b85 Merge branch 'feature/V3-salaryAcctResultLog' into release/2.8.2.2305.02 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
 2023-05-22 14:03:07 +08:00
Harryxzy 20262169c9 Merge branch 'fix/salaryAcctResutAutoLock' into release/2.8.2.2305.02 2023-05-22 14:02:28 +08:00
Harryxzy ebf966517b 修复保存日志获取不到id 2023-05-18 14:28:31 +08:00
钱涛 ff8dcf1769 核算异常信息 2023-05-17 17:38:12 +08:00
钱涛 404db31695 薪资项目系统项目排序靠后 2023-05-17 16:57:37 +08:00
钱涛 1534b0257d Merge branch 'feature/公式v2' into release/2.8.2.2305.02 2023-05-17 15:08:16 +08:00
Harryxzy 72f2ca4439 修复核算编辑保存 2023-05-17 14:49:53 +08:00
钱涛 8ad88b1e97 我的工资接口修改 2023-05-17 14:10:12 +08:00
钱涛 a7cc99fdd3 公式异常信息 2023-05-16 18:01:38 +08:00
Harryxzy 083916eb0c 薪资核算编辑 带上公式 2023-05-16 15:41:11 +08:00
Harryxzy a3ee91db15 回算后不允许删除薪资核算记录 2023-05-16 15:05:02 +08:00
Harryxzy 7c74149184 薪资核算导入 选择字段根据分类分组 2023-05-15 18:02:22 +08:00
Harryxzy 4ff15ca651 薪资核算结果编辑导入 记录 2023-05-15 10:28:17 +08:00
钱涛 d51c89bb82 公式方法改造 2023-05-15 09:28:22 +08:00
钱涛 f848b74f28 薪酬流程日志 2023-05-12 11:51:42 +08:00
钱涛 eaaf6359af Merge branch 'feature/公式' into release/2.8.2.2305.02 2023-05-12 09:16:54 +08:00
Harryxzy b0084cad9c 薪资核算编辑 手动编辑后自动锁定 2023-05-11 14:40:10 +08:00
Harryxzy 54ca46c653 薪资核算导入项自动锁定 2023-05-11 10:51:43 +08:00
钱涛 53f2c1ebb6 修复提示行号 2023-05-11 10:21:21 +08:00
钱涛 c87db92ee8 公式扩展核算基本信息和核算日期 2023-05-10 14:26:39 +08:00
sy bbba7f314d 薪酬系统-福利，福利档案、核算明细列表获取员工状态逻辑调整 2023-05-08 17:58:17 +08:00
钱涛 6b19445a1a Merge branch 'release/2.8.2.2305.02' into feature/公式 
# Conflicts:
#	src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
 2023-05-08 11:22:23 +08:00
钱涛 8228fbf21c 短信邮件 2023-05-08 09:27:20 +08:00
钱涛 7e940b4db4 减少单次核算的人员 2023-05-05 17:15:25 +08:00
钱涛 0f38b6cbaa 去除mock校验 2023-05-04 19:43:35 +08:00
钱涛 3e8ac01049 公式描述 2023-05-04 18:07:35 +08:00
钱涛 9dc41706b2 Merge branch 'release/2.7.4.2304.02' into feature/公式 2023-05-04 14:40:50 +08:00
钱涛 ae719ad65b 修复人员过多时bug 2023-05-04 11:56:34 +08:00
Harryxzy 0d6355ca4a 修复回算工资单的合计列 2023-04-28 16:04:52 +08:00
钱涛 2d8b4b07d0 Merge branch 'release/2.7.4.2304.02' into feature/报表 
# Conflicts:
#	src/com/engine/salary/biz/SIArchivesBiz.java
 2023-04-28 10:49:33 +08:00
钱涛 1529a30768 薪资项目取消过滤档案，使得导入功能一页面为准 2023-04-27 09:22:20 +08:00
钱涛 433ce6cf91 暂存 2023-04-26 16:04:33 +08:00
钱涛 14fca43e18 暂存 2023-04-26 15:17:08 +08:00
钱涛 40cd70e2a3 Merge branch 'release/2.7.4.2304.02' into feature/公式 2023-04-25 17:39:33 +08:00
sy cea8d14c18 Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02 2023-04-25 09:22:03 +08:00
sy 1f7c271519 薪酬系统-福利档案，待减员tab页删除待办，添加个税扣缴义务人范围过滤 2023-04-24 14:47:28 +08:00
sy 61326928df Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02 2023-04-24 14:07:28 +08:00
Harryxzy e2570dc520 Merge branch 'feature/salaryItemFieldsCanCopy_0420' into release/2.7.4.2304.02 2023-04-24 11:03:17 +08:00
sy 27969cff80 薪酬系统-福利台账，补差导入处理合计值为null的情况 2023-04-24 10:11:02 +08:00
sy c686f52153 薪酬系统-福利台账，补差导入部分福利项缴费信息相关合计逻辑优化 2023-04-23 18:05:32 +08:00
sy 37310f02f6 薪酬系统-福利台账，补差导入相关合计项计算逻辑优化 2023-04-23 16:35:52 +08:00
sy c9a5228f3e Merge remote-tracking branch 'remotes/origin/feature/v4-siAcctImprove-0420' into release/2.7.4.2304.02 2023-04-23 13:36:28 +08:00
Harryxzy 3a555c1866 修复已发 2023-04-20 13:08:58 +08:00
钱涛 ef171db128 公式函数 2023-04-19 19:28:05 +08:00
钱涛 a19b19e23d 公式 2023-04-19 10:15:01 +08:00
sy 62af02522c 薪酬系统-福利台账，线下对比（列表、导入、导出）福利项字段根据正常缴纳中的核算字段获得 2023-04-18 14:21:05 +08:00
钱涛 aeab5c75f5 往期修复 2023-04-18 11:45:30 +08:00
钱涛 c5d9ea5421 累计个人养老金bug 2023-04-18 11:03:09 +08:00
钱涛 4c41b35b2b 外部人员档案优化 2023-04-17 15:31:56 +08:00
sy f68981baac 薪酬系统-福利台账，福利核算、核算明细列表逻辑优化（取消对档案状态的过滤） 2023-04-17 10:27:31 +08:00
钱涛 f619878f2c 暂存 2023-04-17 10:10:39 +08:00
钱涛 bc590b9ee8 自定义报表 2023-04-14 15:18:18 +08:00
钱涛 bc0b84ee4b 档案验证 2023-04-14 10:51:05 +08:00
钱涛 8a2ec10b65 Merge branch 'release/2.7.3.2304.01' into feature/外部人员 2023-04-14 10:31:41 +08:00
Harryxzy b5d3acf418 Merge branch 'feature/salaryItemFieldsCanCopy_0420' into release/2.7.3.2304.01 2023-04-14 09:04:23 +08:00
钱涛 2d8b538897 Merge remote-tracking branch 'origin/fix/employeeServiceFormat_0412' into feature/报表 2023-04-13 14:54:22 +08:00
钱涛 9549e75e00 Merge branch 'release/2.7.3.2304.01' into feature/外部人员 2023-04-13 14:48:43 +08:00
钱涛 59a38954bc Merge branch 'feature/个人养老金' into release/2.7.3.2304.01 
# Conflicts:
#	src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java
 2023-04-13 09:35:29 +08:00
Harryxzy 82ee707f16 employebiz改成employeeservice 2023-04-12 15:27:35 +08:00
钱涛 a4a829d201 年终奖数据 2023-04-11 17:24:31 +08:00
Harryxzy e21b53c2df Merge branch 'fix/deleteSalarySobAddCheck_0414' into release/2.7.3.2304.01 2023-04-11 14:00:26 +08:00
Harryxzy bbe7edaa22 Merge branch 'feature/salaryBillAddSum-0323' into release/2.7.3.2304.01 2023-04-11 13:56:18 +08:00
Harryxzy 0bfe0b62a7 fix 字段重复无法保存 2023-04-11 11:43:32 +08:00
钱涛 e8ae952f18 Merge branch 'release/2.7.3.2304.01' into feature/外部人员 
# Conflicts:
#	src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
 2023-04-11 11:41:30 +08:00
Harryxzy 8c58cf01b3 字段拷贝调整 2023-04-11 10:48:41 +08:00
Harryxzy a286ac6f44 Merge branch 'fix/salaryArchiveImportByRuleBug_0407' into release/2.7.3.2304.01 2023-04-11 10:18:54 +08:00
Harryxzy 0ef8a2ae12 Merge branch 'fix/salaryItemHideDuplicateItem_0407' into release/2.7.3.2304.01 2023-04-11 10:16:28 +08:00
Harryxzy c3dfc5692e 薪资项目拷贝 2023-04-11 09:56:20 +08:00
钱涛 ce0b8ce186 暂存 2023-04-10 12:43:48 +08:00
钱涛 739904d48f 暂存 2023-04-10 09:47:33 +08:00
Harryxzy d9f041c9bb 账套删除前校验是否存在工资单模板 2023-04-07 16:06:47 +08:00
Harryxzy 207d338ec2 薪资账套重复薪资项目 2023-04-07 15:14:07 +08:00
钱涛 b0284022c1 核算导出全部功能修复 2023-04-07 14:39:22 +08:00
钱涛 bb76df3718 个人养老金 2023-04-04 17:29:56 +08:00
Harryxzy accb0d3d2b 社保福利台账 - 合计列 2023-04-04 17:21:29 +08:00
钱涛 44fe9203ab 个人养老金 2023-04-04 14:21:25 +08:00
钱涛 cb46fccb16 工资单推送 2023-04-03 18:49:28 +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 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 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 2fc4560488 薪资档案按照工号导入无效 2023-03-29 16:46:10 +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
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
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
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
钱涛 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
钱涛 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 7de5c1e175 Merge branch 'fix/V3_listShowChange_0309' into release/2.7.1.2303.02 2023-03-10 15:42:42 +08:00
钱涛 d8c13b70d2 内外部人员匹配标识 2023-03-08 18:01:19 +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 b6ee197fe6 薪酬系统,梳理Mapper类使用方式 2023-03-07 14:21:01 +08:00
钱涛 890ff64215 mock接口 2023-03-06 19:45:48 +08:00
钱涛 a423790a35 获取人员信息 2023-03-06 17:57:20 +08:00
钱涛 a5596d503f 外部人员基础信息 2023-03-03 16:57:52 +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 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
钱涛 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
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
钱涛 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
钱涛 a8cb586358 公式删除校验 2023-02-23 15:48:18 +08:00
钱涛 1c2028f551 公式删除优化 2023-02-23 14:52:24 +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
钱涛 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
钱涛 1bdc304ddf 清除公式 2023-02-16 09:16:00 +08:00
钱涛 a2e9c482a4 修复账套根据名称查询bug 
去除调整前后值的限制
 2023-02-15 16:38:54 +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
钱涛 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
Harryxzy 3b657db52a 线下对比Oracle导入报错 2023-02-10 09:59:18 +08:00
Harryxzy d30870e28d 调薪不支持字符 2023-02-09 19:24:25 +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
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
钱涛 2c37086e70 账套群组保持不变 2023-02-09 15:33:35 +08:00
Harryxzy 69dd9cc61c 个税扣缴义务人、薪资账套 导入添加员工状态导入功能 2023-02-08 17:48:14 +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
fcli 0a1198f17d fix: 个税扣缴义务人范围非空判断 2023-02-06 17:16:11 +08:00
钱涛 2ff5ff0dce 考勤列表和导出 2023-02-06 16:28:56 +08:00
钱涛 cdfced412f Merge branch 'feature/年终奖' into release/2.6.1.2301.02 2023-02-02 16:13:05 +08:00
fcli e92ea00b02 fix: 薪资项目公式按分权处理。 
薪资项目管理列表取出薪资档案引用列
 2023-01-31 14:31:46 +08:00
钱涛 9bedcf6d38 年终奖 2023-01-31 14:15:27 +08:00
钱涛 857c39bd2d 年终奖 2023-01-30 17:32:58 +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
Harryxzy dc3bd34e0f 薪资回算sendStatus值update漏写 2023-01-14 13:59:13 +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
fcli f1bdd0ada9 feat: 薪资项目分权，修改落库 2023-01-12 14:19:46 +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 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
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
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
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
fcli 3863a10c27 fix: 一月份不累计上年数据 2023-01-04 14:15:59 +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
sy ee72dcd3f0 薪酬系统-福利台账，调差列表展示默认数据时，处理核算人员外的默认人员数据逻辑优化 2022-12-29 14:43:54 +08:00