 钱涛
|
f0fce26e8a
|
Merge branch 'release/2.14.4.2406.02' into feature/240502_薪资项目增加默认值设置
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
|
2024-06-19 11:14:31 +08:00 |
|
钱涛
|
64e34d6d08
|
工资单预览
|
2024-06-13 17:46:37 +08:00 |
|
钱涛
|
1983ba968c
|
去除日志
系统薪资项目配置不需要重启
|
2024-06-12 15:35:40 +08:00 |
|
钱涛
|
853482141f
|
小数位支持10位
|
2024-06-12 10:45:32 +08:00 |
|
钱涛
|
f073f6d90c
|
处理刷新非正常人员问题
|
2024-06-11 15:48:07 +08:00 |
|
钱涛
|
c86b53fd27
|
Merge branch 'feature/锁定人员' into release/2.14.3.2406.01
|
2024-05-30 17:06:57 +08:00 |
|
钱涛
|
9aa2a03425
|
Merge branch 'release/2.14.2.2405.02' into release/2.14.3.2406.01
|
2024-05-30 14:41:45 +08:00 |
|
钱涛
|
9e8e7f1f09
|
删除隐藏
|
2024-05-30 14:41:28 +08:00 |
|
钱涛
|
7952e93d01
|
考勤引用显示证件号码
|
2024-05-29 16:53:51 +08:00 |
|
钱涛
|
63851a1fe7
|
社保福利通过证件号码导入
|
2024-05-29 15:32:19 +08:00 |
|
钱涛
|
238438897b
|
处理工资单证件号码不显示
|
2024-05-29 14:04:16 +08:00 |
|
钱涛
|
2c79afa65e
|
锁定人员
|
2024-05-28 17:29:18 +08:00 |
|
钱涛
|
bc5735135c
|
Merge branch 'feature/身份证导入' into release/2.14.3.2406.01
|
2024-05-28 11:28:18 +08:00 |
|
钱涛
|
11802dad91
|
根据身份证导入
|
2024-05-28 11:18:19 +08:00 |
|
钱涛
|
43db025d98
|
Merge branch 'feature/账套副本' into release/2.14.2.2405.02
|
2024-05-23 11:36:38 +08:00 |
Harryxzy
|
bf50976849
|
Merge branch 'fix/240302-社保福利编辑保存改造' into release/2.14.2.2405.02
|
2024-05-23 10:58:30 +08:00 |
|
钱涛
|
1b3da7dfc0
|
身份证
|
2024-05-23 09:16:28 +08:00 |
|
Harryxzy
|
0facbabf55
|
薪资项目增加默认值temp
|
2024-05-20 15:04:14 +08:00 |
|
钱涛
|
3b9981e189
|
处理短信发送空值
|
2024-05-14 15:18:32 +08:00 |
|
钱涛
|
11cbf23b8f
|
统一进位规则
|
2024-05-14 14:27:19 +08:00 |
|
钱涛
|
38ebbb9928
|
解决并发问题
|
2024-05-14 13:28:58 +08:00 |
|
Harryxzy
|
509257b419
|
pdf导出前先校验生成pdf
|
2024-05-11 15:07:54 +08:00 |
|
Harryxzy
|
1c1a77d387
|
移动端工资单列表返回登陆人id
|
2024-05-10 15:41:40 +08:00 |
|
钱涛
|
6d4265acf1
|
职称显示为中午
|
2024-05-08 15:31:36 +08:00 |
|
钱涛
|
c97618bd97
|
修复社保福利修改时没有小数位问题
|
2024-05-08 11:15:52 +08:00 |
|
钱涛
|
1cb89a9d1b
|
账套快照-工资单模板
|
2024-05-06 17:41:39 +08:00 |
|
钱涛
|
3428de9e33
|
账套快照
|
2024-05-06 16:03:29 +08:00 |
|
Harryxzy
|
4b474f864f
|
累计专项附加扣除一键累计，能根据义务人进行累计
|
2024-04-30 14:43:37 +08:00 |
|
钱涛
|
c9075058d5
|
跳过人员范围校验
|
2024-04-25 13:45:59 +08:00 |
|
Harryxzy
|
44ed332ed5
|
修复ecology的多语言导致乱码
|
2024-04-08 17:57:59 +08:00 |
|
Harryxzy
|
2242723d3f
|
Merge branch 'feature/240302-薪资核算导出模板' into release/2.12.1.2403.02
|
2024-04-03 11:39:30 +08:00 |
|
钱涛
|
a06a54f574
|
去除objectUtil
|
2024-04-01 20:25:23 +08:00 |
|
Harryxzy
|
7557c1b330
|
薪资核算导出模板优化
|
2024-03-29 15:45:45 +08:00 |
|
Harryxzy
|
5d2cc92bf8
|
Merge branch 'feature/240302-薪资明细表' into release/2.12.1.2403.02
# Conflicts:
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
|
2024-03-29 10:49:39 +08:00 |
|
Harryxzy
|
582abc061a
|
薪资核算导出模板
|
2024-03-29 10:46:51 +08:00 |
|
Harryxzy
|
0d6bf4dfe3
|
薪资核算导出模板修复
|
2024-03-28 18:28:22 +08:00 |
|
Harryxzy
|
1c40ed0ecd
|
薪资核算导出模板
|
2024-03-26 17:04:56 +08:00 |
|
Harryxzy
|
e3c528c649
|
薪资明细表
|
2024-03-25 16:08:34 +08:00 |
|
Harryxzy
|
25c2e2f1c1
|
其他维度
|
2024-03-22 15:23:03 +08:00 |
|
Harryxzy
|
18c496c009
|
多部门多分部筛选
|
2024-03-21 14:19:36 +08:00 |
|
Harryxzy
|
0c444acd38
|
多部门多分部筛选
|
2024-03-21 14:19:03 +08:00 |
|
Harryxzy
|
216a2c67d3
|
社保福利编辑保存改造
|
2024-03-20 14:47:41 +08:00 |
|
Harryxzy
|
b17d2b70de
|
Merge branch 'feature/240301_阅后即焚' into release/3.0.0.2403.01
|
2024-03-15 09:19:03 +08:00 |
|
钱涛
|
0a7334ddef
|
考勤导入，多语言
|
2024-03-14 18:16:20 +08:00 |
|
钱涛
|
29e81e03c2
|
优化公式不显示未启用的考勤字段
|
2024-03-14 16:08:16 +08:00 |
|
钱涛
|
417c9f703d
|
下载模板时带出数据
|
2024-03-14 15:28:14 +08:00 |
|
Harryxzy
|
b5afaa54df
|
Merge branch 'release/3.0.0.2403.01' into feature/240301_阅后即焚
|
2024-03-12 15:13:34 +08:00 |
|
钱涛
|
836947725f
|
切换了elog位置
|
2024-03-12 14:34:44 +08:00 |
|
钱涛
|
4b823ccca7
|
国际化注解
|
2024-03-11 16:50:47 +08:00 |
|
Harryxzy
|
78d4f5e2ae
|
阅后即焚
|
2024-03-11 10:35:56 +08:00 |