Commit Graph

102 Commits

Author SHA1 Message Date
Harryxzy e83302caac 工资单反馈 2023-07-17 12:11:31 +08:00
Harryxzy 8221d4da69 工资单反馈 2023-07-17 11:27:40 +08:00
Harryxzy 6279f0d8c9 工资单反馈 2023-07-14 09:55:36 +08:00
Harryxzy 30d61e352f 工资单确认反馈 2023-07-13 11:50:02 +08:00
Harryxzy 58fe219cdb fix 工资单反馈bug 2023-07-12 11:25:44 +08:00
Harryxzy 56c1666542 工资单发放 2023-07-11 17:51:52 +08:00
Harryxzy 5dc2dadd46 工资单自动确认 2023-07-11 17:28:15 +08:00
Harryxzy be895829c2 工资单反馈 2023-07-11 15:29:13 +08:00
Harryxzy 508e324dac 工资单定时发送 添加 发放周期 2023-07-05 10:36:02 +08:00
Harryxzy c78839d8c0 工资单定时发送 添加 发放周期 2023-07-04 18:03:57 +08:00
Harryxzy a5a05aabda 工资单定时发送fix 2023-07-04 14:35:51 +08:00
Harryxzy 8dc3883168 工资单定时发送 2023-07-03 17:46:11 +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 d9f57ac258 修复回算后无法发放第二次核算的工资单 2023-06-16 16:41:49 +08:00
Harryxzy 1805726387 限制无法打开他人工资单 2023-06-16 10:14:28 +08:00
Harryxzy f4b3a742f0 系统默认水印 2023-06-16 09:58:54 +08:00
钱涛 57798a8e3e 短信验证码功能 2023-06-14 15:51:26 +08:00
Harryxzy b544c5e2c1 水印预览 2023-06-13 10:02:11 +08:00
Harryxzy 7a40a31d6f 水印 - 暂存2 2023-06-12 15:19:24 +08:00
Harryxzy 76977331af 暂存 2023-06-09 17:57:17 +08:00
钱涛 a308ee8d1f 获取员工短信内容 2023-06-06 14:21:35 +08:00
钱涛 0e5eb1b11e 工资单发送 2023-06-06 11:48:19 +08:00
钱涛 4582ab1e51 邮件审批方法 2023-06-06 09:51:07 +08:00
钱涛 91e3b335dd 工资单通道 2023-06-05 13:35:17 +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 0ec6e740d3 Merge branch 'fix/backCalcSumRow' into release/2.8.3.2306.01 2023-05-29 16:48:18 +08:00
Harryxzy 7e841f6fd3 修复回算工资单合计列 2023-05-26 15:13:56 +08:00
钱涛 ec90e31695 Merge branch 'release/2.8.3.2306.01' into feature/短信邮件 2023-05-24 16:20:39 +08:00
Harryxzy a916e061d8 Merge branch 'fix/deleteBackCalcRecordBUG' into release/2.8.2.2305.02 2023-05-22 14:03:22 +08:00
钱涛 8ad88b1e97 我的工资接口修改 2023-05-17 14:10:12 +08:00
Harryxzy a3ee91db15 回算后不允许删除薪资核算记录 2023-05-16 15:05:02 +08:00
钱涛 8228fbf21c 短信邮件 2023-05-08 09:27:20 +08:00
Harryxzy 0d6355ca4a 修复回算工资单的合计列 2023-04-28 16:04:52 +08:00
钱涛 a19b19e23d 公式 2023-04-19 10:15:01 +08:00
钱涛 cb46fccb16 工资单推送 2023-04-03 18:49:28 +08:00
钱涛 9f6950d8ae 工资单发放 2023-03-20 17:36:29 +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 ca03e0785e 工资单发放详情导出没有部门信息 2023-03-15 17:09:02 +08:00
Harryxzy 712f30ddfa 工资单发放详情合计列 2023-03-15 16:00:37 +08:00
Harryxzy 4ce79438e6 工资单没有工号BUG 2023-03-07 17:43:51 +08:00
钱涛 26b8996d42 公司名 2023-03-02 17:59:58 +08:00
钱涛 6de22b142d 1、工资单模板
2、一键累计
2023-03-02 17:11:42 +08:00
钱涛 fd9b592384 修复核算未分类项目不显示 2023-03-02 11:25:25 +08:00
钱涛 44819a0903 工资单后台校验 2023-02-13 17:25:13 +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
Harryxzy dc3bd34e0f 薪资回算sendStatus值update漏写 2023-01-14 13:59:13 +08:00
Harryxzy 07292531db 重新回算提示 2022-12-19 18:03:17 +08:00
Harryxzy ddea8c9066 回算工资单发放调整 2022-12-19 11:12:26 +08:00