Commit Graph

52 Commits

Author SHA1 Message Date
钱涛 50d502632f 公式 2022-04-16 16:49:22 +08:00
钱涛 9971e9a760 jar 2022-04-16 13:51:53 +08:00
钱涛 7d440ce005 薪资项目分页 2022-04-15 13:54:47 +08:00
钱涛 941a34990f Merge branch 'feature/acct' into develop
# Conflicts:
#	src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java
#	src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java
2022-04-14 20:49:24 +08:00
钱涛 4db39902b5 公式v2 2022-04-14 20:46:17 +08:00
钱涛 a4547db7ff 公式 2022-04-14 10:03:49 +08:00
MustangDeng 87ef976b7c 工资单发放-引包修改 2022-04-14 09:08:04 +08:00
钱涛 a2102a49b4 核算v3 2022-04-13 14:18:00 +08:00
MustangDeng 50c03b19e0 Merge branch 'develop' into feature/salaryBill
# Conflicts:
#	src/com/engine/salary/annotation/SalaryFormulaVar.java
2022-04-13 11:09:41 +08:00
MustangDeng e672961dc2 账套-薪资项目设置,人员基本信息下拉框数据修改 2022-04-13 11:03:27 +08:00
MustangDeng b8ac967ed1 工资单发放-BeanUtil导包问题 2022-04-13 10:33:56 +08:00
钱涛 692c2f5a79 核算 2022-04-12 19:25:19 +08:00
MustangDeng bd8305763e 工资单发放-编译 2022-04-12 10:11:53 +08:00
钱涛 a069447f02 核算基础公式 2022-04-11 20:17:47 +08:00
MustangDeng 1573abd1ee Revert "工资单发放-todo"
This reverts commit b850f5ad
2022-04-11 14:30:30 +08:00
MustangDeng 31acdbb606 Merge branch 'feature/djp' into develop 2022-04-11 14:29:25 +08:00
MustangDeng b850f5ad8d 工资单发放-todo 2022-04-11 14:28:45 +08:00
钱涛 0b72b2e6cb 核算v2 2022-04-08 19:08:59 +08:00
钱涛 23adb455fd 核算v1 2022-04-08 16:30:10 +08:00
钱涛 70f3239e98 查询条件 2022-04-07 20:05:58 +08:00
钱涛 0dedda4dbd 核算 2022-04-07 16:54:10 +08:00
钱涛 caf83c6386 fix 2022-04-07 14:19:06 +08:00
钱涛 90335032fd 调整原因 2022-04-07 11:39:22 +08:00
钱涛 0735bdf99b 记录表头 2022-04-07 09:50:30 +08:00
钱涛 9d223c7a06 核算基础类 2022-04-06 20:01:00 +08:00
钱涛 1c38214f6f 薪资档案表单 2022-04-02 16:57:27 +08:00
钱涛 3307c5c67e 薪资档案后续接口 2022-04-02 15:34:27 +08:00
钱涛 126444b9f3 薪资档案 2022-04-01 18:25:24 +08:00
钱涛 77229d18a0 列表 2022-04-01 14:13:04 +08:00
钱涛 f95d8a7d0d 暂存 2022-04-01 13:50:24 +08:00
钱涛 163963d463 fix bug 2022-03-31 18:41:41 +08:00
钱涛 a8732708a8 薪资档案导入 2022-03-31 15:41:55 +08:00
钱涛 4167cb55ee 限制薪资项目的删除 2022-03-30 20:27:17 +08:00
钱涛 922a055f97 统一sql 2022-03-30 18:00:56 +08:00
钱涛 d6ed96e891 sql修改 2022-03-30 15:58:29 +08:00
钱涛 a3604a28f0 校驗規則列表 2022-03-30 12:15:49 +08:00
钱涛 f8a704e66c 修改sql 2022-03-30 11:29:48 +08:00
钱涛 5c550365f1 薪资档案 2022-03-29 17:10:59 +08:00
钱涛 ba707878fc 薪资档案 2022-03-28 20:04:27 +08:00
钱涛 5ae4eb5fc8 项目id 2022-03-28 16:36:40 +08:00
钱涛 1db71a97ff 薪资账套 2022-03-25 18:05:07 +08:00
钱涛 83e1cf2805 相对更新 2022-03-24 16:59:52 +08:00
钱涛 79f9e010af 账套薪资项目 2022-03-23 20:54:08 +08:00
钱涛 b3d7123401 列表添加id 2022-03-23 18:41:38 +08:00
钱涛 e66445ce20 人员sql 2022-03-23 13:52:43 +08:00
钱涛 c01e63040c 薪资项目&账套 2022-03-22 21:01:38 +08:00
钱涛 0b3b971ecd 参数验证,运行期功能 2022-03-22 10:42:26 +08:00
钱涛 2f8b56e4ac 参数验证类 2022-03-21 20:09:10 +08:00
钱涛 f8d68fa7bc 分页 2022-03-21 09:33:21 +08:00
钱涛 5a7cc85e53 分页 2022-03-17 15:14:35 +08:00