Commit Graph

566 Commits

Author SHA1 Message Date
Harryxzy 3a1765b562 Merge branch 'feature/230701-工资单反馈' into release/2.9.2.2307.02 2023-07-17 15:02:33 +08:00
Harryxzy 1ea80b8fe9 工资单反馈 2023-07-17 15:01:14 +08:00
Harryxzy 8221d4da69 工资单反馈 2023-07-17 11:27:40 +08:00
钱涛 873b90474f Merge branch 'feature/230701qt' into feature/外部人员 2023-07-13 16:55:36 +08:00
钱涛 152eeaa68e 所有配置文件 2023-07-13 16:55:23 +08:00
钱涛 385726fa76 所有配置文件 2023-07-13 16:51:01 +08:00
钱涛 0fc16efb11 核算界面获取外部人员 2023-07-13 14:11:54 +08:00
Harryxzy 30d61e352f 工资单确认反馈 2023-07-13 11:50:02 +08:00
钱涛 888938f150 系统设置接口 2023-07-13 11:33:58 +08:00
Harryxzy 820d15d06f 工资单确认反馈 2023-07-12 15:17:59 +08:00
钱涛 aec6918c12 Merge branch 'release/2.9.1.2307.01' into feature/外部人员
# Conflicts:
#	src/com/engine/salary/biz/EmployBiz.java
#	src/com/engine/salary/biz/SIAccountBiz.java
#	src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java
#	src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
#	src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
#	src/com/engine/salary/service/SalaryEmployeeService.java
#	src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java
#	src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
#	src/com/engine/salary/web/SalarySobController.java
#	src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
#	src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
#	src/com/engine/salary/wrapper/SalarySendWrapper.java
#	src/com/engine/salary/wrapper/TaxAgentSubAdminWrapper.java
#	src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
2023-07-11 16:08:15 +08:00
Harryxzy be895829c2 工资单反馈 2023-07-11 15:29:13 +08:00
Harryxzy 0e2a6c8368 Merge branch 'feature/taxDeclarationWithdraw' into release/2.9.1.2307.01
# Conflicts:
#	src/com/engine/salary/sys/constant/SalarySysConstant.java
#	src/com/engine/salary/sys/entity/vo/AppSettingVO.java
#	src/com/engine/salary/sys/service/SalarySysConfService.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
#	src/com/engine/salary/web/SalarySystemConfigController.java
#	src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
2023-07-10 11:10:10 +08:00
Harryxzy 938f03946b Merge branch 'feature/230701-系统薪资项目可配置删除' into release/2.9.1.2307.01 2023-07-10 10:09:52 +08:00
Harryxzy 9b7ba19d64 Merge branch 'feature/230701-工资单定时发送' into release/2.9.1.2307.01 2023-07-10 10:09:45 +08:00
Harryxzy c8cf6090ff 系统薪资项目可配置删除、工资单模板默认没有隐藏项目 2023-07-04 13:21:19 +08:00
Harryxzy 11c416601d 工资单定时发送渲染bug 2023-07-03 11:21:49 +08:00
Harryxzy faa2b9c16e 工资单模板信息 2023-07-03 09:44:10 +08:00
Harryxzy 04592a58b4 Merge branch 'release/2.8.4.2306.02' into feature/taxDeclarationWithdraw
# Conflicts:
#	src/com/engine/salary/sys/constant/SalarySysConstant.java
#	src/com/engine/salary/sys/service/SalarySysConfService.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
#	src/com/engine/salary/web/SalarySystemConfigController.java
#	src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
2023-06-29 16:40:07 +08:00
Harryxzy ba85231656 个税申报撤回开关-1 2023-06-29 16:38:50 +08:00
Harryxzy 2735661b4a 删除薪资档案 2023-06-29 10:35:55 +08:00
Harryxzy 822ad87451 薪资核算结果校验拦截 2023-06-27 14:58:33 +08:00
钱涛 6f3593f44b Merge branch 'feature/短信验证码' into release/2.8.4.2306.02
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
#	src/com/engine/salary/sys/constant/SalarySysConstant.java
2023-06-26 13:54:56 +08:00
Harryxzy 7c44a2ad6b Merge branch 'feature/waterMark' into release/2.8.4.2306.02
# Conflicts:
#	src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
#	src/com/engine/salary/web/SalaryBillController.java
2023-06-26 13:28:21 +08:00
Harryxzy a43123efc0 Merge branch 'fix/DBType修改' into release/2.8.4.2306.02 2023-06-26 13:26:27 +08:00
Harryxzy 3be6eaa16f Merge branch 'feature/核算人员匹配规则(是否包含停薪列)' into release/2.8.4.2306.02 2023-06-26 13:26:03 +08:00
Harryxzy 0117624dc4 Merge branch 'fix/回算后无法发放第二次工资单' into release/2.8.4.2306.02 2023-06-26 13:25:36 +08:00
Harryxzy 5ecba7fa3e Merge branch 'feature/taxDeclarationWithdraw' into release/2.8.4.2306.02 2023-06-26 13:25:01 +08:00
钱涛 3708aea0de 考勤引用-列表字段根据当时引用情况生成 2023-06-20 17:00:14 +08:00
Harryxzy 0e601e3967 修改DBType的写法 2023-06-19 13:59:24 +08:00
Harryxzy d9f57ac258 修复回算后无法发放第二次核算的工资单 2023-06-16 16:41:49 +08:00
钱涛 8612f0e5b2 Merge branch 'release/2.8.4.2306.02' into feature/短信验证码 2023-06-16 14:54:24 +08:00
Harryxzy 3096954628 核算人员匹配规则(是否包含停薪列表)暂存 2023-06-16 14:40:36 +08:00
钱涛 2480525fa6 修复同步档案bug
缓存公共接口
2023-06-15 10:44:31 +08:00
钱涛 912c80c97f 验证方式 2023-06-14 16:15:05 +08:00
钱涛 57798a8e3e 短信验证码功能 2023-06-14 15:51:26 +08:00
Harryxzy b544c5e2c1 水印预览 2023-06-13 10:02:11 +08:00
钱涛 8bde871286 档案返回列表状态 2023-06-12 15:36:27 +08:00
Harryxzy c37750b538 撤回个税申报 2023-06-12 10:40:01 +08:00
Harryxzy 76977331af 暂存 2023-06-09 17:57:17 +08:00
Harryxzy b2f39f56e2 Merge branch 'fix/sysSalaryItemSearchBUG' into release/2.8.3.2306.01 2023-06-09 09:50:25 +08:00
钱涛 f881fa2766 取消注释 2023-06-08 17:19:19 +08:00
Harryxzy dbb2a97be4 系统薪资项目列表显示改造 2023-06-08 11:10:40 +08:00
钱涛 37d9c04a30 去除发放状态中文转换 2023-06-07 09:43:54 +08:00
钱涛 4a258aa45b 替换短信发送方法 2023-06-06 16:40:09 +08:00
钱涛 f154753698 拦截短信 2023-06-06 15:02:53 +08:00
钱涛 4358dc20a5 Merge branch 'release/2.8.3.2306.01' into feature/短信邮件 2023-06-06 14:24:23 +08:00
钱涛 0e5eb1b11e 工资单发送 2023-06-06 11:48:19 +08:00
钱涛 993db67601 公共进度条功能 2023-06-06 10:30:49 +08:00
钱涛 91e3b335dd 工资单通道 2023-06-05 13:35:17 +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 601b90d188 薪资档案薪资项目排序 2023-05-31 09:55:24 +08:00
钱涛 220848e92d 档案项目正序排列 2023-05-26 11:15:40 +08:00
钱涛 ec90e31695 Merge branch 'release/2.8.3.2306.01' into feature/短信邮件 2023-05-24 16:20:39 +08:00
钱涛 8ad88b1e97 我的工资接口修改 2023-05-17 14:10:12 +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
钱涛 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
钱涛 40cd70e2a3 Merge branch 'release/2.7.4.2304.02' into feature/公式 2023-04-25 17:39:33 +08:00
钱涛 a19b19e23d 公式 2023-04-19 10:15:01 +08:00
钱涛 4c41b35b2b 外部人员档案优化 2023-04-17 15:31:56 +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
Harryxzy 82ee707f16 employebiz改成employeeservice 2023-04-12 15:27:35 +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 482f4dfc25 薪资项目名不允许包含大括号 2023-04-11 10:36:06 +08:00
钱涛 b0284022c1 核算导出全部功能修复 2023-04-07 14:39:22 +08:00
钱涛 052eebe83a 解决工资单人名缺失 2023-03-16 19:17:33 +08:00
钱涛 62d124efb1 外部人员终极版 2023-03-15 22:48:01 +08:00
钱涛 ace15ca7a1 非系统人员 2023-03-15 18:03:46 +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
钱涛 db09f8047e 注释 2023-03-15 11:04:54 +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
钱涛 767fbe36f5 外部人员 2023-03-14 10:52:48 +08:00
钱涛 a61b7ac7bc 外部人员 2023-03-13 16:04:19 +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
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
钱涛 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
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
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
钱涛 a5596d503f 外部人员基础信息 2023-03-03 16:57:52 +08:00
钱涛 79a29df0de 暂存 2023-03-03 14:40:17 +08:00
钱涛 ca20ed8ca2 Merge branch 'release/2.6.3.2303.01' into feature/外部人员 2023-03-02 19:48:40 +08:00
Harryxzy f48e98cb11 补发工资单模块,薪资项目名称修改时,展示同步修改 2023-03-02 14:51:51 +08:00
钱涛 e73ed7142f 正常核算工资单模板同步项目名称 2023-03-02 13:37:28 +08:00
钱涛 1568b1e03d 外部人员基础类 2023-03-01 09:05:03 +08:00
钱涛 8c8d79aba3 档案字段删除 2023-02-27 18:27:11 +08:00
钱涛 5f9a7af0fa 修复数据采集按部门搜索 2023-02-22 17:58:19 +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
钱涛 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
钱涛 1c93dab9f0 获取人员档案 2023-02-14 15:41:03 +08:00
钱涛 8b594c1882 自发起调薪流程 2023-02-13 14:53:35 +08:00
钱涛 49894ad6a2 修复申报表总数 2023-02-13 10:59:09 +08:00
Harryxzy 510a2e7d29 处理工资单发放历史数据执行时间提前 2023-02-09 19:43:43 +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
钱涛 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
fcli 5ee8097b3e Merge branch 'feat/salaryBillSaveItem042' into release/2.6.1.2301.02 2023-02-09 17:22:53 +08:00
fcli fdf343dbbd fix: 字段管理可以切换薪资引用 2023-02-09 11:08:03 +08:00
钱涛 2ff5ff0dce 考勤列表和导出 2023-02-06 16:28:56 +08:00
钱涛 0fb9fb51a0 修复调薪记录显示问题 2023-02-06 11:08:59 +08:00
fcli 3f145e133b feat: 添加是否补发参数 2023-02-01 13:39:14 +08:00
fcli 78f8630465 feat: 薪资账套项目列表分权 2023-02-01 11:23:43 +08:00
fcli dec7c89856 feat: 发放模板获取可用分组或项目 2023-02-01 11:22:38 +08:00
fcli e92ea00b02 fix: 薪资项目公式按分权处理。
薪资项目管理列表取出薪资档案引用列
2023-01-31 14:31:46 +08:00
fcli da47210b22 fix: 薪资档案根据薪资项目分权展示 2023-01-31 14:05:40 +08:00
钱涛 857c39bd2d 年终奖 2023-01-30 17:32:58 +08:00
fcli 80019a029c feat: 获取部分字段 2023-01-28 13:56:02 +08:00
fcli bd2597541d feat: 字段管理 2023-01-18 09:38:43 +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 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
sy 84aeb5059f 薪酬系统-福利台账,调差方式3时的福利项 2022-12-28 17:01:15 +08:00
sy 494462092d 薪酬系统-福利台账,补缴方式选择指定月的缴纳基数获取功能 2022-12-27 17:34:46 +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 d2be8e86ea Merge branch 'feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03 2022-12-22 09:09:00 +08:00
Harryxzy ddea8c9066 回算工资单发放调整 2022-12-19 11:12:26 +08:00
Harryxzy 0ace75ab06 工资单发放模板展示 2022-12-16 14:55:11 +08:00
Harryxzy 82577f97e0 舍入规则保存错误 2022-12-16 11:22:43 +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
Harryxzy 5f37281757 添加backcalctype 2022-12-14 18:21:25 +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
钱涛 4d677b4d58 mock公式运行 2022-12-13 16:13:45 +08:00
sy ae72d25431 Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siAccountBalance-1208 2022-12-12 13:43:16 +08:00
fcli b58e71989d feat: 统一修改到内存分页 2022-12-12 10:25:55 +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
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 19022fc505 fix 编辑工资单模板,补发显示部分 2022-12-07 10:34:41 +08:00
钱涛 b39587e19d 单独调薪action 2022-12-06 18:08:50 +08:00
Harryxzy c0d916c286 薪资回算功能,工资单部分 2022-12-06 15:29:08 +08:00