Commit Graph

37 Commits

Author SHA1 Message Date
Harryxzy d24f9bf0a6 汇通二期 2025-07-14 11:17:48 +08:00
Harryxzy d2663fe4ca 汇通批量核算改为同步 2025-06-20 09:55:30 +08:00
Harryxzy 6e26dfa44a Merge branch 'release/2.17.1.2411.01' into custom/汇通建设集团
# Conflicts:
#	src/com/engine/salary/mapper/datacollection/EmployMapper.xml
2024-11-22 09:32:14 +08:00
Harryxzy cd182a24b7 解决冲突 2024-11-14 09:13:23 +08:00
Harryxzy 8a06eaad93 Merge branch 'feature/工资单审批' into release/2.17.1.2411.01
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobServiceImpl.java
#	src/com/engine/salary/sys/constant/SalarySysConstant.java
#	src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
#	src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
2024-11-13 18:36:20 +08:00
Harryxzy 93b95ce820 汇通 薪酬二开 2024-10-30 10:29:36 +08:00
Harryxzy 5810e540ad 汇通temp 2024-10-25 13:27:58 +08:00
钱涛 be2d6b693a 单元格锁定 2024-10-17 18:27:37 +08:00
钱涛 dc3dfc2d6b 去除脱敏报表 2024-09-20 11:41:44 +08:00
钱涛 91863b901f 增加核算日志 2024-09-19 14:17:47 +08:00
Harryxzy 1800c02e58 盛威 2024-04-29 16:08:18 +08:00
钱涛 68d0003f62 新增核算结果的代理 2024-04-16 16:05:42 +08:00
Harryxzy d6705e8917 产品-批量编辑 2023-12-11 13:09:20 +08:00
Harryxzy 419baeb8cd 鲁控数字 2023-12-06 16:05:08 +08:00
Harryxzy 4eb931686e 鲁控数字temp 2023-12-05 14:57:34 +08:00
Harryxzy 822ad87451 薪资核算结果校验拦截 2023-06-27 14:58:33 +08:00
钱涛 f881fa2766 取消注释 2023-06-08 17:19:19 +08:00
钱涛 993db67601 公共进度条功能 2023-06-06 10:30:49 +08:00
钱涛 a19b19e23d 公式 2023-04-19 10:15:01 +08:00
钱涛 b0284022c1 核算导出全部功能修复 2023-04-07 14:39:22 +08:00
钱涛 991338a10e 合计行异步处理 2022-12-02 16:58:19 +08:00
钱涛 271daf29be 批量锁定功能 2022-11-17 09:28:40 +08:00
钱涛 23a1396c12 核算列表求和 2022-09-27 17:43:43 +08:00
钱涛 1d635f1423 核算列表求和 2022-09-27 15:47:13 +08:00
钱涛 e9c95918eb 1、核算表头带上公式
2、修复核算时取福利台账人员信息不准确
2022-08-02 14:58:18 +08:00
钱涛 bf31d993a7 薪酬报表-薪酬核算完成,将数据存储到非加密表,删除人员信息,补充:分部、部门、岗位等其他字段,供数据中心引用 2022-07-11 17:31:33 +08:00
钱涛 c2c4149442 报表接口 2022-07-04 15:34:04 +08:00
钱涛 99b5c36864 暂存 2022-05-31 16:41:11 +08:00
钱涛 e49bc9943f 薪酬核算第一步不使用线程池 2022-05-12 15:41:12 +08:00
钱涛 c852211b0e 核算log 2022-05-07 15:20:39 +08:00
钱涛 231961663f 核算结果导出 2022-05-05 14:10:19 +08:00
钱涛 f2f678c6d1 核算进度 2022-04-29 17:15:22 +08:00
钱涛 6ca41e8e59 字段分类 2022-04-27 18:29:38 +08:00
钱涛 4db39902b5 公式v2 2022-04-14 20:46:17 +08:00
钱涛 692c2f5a79 核算 2022-04-12 19:25:19 +08:00
钱涛 a069447f02 核算基础公式 2022-04-11 20:17:47 +08:00
钱涛 0b72b2e6cb 核算v2 2022-04-08 19:08:59 +08:00