qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,383 Commits 293 Branches 39 Tags 49 MiB
Commit Graph

283 Commits

Author SHA1 Message Date
钱涛 ff88b1f9ca 员工字段不可重复 2022-06-21 11:38:55 +08:00
钱涛 3f8ab52b8c 分权 2022-06-20 15:17:08 +08:00
钱涛 3ab0440078 分权 2022-06-20 14:09:18 +08:00
钱涛 b5871e1ea9 权限项 2022-06-16 14:13:22 +08:00
钱涛 2731e4eddd sql 2022-06-15 16:31:40 +08:00
钱涛 f5b8806eff 账套 2022-06-15 15:27:23 +08:00
钱涛 8d6a3c41d7 fix人员同步 2022-06-15 09:29:43 +08:00
钱涛 926bfbce16 sql 2022-06-14 17:39:23 +08:00
钱涛 cea24499f7 sql 2022-06-13 09:23:48 +08:00
钱涛 24e6792818 sql 2022-06-10 18:59:06 +08:00
钱涛 e6c6b8eb57 Merge branch 'auth-fl' into release 
# Conflicts:
#	resource/sql/分权.sql
#	src/com/engine/salary/biz/SIAccountBiz.java
#	src/com/engine/salary/mapper/taxagent/TaxAgentMapper.xml
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
#	src/com/engine/salary/service/impl/SIExportServiceImpl.java
 2022-06-10 16:58:45 +08:00
钱涛 d09856c390 人员范围保存校验 2022-06-10 14:21:21 +08:00
钱涛 382620c589 申报表 2022-06-09 19:02:18 +08:00
钱涛 860c89b560 申报和往期异常 2022-06-08 16:36:50 +08:00
钱涛 6c54847f88 默认关闭 2022-06-07 19:16:13 +08:00
钱涛 79632dd1bf 申报表分权 2022-06-07 19:10:40 +08:00
MustangDeng 20e04f503e sql server 分权脚本修改 2022-06-07 15:19:21 +08:00
MustangDeng 38c08b6e79 sql server 分权sql 2022-06-07 13:26:00 +08:00
钱涛 eacb04388f 社保福利分权2.0 2022-06-06 19:08:39 +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
钱涛 364bf58bda fix 2022-06-01 15:59:56 +08:00
钱涛 e6da6a3ff1 fix 2022-06-01 15:52:37 +08:00
钱涛 7633a06636 Merge branch 'develop' into release 2022-05-31 20:07:33 +08:00
钱涛 2c71590c98 暂存 2022-05-31 19:29:45 +08:00
钱涛 69c76ea687 Merge branch 'auth-1' into release 2022-05-31 18:29:43 +08:00
钱涛 d800ab1925 Merge branch 'develop' into release 2022-05-31 18:29:34 +08:00
钱涛 3471783d65 薪酬还原脚本 2022-05-31 13:53:57 +08:00
钱涛 45c3f91145 其他扣除 2022-05-31 11:43:45 +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
MustangDeng 6ee93fdeea 默认不开启非标 2022-05-30 17:35:40 +08:00
MustangDeng e0e19d616e oracle脚本调整位置 2022-05-30 17:34:53 +08:00
钱涛 bccda4c7a3 sql 2022-05-30 14:46:52 +08:00
钱涛 843db8db35 Merge remote-tracking branch 'origin/develop' into develop 2022-05-30 13:47:38 +08:00
钱涛 2c1d1a31dc sql 2022-05-30 13:47:31 +08:00
MustangDeng 597e2206e9 like 修改 2022-05-30 13:43:28 +08:00
MustangDeng 5fe3b59ad5 oracle sql修改 2022-05-30 12:10:07 +08:00
MustangDeng b80f31c6f8 oracle sql修改 2022-05-30 12:08:14 +08:00
MustangDeng 1ccb2b94b2 Merge remote-tracking branch 'origin/develop' into develop 2022-05-30 11:53:01 +08:00
MustangDeng bc590ef10d oracle sql修改 2022-05-30 11:52:46 +08:00
钱涛 4baa1643f6 oracle适配 2022-05-30 11:51:00 +08:00
MustangDeng 2ccc30db96 Merge remote-tracking branch 'origin/develop' into develop 2022-05-30 09:14:33 +08:00
MustangDeng d48ef0aeec oracle 适配 2022-05-30 09:14:12 +08:00
钱涛 60ae1ff35b sqlserver 
适配
 2022-05-27 18:07:26 +08:00
钱涛 3dfe647a76 新增字段 2022-05-27 15:00:53 +08:00
MustangDeng 6ad9e30bca oracle 原始脚本 2022-05-27 14:11:13 +08:00
MustangDeng 76fd0e68cf oracle 原始脚本 2022-05-27 09:57:44 +08:00
MustangDeng 79b37540f9 oracle 原始脚本修改 2022-05-26 17:59:56 +08:00
MustangDeng 38c31a7e79 oracle 脚本修改 2022-05-26 15:48:00 +08:00
MustangDeng 28eea0d594 oracle 脚本字段修改 2022-05-26 14:24:03 +08:00
MustangDeng a139c184c9 oracle 脚本 2022-05-26 14:07:26 +08:00
钱涛 f6eb69e62a 暂存 2022-05-26 11:02:55 +08:00
MustangDeng 181690e437 福利核算字段长度不够问题 2022-05-24 14:55:23 +08:00
钱涛 082d02ae67 Merge branch 'develop' into auth 2022-05-24 11:26:37 +08:00
MustangDeng 78234f7554 工资单默认模板 2022-05-24 10:24:17 +08:00
钱涛 cb1a53c649 暂存 2022-05-24 09:14:26 +08:00
MustangDeng 46a0b77611 Merge remote-tracking branch 'origin/develop' into develop 2022-05-23 13:39:08 +08:00
MustangDeng 5f2c20eaec 默认不启用非标功能 2022-05-23 13:38:48 +08:00
钱涛 4f36f89e53 Merge branch 'develop' into auth 2022-05-20 14:56:25 +08:00
钱涛 d77e8b0de4 累计扣除字段 2022-05-20 14:41:42 +08:00
钱涛 985af0197d 全量脚本 2022-05-19 16:44:59 +08:00
钱涛 16036d74c5 全量脚本 2022-05-19 16:44:30 +08:00
钱涛 479bc2d39a 出包材料 2022-05-19 14:50:57 +08:00
钱涛 dc1c865a4b 账套项目删除bug 2022-05-18 14:34:06 +08:00
钱涛 fa4d605c8d 暂存 2022-05-18 09:19:50 +08:00
钱涛 a4c285dfd4 异常 2022-05-16 17:03:17 +08:00
钱涛 282c0abc22 薪资项目不使用自增 2022-05-13 11:22:10 +08:00
钱涛 bdf3a422d6 配置文件GBK编码 2022-05-11 09:26:49 +08:00
钱涛 c440ccd0a6 修复 2022-05-10 17:26:58 +08:00
钱涛 d2a564cb92 sql兼容性处理 2022-05-06 16:01:33 +08:00
钱涛 5a406d52f3 系统项目及公式初始化脚本 2022-05-06 10:23:23 +08:00
钱涛 5c2bb1bf58 入职日期改为String 2022-04-28 10:05:27 +08:00
钱涛 01354b2be9 fix线下对比404 2022-04-27 13:33:44 +08:00
钱涛 11241d0b6f 权限构造 2022-04-26 11:26:13 +08:00
钱涛 3b342d4ec7 我的薪资福利 2022-04-22 19:22:40 +08:00
钱涛 3e9d02e78b 日期 2022-04-22 17:26:17 +08:00
钱涛 6b76829b39 考勤接口 2022-04-22 15:46:03 +08:00
钱涛 7882048217 公式 2022-04-20 11:17:25 +08:00
钱涛 fc806ebcc7 sql 2022-04-18 21:35:08 +08:00
钱涛 dcdb7ec4ac sql 2022-04-18 19:11:32 +08:00
钱涛 38a4c524f3 公式 2022-04-18 15:38:27 +08:00
钱涛 bbcb5916ce 公式更换jar 2022-04-18 14:45:12 +08:00
钱涛 9971e9a760 jar 2022-04-16 13:51:53 +08:00
钱涛 5a7cc85e53 分页 2022-03-17 15:14:35 +08:00