Commit Graph

36 Commits

Author SHA1 Message Date
Harryxzy bf2f05e9ab 'xzy-解决oracle批量添加问题' 2022-08-17 13:28:33 +08:00
钱涛 e7968f2545 1、公共枚举接口
2、薪资档案封存标识
2022-07-26 18:01:39 +08:00
钱涛 b23f790fc9 去除Spring注解 2022-07-06 17:36:30 +08:00
钱涛 31a8b4bff9 fix 2022-06-23 17:15:39 +08:00
钱涛 e1629a021e oracle错误和薪资项目错误 2022-06-21 15:08:23 +08:00
钱涛 f5b8806eff 账套 2022-06-15 15:27:23 +08:00
钱涛 b8972bcd43 分权v3 2022-06-09 17:45:28 +08:00
钱涛 cedc9f2644 考勤和申报表的分权 2022-06-07 15:43:22 +08:00
钱涛 2bfd6c90a0 Merge branch 'develop' into release
# Conflicts:
#	src/com/engine/salary/service/impl/SISchemeServiceImpl.java
2022-06-06 10:23:19 +08:00
钱涛 3f0bbd3160 剔除主账号 2022-06-06 10:19:11 +08:00
钱涛 99b5c36864 暂存 2022-05-31 16:41:11 +08:00
钱涛 f8ecb548ed Merge branch 'auth' into release
# Conflicts:
#	src/com/engine/salary/biz/AddUpDeductionBiz.java
#	src/com/engine/salary/biz/AddUpSituationBiz.java
#	src/com/engine/salary/biz/SIAccountBiz.java
#	src/com/engine/salary/biz/SIArchivesBiz.java
#	src/com/engine/salary/biz/SalaryArchiveBiz.java
#	src/com/engine/salary/biz/SalaryArchiveItemBiz.java
#	src/com/engine/salary/biz/SalaryItemBiz.java
#	src/com/engine/salary/biz/SalarySobCheckRuleBiz.java
#	src/com/engine/salary/cmd/datacollection/AddUpDeductionImportCmd.java
#	src/com/engine/salary/cmd/datacollection/AddUpSituationImportCmd.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java
#	src/com/engine/salary/enums/UserStatusEnum.java
#	src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml
#	src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
2022-05-30 18:50:00 +08:00
钱涛 4baa1643f6 oracle适配 2022-05-30 11:51:00 +08:00
MustangDeng d48ef0aeec oracle 适配 2022-05-30 09:14:12 +08:00
MustangDeng 224c823590 oracle 自增返回 2022-05-27 15:01:44 +08:00
钱涛 6103c9233e 批量操作数量限制 2022-05-26 13:41:58 +08:00
钱涛 f6eb69e62a 暂存 2022-05-26 11:02:55 +08:00
钱涛 dc1c865a4b 账套项目删除bug 2022-05-18 14:34:06 +08:00
钱涛 c440ccd0a6 修复 2022-05-10 17:26:58 +08:00
钱涛 ba67612e40 sql兼容性处理 2022-05-06 13:22:16 +08:00
钱涛 e74931aa54 人员字段默认删除 2022-04-27 18:48:41 +08:00
钱涛 c899d370a9 默认员工字段不可删除 2022-04-27 17:20:33 +08:00
钱涛 16a4f32ec1 sqlserver的批量插入bug 2022-04-22 18:00:35 +08:00
钱涛 36d65de007 fix 2022-04-21 14:15:56 +08:00
钱涛 23adb455fd 核算v1 2022-04-08 16:30:10 +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
钱涛 045293426c 账套校验规则 2022-03-28 11:38:33 +08:00
钱涛 1db71a97ff 薪资账套 2022-03-25 18:05:07 +08:00
钱涛 980415c8ca 账套 2022-03-25 10:31:31 +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
钱涛 c01e63040c 薪资项目&账套 2022-03-22 21:01:38 +08:00
钱涛 2f8b56e4ac 参数验证类 2022-03-21 20:09:10 +08:00