Commit Graph

24 Commits

Author SHA1 Message Date
Harryxzy 52c8ff853a 宁波精华 调整前后相同的值也需要插入数据库 2024-11-12 11:17:39 +08:00
Harryxzy 8c1caebdaf Merge branch 'feature/240701-社保管理员' into custom/宁波精华
# Conflicts:
#	src/com/engine/salary/entity/taxagent/po/TaxAgentAdminPO.java
#	src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
#	src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml
#	src/com/engine/salary/mapper/taxagent/TaxAgentAdminMapper.xml
#	src/com/engine/salary/service/TaxAgentAdminService.java
#	src/com/engine/salary/service/impl/TaxAgentAdminServiceImpl.java
#	src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
#	src/com/engine/salary/wrapper/TaxAgentWrapper.java
2024-07-17 18:18:39 +08:00
Harryxzy 84ce2821f6 1、定薪、返聘action优化
2、修复导出时excel中双击单元格变成黑色
2024-07-10 14:01:09 +08:00
Harryxzy f2ea1e983d 宁波精华报表 2024-06-25 15:23:02 +08:00
钱涛 11802dad91 根据身份证导入 2024-05-28 11:18:19 +08:00
钱涛 c9075058d5 跳过人员范围校验 2024-04-25 13:45:59 +08:00
钱涛 6fc8d8fdee 去除达梦驱动 2024-01-25 11:38:38 +08:00
钱涛 2b13d0c7ef 定薪账套 2023-09-14 11:56:00 +08:00
钱涛 8430397d03 外部人员终极版 2023-03-16 16:10:29 +08:00
钱涛 ace15ca7a1 非系统人员 2023-03-15 18:03:46 +08:00
钱涛 26a6327d44 调薪bug 2023-02-23 18:09:05 +08:00
钱涛 41c56b1bd4 调薪说明 2023-02-22 19:07:13 +08:00
钱涛 a2e9c482a4 修复账套根据名称查询bug
去除调整前后值的限制
2023-02-15 16:38:54 +08:00
钱涛 2748f04d0a 档案为空不生效 2023-02-13 17:23:05 +08:00
钱涛 dfd8f90df1 考勤同步日志控制 2023-01-05 16:24:40 +08:00
钱涛 0d417f1e49 流程生成人员范围 2022-12-07 20:15:52 +08:00
钱涛 b39587e19d 单独调薪action 2022-12-06 18:08:50 +08:00
钱涛 d8f99abb18 调薪,调薪校验流程接口 2022-11-30 11:23:58 +08:00
Harryxzy 5a3f035a41 修复定薪流程姓名重复BUG 2022-11-21 17:19:12 +08:00
Harryxzy 775580f994 --- 2022-11-09 10:20:46 +08:00
钱涛 f1f8ae53af 档案项目默认生效时间取起始缴纳日期 2022-11-03 19:32:51 +08:00
钱涛 e4200ee9f2 定薪流程 2022-10-28 10:19:06 +08:00
钱涛 104213fc04 1、提示优化
2、导入模板
3、定薪流程
2022-10-27 15:17:22 +08:00
钱涛 7a817af154 档案导入 2022-10-26 13:46:36 +08:00