Harryxzy
|
5bd66b626f
|
查看工资单后能够继续反馈、确认
|
2023-09-19 16:21:23 +08:00 |
|
Harryxzy
|
da18b0f884
|
薪资账套项目页面改造temp
|
2023-07-25 16:46:57 +08:00 |
 钱涛
|
b98fc4c527
|
非系统人员冲突
|
2023-07-20 10:17:20 +08:00 |
|
钱涛
|
01b02531ce
|
Merge branch 'feature/外部人员' into release/2.9.2.2307.02
# Conflicts:
# src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/sys/service/SalarySysConfService.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
|
2023-07-20 10:08:05 +08:00 |
|
Harryxzy
|
311aa8f139
|
加上大括号
|
2023-07-19 16:17:40 +08:00 |
|
Harryxzy
|
31a863c937
|
没有设置工资单模板时报错
|
2023-07-19 11:51:31 +08:00 |
|
钱涛
|
3cc0d412ce
|
修复导出外部人员名称不显示问题
|
2023-07-19 10:58:11 +08:00 |
|
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 |
|
钱涛
|
942a3b2a97
|
修复工资单发送列表
|
2023-07-13 17:23:28 +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 |
|
钱涛
|
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
|
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 |
|
钱涛
|
4c41b35b2b
|
外部人员档案优化
|
2023-04-17 15:31:56 +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 |
|
钱涛
|
cb46fccb16
|
工资单推送
|
2023-04-03 18:49:28 +08:00 |
|
Harryxzy
|
2e85f72362
|
工资单发放系统异常
|
2023-03-31 09:40:55 +08:00 |
|
钱涛
|
9f6950d8ae
|
工资单发放
|
2023-03-20 17:36:29 +08:00 |
|
钱涛
|
052eebe83a
|
解决工资单人名缺失
|
2023-03-16 19:17:33 +08:00 |