 钱涛
|
5241972151
|
工资单时效设置
|
2023-10-07 14:46:28 +08:00 |
Harryxzy
|
bc7d7b3326
|
Merge branch 'feature/230902_报表共享' into release/2.9.5.2309.01
|
2023-09-21 15:06:04 +08:00 |
|
Harryxzy
|
7a57849a25
|
报表fixbug
|
2023-09-21 15:05:39 +08:00 |
sy
|
f4883ad87c
|
Merge remote-tracking branch 'remotes/origin/feature/230901-社保福利方案搜索功能' into release/2.9.5.2309.01
|
2023-09-21 14:10:06 +08:00 |
|
sy
|
5f84ed451b
|
Merge remote-tracking branch 'remotes/origin/feature/230901-福利台账-调差，支持一个人存在多个调差记录' into release/2.9.5.2309.01
|
2023-09-21 14:09:54 +08:00 |
|
Harryxzy
|
74e4d39b83
|
报表fix
|
2023-09-20 15:02:44 +08:00 |
|
sy
|
bf6918264f
|
薪酬系统-福利方案，福利方案修改action
|
2023-09-19 15:24:44 +08:00 |
|
Harryxzy
|
897a7731bf
|
报表fixbug
|
2023-09-19 13:59:08 +08:00 |
|
Harryxzy
|
c7713353dd
|
报表fixbug
|
2023-09-19 13:34:51 +08:00 |
|
Harryxzy
|
5f1ef51892
|
报表共享temp
|
2023-09-18 18:20:53 +08:00 |
|
sy
|
5538a7d01e
|
薪酬系统-福利方案，增加查询功能
|
2023-09-18 16:30:52 +08:00 |
|
sy
|
3e7180a25e
|
Merge remote-tracking branch 'remotes/origin/feature/230901-福利档案-非系统人员tab' into feature/230901-福利台账-调差，支持一个人存在多个调差记录
|
2023-09-08 16:57:32 +08:00 |
|
sy
|
9bd270e77d
|
薪酬系统-福利台账，调差支持一人多条记录
|
2023-09-08 13:24:27 +08:00 |
|
sy
|
a8e118b33a
|
薪酬系统-非系统人员管理，导入时增加对多级部门的识别
|
2023-09-07 15:11:10 +08:00 |
|
sy
|
f6094cbc7a
|
薪酬系统-福利档案，非系统人员tab页列表
|
2023-09-06 10:04:58 +08:00 |
|
Harryxzy
|
f16f62304c
|
Merge branch 'feature/230901-自动同步结束发薪日期' into release/2.9.4.2308.02
|
2023-08-31 13:57:49 +08:00 |
|
Harryxzy
|
64f64c4f89
|
自动同步离职人员结束发薪日期
|
2023-08-30 15:34:54 +08:00 |
|
Harryxzy
|
bd75ef8d3b
|
自动同步离职人员社保档案、薪资档案最后缴纳日期
|
2023-08-30 13:09:56 +08:00 |
|
Harryxzy
|
c1893f9152
|
自动同步结束发薪日期temp
|
2023-08-30 10:41:00 +08:00 |
|
sy
|
8966730267
|
Merge remote-tracking branch 'remotes/origin/fix/230802-函数中增加福利项基数信息' into release/2.9.4.2308.02
|
2023-08-30 10:27:51 +08:00 |
|
sy
|
f925943b31
|
Merge remote-tracking branches 'remotes/origin/feature/230802-福利方案-修改方案明细接口' and 'remotes/origin/fix/230802-优化福利台账导出合计列' into feature/230802-福利档案-档案相关action
|
2023-08-24 09:15:48 +08:00 |
|
sy
|
a3b67ab091
|
薪酬系统-福利方案，福利方案明细数据修改接口，明细表更细sql优化
|
2023-08-23 18:39:02 +08:00 |
|
sy
|
770074ba23
|
薪酬系统-薪资核算，非系统人员查询问题修复
|
2023-08-23 17:48:52 +08:00 |
|
sy
|
299284872f
|
薪酬系统-福利方案，福利方案明细数据修改接口
|
2023-08-21 14:58:01 +08:00 |
|
sy
|
4a7b04152b
|
薪酬系统-薪资核算，薪资项目函数增加福利基数信息
|
2023-08-18 13:30:42 +08:00 |
|
sy
|
63023ae8e6
|
薪酬系统-福利档案、台账，档案增加分部字段、tab计数过滤非系统人员、补差取消部分字段展示
|
2023-08-17 11:31:38 +08:00 |
|
Harryxzy
|
19cb2d9622
|
Merge branch 'feature/230703-薪资账套项目页面改造' into release/2.9.3.2308.01
|
2023-08-14 09:19:20 +08:00 |
|
Harryxzy
|
7ebb8d6618
|
Merge branch 'feature/230702-自定义工资项目展示名' into release/2.9.3.2308.01
|
2023-08-14 09:19:04 +08:00 |
|
sy
|
9f021b6d5e
|
薪酬系统-福利档案，修复非系统人员增量数据造成的bug
|
2023-08-08 15:03:52 +08:00 |
|
Harryxzy
|
6a01f0d785
|
Merge branch 'release/2.9.2.2307.02' into feature/230702-自定义工资项目展示名
|
2023-08-08 11:42:41 +08:00 |
|
Harryxzy
|
fa7eb0ee60
|
Merge branch 'release/2.9.2.2307.02' into feature/230703-薪资账套项目页面改造
|
2023-08-08 11:06:06 +08:00 |
|
sy
|
8c9049f1f7
|
Merge remote-tracking branch 'remotes/origin/feature/230702-非系统人员导入功能' into release/2.9.3.2308.01
|
2023-08-04 15:26:24 +08:00 |
|
sy
|
4048d0998c
|
Merge remote-tracking branch 'remotes/origin/fix/230801-无法生成薪资、社保档案' into release/2.9.3.2308.01
|
2023-08-04 15:18:56 +08:00 |
|
sy
|
6dd6eca3bf
|
薪酬系统-人员匹配，优化全量人力表人员查询sql
|
2023-08-04 15:07:41 +08:00 |
|
sy
|
07eb966c18
|
薪酬系统-非系统人员管理，非系统人员导入逻辑优化
|
2023-08-04 10:02:06 +08:00 |
|
Harryxzy
|
ebd2e8651f
|
Merge remote-tracking branch 'origin/release/2.9.3.2308.01' into release/2.9.3.2308.01
|
2023-08-03 09:27:05 +08:00 |
|
Harryxzy
|
f6dc6d9257
|
fix个税扣缴义务人删除人员范围，档案不跳到停薪
|
2023-08-02 14:47:40 +08:00 |
|
sy
|
a8f9134418
|
Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into feature/230702-非系统人员导入功能
|
2023-07-31 16:46:10 +08:00 |
|
sy
|
494156aeaf
|
Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into feature/230702-福利方案-自定义福利项删除功能
|
2023-07-31 16:45:11 +08:00 |
|
Harryxzy
|
2b08efb483
|
复制工资单模板时同时复制工资单展示名称信息
|
2023-07-31 14:13:07 +08:00 |
|
sy
|
007d6df3cd
|
薪酬系统-非系统人员管理，非系统人员导入
|
2023-07-28 10:12:59 +08:00 |
|
Harryxzy
|
ed99e186e1
|
fix代码合并bug
|
2023-07-26 17:56:25 +08:00 |
|
Harryxzy
|
36f6a457cf
|
fix代码合并bug
|
2023-07-26 17:53:40 +08:00 |
|
Harryxzy
|
d5d84967c4
|
Merge branch 'feature/230701-工资单反馈' into release/2.9.2.2307.02
|
2023-07-26 17:47:53 +08:00 |
|
Harryxzy
|
f5b70764d3
|
fix
|
2023-07-26 17:44:41 +08:00 |
|
Harryxzy
|
da18b0f884
|
薪资账套项目页面改造temp
|
2023-07-25 16:46:57 +08:00 |
|
sy
|
5acf9dc8ad
|
薪酬系统-福利方案，自定义福利项删除
|
2023-07-25 16:17:24 +08:00 |
|
sy
|
7969360e67
|
薪酬系统-福利方案，自定义福利项支持修改缴费对象
|
2023-07-25 14:28:35 +08:00 |
|
Harryxzy
|
a8a414a48b
|
薪资账套项目页面改造temp
|
2023-07-24 17:11:19 +08:00 |
|
sy
|
174941ea63
|
薪酬系统-福利档案，保存功能对于存在冗余数据的情况，利用当前编辑数据，新建对应档案并与base_info表进行关联
|
2023-07-24 16:39:48 +08:00 |
|
Harryxzy
|
ad6a571310
|
自定义工资项目展示名fix
|
2023-07-21 11:08:54 +08:00 |
|
钱涛
|
0119161173
|
修复冲突
|
2023-07-21 10:46:55 +08:00 |
|
Harryxzy
|
84d9184959
|
自定义工资项目展示名
|
2023-07-20 15:37:20 +08:00 |
|
Harryxzy
|
ce32c6571c
|
系统薪资项目重名
|
2023-07-20 11:14:58 +08:00 |
|
Harryxzy
|
b95663ada8
|
自定义工资项目展示名
|
2023-07-20 10:42:16 +08:00 |
|
sy
|
c7fe4fee23
|
Merge branches 'feature/230701-社保福利-核算记录的校验' and 'feature/230701-薪资核算-导出功能可选择字段导出' into release/2.9.2.2307.02
|
2023-07-20 10:19:40 +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
|
8e6bd24d0d
|
自定义工资项目展示名
|
2023-07-19 16:14:25 +08:00 |
|
Harryxzy
|
0a4c19fb36
|
Merge branch 'feature/230702-薪资项目-核算时隐藏' into release/2.9.2.2307.02
|
2023-07-19 11:11:46 +08:00 |
|
Harryxzy
|
bbb8417008
|
自定义工资项目展示名temp
|
2023-07-18 16:28:29 +08:00 |
|
Harryxzy
|
1ea80b8fe9
|
工资单反馈
|
2023-07-17 15:01:14 +08:00 |
|
Harryxzy
|
88892f1aac
|
工资单反馈fixBug
|
2023-07-17 12:36:20 +08:00 |
|
Harryxzy
|
8221d4da69
|
工资单反馈
|
2023-07-17 11:27:40 +08:00 |
|
sy
|
b0e8da2ad4
|
薪酬系统-福利台账，列表排序规则账单月份逆序、更新时间逆序
|
2023-07-14 17:32:16 +08:00 |
|
Harryxzy
|
faf9636a0d
|
薪资项目-核算时隐藏 temp
|
2023-07-14 11:34:53 +08:00 |
|
Harryxzy
|
6279f0d8c9
|
工资单反馈
|
2023-07-14 09:55:36 +08:00 |
|
Harryxzy
|
30d61e352f
|
工资单确认反馈
|
2023-07-13 11:50:02 +08:00 |
|
Harryxzy
|
820d15d06f
|
工资单确认反馈
|
2023-07-12 15:17:59 +08:00 |
|
Harryxzy
|
58fe219cdb
|
fix 工资单反馈bug
|
2023-07-12 11:25:44 +08:00 |
|
sy
|
47dc9e35bd
|
薪酬系统-福利台账，已归档状态下重新核算按钮增加是否被薪资核算引用校验逻辑
|
2023-07-11 17:56:45 +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
|
33a0723ad2
|
Merge branch 'release/2.9.1.2307.01' into feature/230701-工资单反馈
|
2023-07-11 15:29:21 +08:00 |
|
Harryxzy
|
be895829c2
|
工资单反馈
|
2023-07-11 15:29:13 +08:00 |
|
钱涛
|
f53c904fde
|
Merge branch 'fix/230701修复项目添加时名称校验问题' into release/2.9.1.2307.01
|
2023-07-11 11:08:39 +08:00 |
|
钱涛
|
bb6cf386cb
|
修复
|
2023-07-11 11:05:35 +08:00 |
|
sy
|
a55ca5182e
|
Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01
|
2023-07-11 09:59:29 +08:00 |
|
sy
|
b705161492
|
薪酬系统-薪资核算、薪资档案、福利档案，高级搜索功能问题修复
|
2023-07-10 14:33:43 +08:00 |
|
Harryxzy
|
9b7ba19d64
|
Merge branch 'feature/230701-工资单定时发送' into release/2.9.1.2307.01
|
2023-07-10 10:09:45 +08:00 |
|
Harryxzy
|
e90bd66489
|
Merge branch 'feature/230701-删除档案' into release/2.9.1.2307.01
|
2023-07-10 10:09:38 +08:00 |
|
sy
|
b92c7ff599
|
薪酬系统-薪资核算、薪资档案、福利档案，高级搜索中的状态条件改为数组类型的入参
|
2023-07-07 15:32:12 +08:00 |
|
sy
|
fa28db9c79
|
薪酬系统-薪资核算，高级搜索和导出带入筛选条件未生效问题修复
|
2023-07-07 10:15:23 +08:00 |
|
Harryxzy
|
508e324dac
|
工资单定时发送 添加 发放周期
|
2023-07-05 10:36:02 +08:00 |
|
Harryxzy
|
c78839d8c0
|
工资单定时发送 添加 发放周期
|
2023-07-04 18:03:57 +08:00 |
|
Harryxzy
|
8dc3883168
|
工资单定时发送
|
2023-07-03 17:46:11 +08:00 |
|
Harryxzy
|
9842784297
|
工资单定时发送 - 模板保存
|
2023-06-30 15:58:55 +08:00 |
|
Harryxzy
|
2735661b4a
|
删除薪资档案
|
2023-06-29 10:35:55 +08:00 |
|
sy
|
041303275b
|
Merge remote-tracking branch 'remotes/origin/release/2.8.4.2306.02' into feature/230602-数据库适配-PG
|
2023-06-27 15:09:12 +08:00 |
|
Harryxzy
|
6ae98ce50a
|
Merge branch 'fix/新建定量维度时数据透视没有值' into release/2.8.4.2306.02
|
2023-06-26 14:23:27 +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
|
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 |
|
sy
|
f2cca4cfd7
|
Merge remote-tracking branch 'remotes/origin/fix/DBType修改' into feature/230602-数据库适配-PG
|
2023-06-26 10:15:24 +08:00 |
|
sy
|
8514f076d0
|
薪酬系统-pg数据库适配，考勤引用-设置表头字段显示异常问题修复
|
2023-06-26 10:14:07 +08:00 |
|
sy
|
3657abe41b
|
薪酬系统-pg数据库适配，福利档案状态变换异常问题修复
|
2023-06-25 17:56:18 +08:00 |
|
sy
|
1bb9b939f0
|
薪酬系统-pg数据库适配，薪资档案待定薪导入问题修复
|
2023-06-25 13:50:20 +08:00 |
|
Harryxzy
|
e7edb9040c
|
修复无分类
|
2023-06-20 17:27:18 +08:00 |