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

657 Commits

Author SHA1 Message Date
MustangDeng 9315882742 福利档案列表log 2022-06-10 16:35:01 +08:00
钱涛 e83714ba4f Merge branch 'feature/encrypt' into release 
# Conflicts:
#	src/com/engine/salary/biz/AddUpSituationBiz.java
#	src/com/engine/salary/biz/SIArchivesBiz.java
#	src/com/engine/salary/cmd/datacollection/OtherDeductionGetDetailListCmd.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java
#	src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java
#	src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java
#	src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java
#	src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
#	src/com/engine/salary/service/impl/SISchemeServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
#	src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
#	src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
 2022-06-10 15:26:43 +08:00
MustangDeng ca1c20329c fix 福利档案导入bug 2022-06-10 15:12:56 +08:00
钱涛 f1fac5ae90 Merge branch 'feature/申报表' into release 
# Conflicts:
#	resource/sql/申报表.sql
 2022-06-10 14:40:14 +08:00
钱涛 d09856c390 人员范围保存校验 2022-06-10 14:21:21 +08:00
钱涛 ec3838a292 申报表 2022-06-10 13:33:48 +08:00
MustangDeng e1440e9203 台账归档删除 2022-06-10 11:46:57 +08:00
MustangDeng 3d43cc3f56 归档删除 2022-06-10 10:56:09 +08:00
钱涛 382620c589 申报表 2022-06-09 19:02:18 +08:00
MustangDeng 85f0b1164c 福利台账分权 2022-06-09 18:31:36 +08:00
钱涛 b8972bcd43 分权v3 2022-06-09 17:45:28 +08:00
MustangDeng 2d2c993f2a 累计附加扣除详情列表没有解密 fix 2022-06-09 15:22:49 +08:00
MustangDeng 2fe1613868 台账核算 2022-06-09 15:16:33 +08:00
钱涛 7f8d317846 冲突 2022-06-08 18:53:30 +08:00
钱涛 b832910af9 Merge branch 'develop' into release 
# Conflicts:
#	src/com/engine/salary/biz/SIArchivesBiz.java
 2022-06-08 18:48:23 +08:00
钱涛 61346f139b 申报和往期异常 2022-06-08 17:59:30 +08:00
MustangDeng 1f7de7bc90 fix bug 2022-06-08 17:55:14 +08:00
MustangDeng 69edbc63d1 福利台账 2022-06-08 17:52:10 +08:00
钱涛 860c89b560 申报和往期异常 2022-06-08 16:36:50 +08:00
钱涛 d765ede418 默认关闭 2022-06-07 19:22:46 +08:00
钱涛 79632dd1bf 申报表分权 2022-06-07 19:10:40 +08:00
MustangDeng 28b49f9987 fix bug 2022-06-07 17:35:39 +08:00
钱涛 cedc9f2644 考勤和申报表的分权 2022-06-07 15:43:22 +08:00
MustangDeng 20e04f503e sql server 分权脚本修改 2022-06-07 15:19:21 +08:00
MustangDeng 83c7ea3f5c sql server 自增问题 2022-06-07 14:24:14 +08:00
MustangDeng 71da39d4d3 Merge branch 'release' into auth-fl 2022-06-07 13:26:40 +08:00
钱涛 38557e2e03 去除自增 2022-06-07 13:24:20 +08:00
MustangDeng f22ac96b12 累计附加扣除加解密问题 2022-06-07 09:48:51 +08:00
MustangDeng bfcb9a78f8 bug修改 2022-06-06 21:21:10 +08:00
MustangDeng 958ffc5aa0 福利台账解密问题 2022-06-06 20:05:37 +08:00
MustangDeng a68de7d088 Merge branch 'develop' into feature/encrypt 2022-06-06 19:25:36 +08:00
钱涛 b20a6e4cbf 去重 2022-06-06 19:24:49 +08:00
MustangDeng e306b6754d 福利台账解密问题 2022-06-06 19:08:51 +08:00
钱涛 eacb04388f 社保福利分权2.0 2022-06-06 19:08:39 +08:00
MustangDeng d36fb221cc 福利档案列表 2022-06-06 18:17:34 +08:00
钱涛 dc27578ddf 社保福利分权1.0 2022-06-06 16:55:02 +08:00
MustangDeng d3c82acac1 发送撤回工资单 2022-06-06 13:56:47 +08:00
MustangDeng 3a1ac7ca93 工资单部分分页调整 2022-06-06 11:43:46 +08:00
MustangDeng d0869e5daa 工资单部分分页调整 2022-06-06 11:40:24 +08:00
MustangDeng 6db127d926 Merge branch 'develop' into feature/encrypt 2022-06-06 11:31:21 +08:00
MustangDeng ddc4edd918 档案高级搜索 2022-06-06 11:28:18 +08:00
MustangDeng 24187b95bf 档案高级搜索 2022-06-06 11:24:16 +08:00
钱涛 88a0d08b1f Merge branch 'auth-2' into release 
# Conflicts:
#	src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
#	src/com/engine/salary/mapper/datacollection/EmployMapper.xml
 2022-06-06 10:37:07 +08:00
钱涛 0ed51f8cf9 处理合并dev冲突 2022-06-06 10:26:31 +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
钱涛 6646a2e481 申报表的分权 2022-06-02 18:02:27 +08:00
钱涛 be88b90f56 核算的分权 2022-06-02 17:10:54 +08:00
MustangDeng a24cb2e6d6 加解密自测问题处理 2022-06-02 17:01:26 +08:00
MustangDeng f80365ddd5 Merge branch 'develop' into feature/encrypt 2022-06-02 10:35:07 +08:00
MustangDeng c55cd2d85d 工资单详情高级搜索样式优化 2022-06-02 10:34:24 +08:00
钱涛 a69bd42b49 核算的分权 2022-06-01 21:21:07 +08:00
钱涛 77645074c5 核算的分权 2022-06-01 21:15:48 +08:00
钱涛 758e64e6bc 档案导入 2022-06-01 20:46:51 +08:00
钱涛 bb665500ae 档案 2022-06-01 19:14:05 +08:00
MustangDeng da2a0e5d22 工资单及福利问题修复 2022-06-01 19:13:20 +08:00
钱涛 37a73b94df 同步人员 2022-06-01 17:45:49 +08:00
钱涛 e66c86d32c fix 2022-06-01 15:18:10 +08:00
MustangDeng 4430d50492 工资单及福利问题修复 2022-06-01 14:53:16 +08:00
钱涛 7ffc241b0a 管理 2022-05-31 21:48:00 +08:00
钱涛 084b1e1a99 fix管理员异常 2022-05-31 21:15:33 +08:00
钱涛 efd31013cd 薪资账套分权 2022-05-31 21:05:59 +08:00
钱涛 5596d88c6f adminUser->AdminUserIds 2022-05-31 20:12:25 +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
钱涛 3f958d2886 暂存 2022-05-31 18:27:33 +08:00
钱涛 99b5c36864 暂存 2022-05-31 16:41:11 +08:00
MustangDeng 560c3c9103 cmd 解密转换 2022-05-31 16:20:04 +08:00
MustangDeng df3535c77d 和代码build处理 2022-05-31 16:02:41 +08:00
MustangDeng fd36c67fc6 和代码build处理 2022-05-31 11:45:43 +08:00
MustangDeng 68994ee304 Merge branch 'develop' into feature/encrypt 
# Conflicts:
#	resource/ecology9/WEB-INF/prop/hrmSalary.properties
#	src/com/engine/salary/biz/AddUpDeductionBiz.java
#	src/com/engine/salary/biz/AddUpSituationBiz.java
#	src/com/engine/salary/biz/OtherDeductionBiz.java
#	src/com/engine/salary/biz/SIAccountBiz.java
#	src/com/engine/salary/biz/SalaryArchiveItemBiz.java
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
#	src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
 2022-05-31 11:33:36 +08:00
钱涛 019ad96871 其他扣除 2022-05-31 11:21:51 +08:00
钱涛 72d1b48126 fix 2022-05-31 11:03:56 +08:00
钱涛 0898055d77 fix 2022-05-31 10:29:18 +08:00
钱涛 76b05e3d38 fix 2022-05-31 09:59:32 +08:00
钱涛 8b14038b90 分权 2022-05-31 09:58:35 +08:00
钱涛 5925fb5606 分权 2022-05-30 20:13:03 +08:00
钱涛 e38841f280 合并auth 2022-05-30 18:59:48 +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
钱涛 25991fe675 Merge remote-tracking branch 'origin/develop' into develop 2022-05-30 18:03:36 +08:00
钱涛 3907ac49d9 fix bug 2022-05-30 18:03:20 +08:00
MustangDeng 0af5199d9b Merge remote-tracking branch 'origin/develop' into develop 2022-05-30 17:31:40 +08:00
MustangDeng 4e4c190f31 bug修改 2022-05-30 17:31:29 +08:00
钱涛 c7a4f8a8e1 档案导入提示优化 2022-05-30 16:25:27 +08:00
钱涛 6986b39231 暂存 2022-05-30 14:17:02 +08:00
MustangDeng 597e2206e9 like 修改 2022-05-30 13:43:28 +08:00
钱涛 7e09b283da 暂存 2022-05-30 13:33:22 +08:00
钱涛 6470346ed0 oracle的like 2022-05-30 13:30:51 +08:00
钱涛 4baa1643f6 oracle适配 2022-05-30 11:51:00 +08:00
MustangDeng bd7c3e45a5 台账核算 2022-05-30 11:27:39 +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
钱涛 841ca27c84 暂存 2022-05-27 17:21:39 +08:00
钱涛 71ea4b8609 导入 2022-05-27 15:43:38 +08:00
MustangDeng 224c823590 oracle 自增返回 2022-05-27 15:01:44 +08:00
钱涛 be4ed2229d 暂存 2022-05-27 14:51:53 +08:00
钱涛 c4c04ac87a 暂存 2022-05-27 14:46:01 +08:00
钱涛 ad991954cd 暂存 2022-05-27 11:49:23 +08:00
钱涛 d776220cae fix 2022-05-27 09:33:40 +08:00
钱涛 b5d6adfbde 暂存 2022-05-26 18:16:48 +08:00
钱涛 c6ea4c5698 线下对比 2022-05-26 15:45:37 +08:00
钱涛 cf5e914318 Merge remote-tracking branch 'origin/develop' into develop 2022-05-26 13:42:44 +08:00
钱涛 6103c9233e 批量操作数量限制 2022-05-26 13:41:58 +08:00
MustangDeng 968a48eed2 取消福利归档前异常数据校验 2022-05-26 13:30:23 +08:00
钱涛 f6eb69e62a 暂存 2022-05-26 11:02:55 +08:00
MustangDeng 615bb51a59 Merge remote-tracking branch 'origin/develop' into develop 2022-05-26 11:00:58 +08:00
MustangDeng 05dc46894d 总览数据不对问题 2022-05-26 11:00:38 +08:00
钱涛 8e2e420d6a 处理sqlserver参数过多异常 2022-05-25 17:15:16 +08:00
钱涛 586fad5f2c 分权累计专项附加扣除 2022-05-25 16:51:43 +08:00
钱涛 90a6bd9921 暂存 2022-05-25 13:49:25 +08:00
MustangDeng 5abd648e9b Merge remote-tracking branch 'origin/develop' into develop 2022-05-25 13:23:15 +08:00
MustangDeng 402a3304cc 福利核算数据量过大的情况 2022-05-25 13:23:02 +08:00
钱涛 f066d1ef64 fix档案分页 2022-05-25 13:13:03 +08:00
钱涛 e1b579d480 暂存 2022-05-25 13:10:03 +08:00
钱涛 99fda7ecc3 修复调薪记录 2022-05-25 11:09:48 +08:00
钱涛 bf364a7639 暂存 2022-05-24 15:20:12 +08:00
MustangDeng 5cd4e46b8a Merge remote-tracking branch 'origin/develop' into develop 2022-05-24 13:42:25 +08:00
MustangDeng fe1cb27004 修复 自定义福利中已经停用某项福利，但新增方案时候还能引用 2022-05-24 13:42:15 +08:00
钱涛 895d258a44 分权基本控制开发完毕 2022-05-24 13:25:56 +08:00
钱涛 082d02ae67 Merge branch 'develop' into auth 2022-05-24 11:26:37 +08:00
钱涛 f555192e70 升级 2022-05-24 11:24:21 +08:00
钱涛 705f10f153 Merge remote-tracking branch 'origin/develop' into develop 2022-05-24 10:54:58 +08:00
钱涛 bccd246b2c fix分页异常 2022-05-24 10:54:46 +08:00
MustangDeng 78234f7554 工资单默认模板 2022-05-24 10:24:17 +08:00
MustangDeng 05f529769c 加解密 2022-05-24 09:23:17 +08:00
钱涛 cb1a53c649 暂存 2022-05-24 09:14:26 +08:00
钱涛 49cd388df1 暂存 2022-05-20 15:58:58 +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
钱涛 ac934c901c 暂存 2022-05-19 16:56:57 +08:00
钱涛 2c03d4bc27 暂存 2022-05-19 16:36:18 +08:00
MustangDeng 6b9200121e 福利台账归档 2022-05-19 16:32:33 +08:00
钱涛 ed0ba7ed6d 暂存 2022-05-19 14:50:01 +08:00
MustangDeng 1f636c28d6 福利台账异动清单 2022-05-19 11:23:25 +08:00
MustangDeng 6024a69e84 福利档案导出 2022-05-19 10:20:23 +08:00
MustangDeng 0909e37741 数据采集高级搜索 2022-05-19 09:45:02 +08:00
MustangDeng 69246485ee 福利导入模板 2022-05-19 09:33:07 +08:00
MustangDeng f8105537c9 福利导入 2022-05-18 18:53:30 +08:00
MustangDeng 14daede3d0 Merge remote-tracking branch 'origin/develop' into develop 2022-05-18 16:37:34 +08:00
MustangDeng fcbc6c7202 福利方案分页创建 2022-05-18 16:37:23 +08:00
钱涛 647d4ae28b Merge remote-tracking branch 'origin/develop' into develop 2022-05-18 16:08:13 +08:00
钱涛 bb66f80906 fix 新增系统薪资项目，模糊搜索 2022-05-18 16:07:51 +08:00
MustangDeng 51e5649dd8 Merge remote-tracking branch 'origin/develop' into develop 2022-05-18 14:36:46 +08:00
MustangDeng 604d3d453e 福利方案判断重复 2022-05-18 14:36:37 +08:00
钱涛 dc1c865a4b 账套项目删除bug 2022-05-18 14:34:06 +08:00
钱涛 fa4d605c8d 暂存 2022-05-18 09:19:50 +08:00
钱涛 27b04da333 Merge remote-tracking branch 'origin/develop' into develop 2022-05-16 17:04:19 +08:00
钱涛 a4c285dfd4 异常 2022-05-16 17:03:17 +08:00
MustangDeng 4bd082efb0 福利档案导出 2022-05-13 16:29:18 +08:00