Harryxzy
|
ea2d2f9014
|
领悦凭证优化
|
2024-11-27 17:14:23 +08:00 |
|
Harryxzy
|
fe6997117c
|
Merge remote-tracking branch 'origin/custom/领悦业务线' into custom/领悦业务线
|
2024-11-26 17:00:19 +08:00 |
 钱涛
|
ef33f16f3f
|
薪资导出增加分部
|
2024-11-26 10:08:48 +08:00 |
|
钱涛
|
b546e61519
|
人员状态名字修改
|
2024-11-25 18:23:45 +08:00 |
|
Harryxzy
|
a7ebc20688
|
领悦，不同步考勤班次
|
2024-11-20 10:08:22 +08:00 |
|
Harryxzy
|
f9b69aa8e0
|
领悦，不同步考勤班次
|
2024-11-20 09:53:38 +08:00 |
|
Harryxzy
|
038cb81514
|
领悦，不同步考勤班次
|
2024-11-19 20:45:03 +08:00 |
|
Harryxzy
|
a933d60aaf
|
领悦优化
|
2024-10-23 11:31:51 +08:00 |
|
Harryxzy
|
70d9925570
|
领悦凭证删除
|
2024-10-22 14:05:24 +08:00 |
|
Harryxzy
|
bd76b44fbf
|
领悦凭证
|
2024-10-22 11:33:00 +08:00 |
|
Harryxzy
|
8c49838adc
|
Merge branch 'custom/领悦' into custom/领悦业务线
|
2024-10-22 09:53:07 +08:00 |
|
Harryxzy
|
0ce80ffcd6
|
领悦 社保公积金报表拆分sql
|
2024-10-22 09:52:15 +08:00 |
|
钱涛
|
629bb241aa
|
fix冲突
|
2024-10-22 09:50:10 +08:00 |
|
钱涛
|
b99ce85dd9
|
Merge branch 'custom/领悦' into custom/领悦业务线
# Conflicts:
# src/com/engine/salary/constant/SalaryDefaultTenantConstant.java
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
# src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
# src/com/engine/salary/service/VariableArchiveService.java
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
|
2024-10-22 09:44:34 +08:00 |
|
Harryxzy
|
dd7905ac1c
|
Merge branch 'release/2.16.1.2410.01' into custom/领悦
|
2024-10-21 18:05:27 +08:00 |
|
Harryxzy
|
15b1428ff3
|
领悦 社保公积金报表拆分
|
2024-10-21 18:02:04 +08:00 |
|
钱涛
|
2bd336fc16
|
单元格锁定
|
2024-10-18 16:54:34 +08:00 |
|
钱涛
|
af34b8a5b5
|
单元格锁定
|
2024-10-18 16:49:17 +08:00 |
|
钱涛
|
988b82751e
|
考勤日志
|
2024-10-18 16:21:14 +08:00 |
|
钱涛
|
57fdc79e7b
|
修复引用日期转换问题
|
2024-10-18 15:58:43 +08:00 |
|
钱涛
|
9f498551e4
|
单元格锁定字段改成字符型
|
2024-10-18 10:20:29 +08:00 |
|
钱涛
|
641b085a28
|
单元格锁定sql
|
2024-10-17 18:53:37 +08:00 |
|
钱涛
|
be2d6b693a
|
单元格锁定
|
2024-10-17 18:27:37 +08:00 |
|
钱涛
|
cede931b0d
|
版本
|
2024-10-17 14:21:46 +08:00 |
|
钱涛
|
38f773d125
|
优化核算导入效率
|
2024-10-17 14:07:27 +08:00 |
|
钱涛
|
70429df180
|
Merge branch 'custom/上海电力设计院' into release/2.16.1.2410.01
|
2024-10-17 13:42:23 +08:00 |
|
钱涛
|
0d100d9f53
|
修复报表分部条件过滤不生效
|
2024-10-17 10:20:58 +08:00 |
|
钱涛
|
d42e9768c2
|
处理sqlserver浮动数据bug
|
2024-10-16 16:53:24 +08:00 |
|
Harryxzy
|
fc88f03904
|
浮动薪酬加解密
|
2024-10-16 15:47:18 +08:00 |
|
Harryxzy
|
35a0349f38
|
Merge remote-tracking branch 'origin/release/2.15.2.2409.01' into release/2.15.2.2409.01
|
2024-10-16 09:42:10 +08:00 |
|
Harryxzy
|
e8559e1afa
|
修复社保福利导入报无人员 （历史数据兼容bug）
|
2024-10-16 09:41:55 +08:00 |
|
钱涛
|
5f50c26640
|
取消核算导入vlookup支持
|
2024-10-16 09:30:10 +08:00 |
|
钱涛
|
6ec7210720
|
除去核算支持函数
|
2024-10-15 14:40:04 +08:00 |
|
钱涛
|
6336ae24a0
|
Merge branch 'release/2.15.2.2409.01' into custom/上海电力设计院
|
2024-10-15 14:27:55 +08:00 |
|
Harryxzy
|
4c551dae87
|
Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01
|
2024-10-14 15:06:52 +08:00 |
|
Harryxzy
|
dbd1b574e0
|
浮动薪酬优化
|
2024-10-14 15:05:22 +08:00 |
|
Harryxzy
|
49cbb7a7cc
|
浮动薪酬
|
2024-10-14 10:38:30 +08:00 |
|
Harryxzy
|
dcc18a096d
|
领悦凭证推送
|
2024-10-14 09:19:07 +08:00 |
|
Harryxzy
|
c9ce2ae499
|
Merge branch 'release/2.15.2.2409.01' into custom/领悦
|
2024-10-12 16:39:18 +08:00 |
|
Harryxzy
|
a4b6ca6048
|
领悦凭证推送
|
2024-10-12 16:39:09 +08:00 |
|
钱涛
|
779d519a6f
|
Merge branch 'release/2.15.2.2409.01' into feature/自定义列全局设置
|
2024-10-12 11:11:44 +08:00 |
|
钱涛
|
c209399566
|
修复模板设置主键
|
2024-10-12 09:38:08 +08:00 |
|
钱涛
|
265ca2a54e
|
默认展示所有薪资明细列
|
2024-10-11 18:02:52 +08:00 |
|
钱涛
|
a0bc3b5452
|
记录核算日志
|
2024-10-11 17:32:02 +08:00 |
|
钱涛
|
3a224170f1
|
导入字段持久化
|
2024-10-11 17:17:07 +08:00 |
|
钱涛
|
4c4b6ab57d
|
导入字段持久化
|
2024-10-11 17:14:14 +08:00 |
|
钱涛
|
b6c7a7f2bd
|
自定义列全局设置
|
2024-10-11 17:04:13 +08:00 |
|
钱涛
|
32b3ce97a9
|
Merge branch 'release/2.15.2.2409.01' into feature/自定义列全局设置
|
2024-10-11 15:34:44 +08:00 |
|
钱涛
|
64ac30c05f
|
自定义列全局设置
|
2024-10-11 15:34:17 +08:00 |
|
Harryxzy
|
310c77a270
|
excel设置列宽 超过255报错
|
2024-10-11 15:14:21 +08:00 |