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

3033 Commits

Author SHA1 Message Date
Harryxzy f217867969 xzy-fix-salarysobutil 2022-10-10 16:41:01 +08:00
钱涛 9781b67ddb Merge branch 'develop' into feature/archive 2022-10-10 15:41:31 +08:00
钱涛 824c3ca565 薪资列表 2022-10-10 15:40:51 +08:00
钱涛 816885609d 薪资列表 2022-10-10 15:15:23 +08:00
钱涛 41203342d0 薪资列表 2022-10-10 14:58:29 +08:00
李栋 5a613183d7 Merge branch 'develop' into dev-LeeD 2022-10-10 14:55:46 +08:00
李栋 bf494588f7 薪资档案加密设置更新 2022-10-10 14:55:36 +08:00
sy ed00d3fe89 薪酬系统-福利档案结构改造，福利台账核算中的补缴人元添加时判断是否已存在福利档案的数据源调整为福利档案基础信息表 2022-10-10 14:20:02 +08:00
sy d6c6f446a9 薪酬系统-福利档案结构改造，恢复社保、公积金、其他福利档案表在档案导入时的个税扣缴义务人设置逻辑 2022-10-10 11:49:18 +08:00
sy 49502a2f70 薪酬系统-福利档案结构改造，通过福利档案人员状态枚举类设置档案基础信息的runStatus字段值 2022-10-10 11:27:08 +08:00
Harryxzy 5c4380cbe0 xzy-fix-薪资档案中人员范围更新时bug 2022-10-10 10:53:51 +08:00
sy a80c92c907 薪酬系统-福利档案结构改造,福利台账核算对于个税扣缴义务人的匹配源调整为福利档案基础信息表 2022-10-10 10:11:30 +08:00
李栋 f0b2c73cb6 Merge branch 'develop' into dev-LeeD 2022-10-10 10:01:09 +08:00
李栋 4f4535778e 薪资档案加密设置 2022-10-10 10:00:59 +08:00
sy 02d1822cff Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy 2022-10-10 09:53:16 +08:00
钱涛 ed454da0f0 福利档案状态枚举 2022-10-10 09:49:22 +08:00
钱涛 5431ed9506 历史数据处理 2022-10-10 09:47:09 +08:00
李栋 c92f4f0b28 Merge branch 'develop' into dev-LeeD 2022-10-10 09:44:03 +08:00
李栋 60396e90a3 薪资档案加密设置 2022-10-10 09:43:57 +08:00
sy 9b1c6222ed Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy 2022-10-10 09:37:03 +08:00
sy 85d46938da 薪酬系统-福利档案导入改造，增加基础信息表数据插入逻辑 2022-10-10 09:36:34 +08:00
Harryxzy 7c358fe3a0 xzy-fix-薪资档案中默认人员范围 2022-10-09 17:51:30 +08:00
Harryxzy 8c4050fe73 xzy-fix-薪资账套人员状态传参问题 2022-10-09 15:20:04 +08:00
sy 7ac7d58a5f 薪酬系统-福利档案列表查询改造 2022-10-09 15:12:54 +08:00
Harryxzy e3a2a52ab8 xzy-fix-薪资账套人员错误问题 2022-10-09 13:32:05 +08:00
钱涛 1f0bf061dd 历史数据处理 2022-10-09 10:55:35 +08:00
sy ad16c96910 薪酬系统-福利档案基础信息表实体和mapper 2022-10-09 09:22:37 +08:00
Harryxzy b2b0abcaf5 xzy-fix-处理Employee_statuses历史数据 2022-10-08 17:21:38 +08:00
Harryxzy 6dcecfb1c1 xzy-fix-薪资账套 2022-10-08 16:00:08 +08:00
钱涛 4a20105260 Merge branch 'develop' into feature/archive 2022-10-08 11:42:54 +08:00
sy 7ffd295be0 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-10-08 09:14:54 +08:00
钱涛 521801849f 兼容5.7 2022-10-08 09:14:13 +08:00
sy 98a297ef27 薪酬系统-福利台账-正常缴纳导入模板数据未带出问题修复 2022-09-30 15:40:15 +08:00
sy 2f0090d3a0 薪酬系统-福利档案，福利档案按照工号查询无法实现模糊查询bug修复 2022-09-30 14:14:39 +08:00
sy dad3197c3a 薪酬系统-福利档案，导入模板表头字段提示bug修复 2022-09-30 11:44:51 +08:00
sy 2725fc8444 薪酬系统-福利台账，线下对比导入取消表id自增，修改对比数据查询参数格式 2022-09-30 10:55:46 +08:00
sy 0cfd2fc081 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-29 17:32:22 +08:00
sy 1e476e06a5 薪酬系统-福利台账，线下对比结果列表导出v1 2022-09-29 17:32:04 +08:00
李栋 96684b8ea3 Merge branch 'feature-LeeD' into develop 2022-09-29 16:21:22 +08:00
李栋 35e75dbba0 薪资档案引用时不能删除 2022-09-29 16:21:02 +08:00
钱涛 5285e518d9 fix核算合计 2022-09-29 15:34:21 +08:00
sy 5f9d929865 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-29 15:11:31 +08:00
sy a44a48450b 薪酬系统-福利台账，线下对比结果列表开发优化v1 2022-09-29 15:11:13 +08:00
sy 44e4afbf72 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 
# Conflicts:
#	src/com/engine/salary/mapper/InsuranceExportMapper.java
#	src/com/engine/salary/mapper/InsuranceExportMapper.xml
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
 2022-09-29 11:29:17 +08:00
钱涛 c270ecac82 新建福利方案去除名字空格 2022-09-29 11:16:56 +08:00
sy cec887a214 薪酬系统-福利台账，线下对比结果列表开发 2022-09-29 11:13:49 +08:00
钱涛 919d08a496 修复工资单查询 2022-09-29 10:28:46 +08:00
钱涛 92b2774ebf 三个数据采集模块删除无效的查询条件 2022-09-29 10:03:51 +08:00
钱涛 f8bb262906 档案 2022-09-29 09:32:29 +08:00
钱涛 d20ebb5a2a Merge branch 'develop' into feature/archive 2022-09-28 17:19:54 +08:00
钱涛 346445c70d 核算合计功能 2022-09-28 16:59:51 +08:00
钱涛 e0d68d6417 档案状态 2022-09-28 15:11:15 +08:00
钱涛 e48f576617 显示应用设置接口 2022-09-28 10:08:51 +08:00
钱涛 dfeb3fc5e4 修复薪资档案导出全部 2022-09-28 09:26:26 +08:00
钱涛 321b6ef0b2 修复重新核算会删除申报表 2022-09-27 18:20:40 +08:00
sy 1a60f36778 薪酬系统-福利台账，线下对比excel数据在入库前进行部分字段加密处理 2022-09-27 17:54:24 +08:00
钱涛 23a1396c12 核算列表求和 2022-09-27 17:43:43 +08:00
sy 78ce712116 薪酬系统-福利台账，线下对比excel数据导入功能 2022-09-27 17:36:06 +08:00
钱涛 1d635f1423 核算列表求和 2022-09-27 15:47:13 +08:00
钱涛 72c1d2b463 fix排序 2022-09-27 14:28:21 +08:00
sy bd3e44442d 薪酬系统-福利台账，正常缴纳导出添加工号信息 2022-09-27 11:39:57 +08:00
钱涛 08ac0e8b84 fix离职日期 2022-09-27 10:57:02 +08:00
sy 314dc8803c 薪酬系统-福利台账，正常缴纳线下对比模板下载功能 2022-09-27 10:55:57 +08:00
钱涛 66a39a07a3 Merge branch 'feature/order' into develop 
# Conflicts:
#	src/com/engine/salary/biz/SIAccountBiz.java
 2022-09-27 10:25:12 +08:00
钱涛 e2db30c816 排序 2022-09-27 10:19:09 +08:00
钱涛 6e726366ad 排序 2022-09-26 18:51:17 +08:00
sy 0a900905bd 薪酬系统-数据采集-累计专项附加扣除、往期累计情况、考勤引用三处导入模板均增加基本信息的带出 2022-09-26 13:46:43 +08:00
钱涛 55945a9186 薪资档案排序 2022-09-26 13:45:32 +08:00
sy ccd0d5a358 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-23 16:09:03 +08:00
sy e6c2dd502c 薪酬系统-数据采集-其他免税扣除导入模板带出数据重复bug修复 2022-09-23 16:08:41 +08:00
sy 2d11bad723 薪酬系统-社保福利台账-核算-补缴项删除功能bug修复 2022-09-23 16:07:10 +08:00
sy d38a50cc56 薪酬系统-社保福利台账-核算-补缴人员新建，添加人员是否已有社保档案校验 2022-09-23 11:37:56 +08:00
Harryxzy 600cb3c37f xzy-fix-社保福利台账添加补缴时核算人数错误问题 2022-09-23 11:37:24 +08:00
Harryxzy df15afc29e xzy-fix-社保福利台账总览中人数计算0.0问题 2022-09-22 17:39:32 +08:00
钱涛 31317fe8ac 福利台账列表人数统计 2022-09-22 17:01:21 +08:00
钱涛 89893288e9 补缴未设置档案产生的bug 2022-09-22 16:48:59 +08:00
Harryxzy 8dc2db8729 xzy-fix-社保福利台账人数核算 2022-09-22 16:14:42 +08:00
钱涛 6717a8235a 我的薪资福利翻页问题 2022-09-22 16:04:48 +08:00
钱涛 6ee777ebb5 fix线下对比翻页问题 2022-09-22 15:31:28 +08:00
sy 1e9ad0727e Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-22 14:49:30 +08:00
sy 3452f9ab96 薪酬系统-社保福利台账-核算-删除功能优化 2022-09-22 14:49:12 +08:00
钱涛 68142b4bbb 补缴必填校验 2022-09-22 14:25:50 +08:00
sy 83d5533322 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-22 14:01:12 +08:00
sy e75c7eefab 薪酬系统-社保福利档案-高级搜索工号搜索不生效bug修复 2022-09-22 13:59:55 +08:00
钱涛 7e2463cf10 人员状态枚举适配 2022-09-22 11:54:10 +08:00
钱涛 1573fc5bcf 人员状态枚举适配 2022-09-22 11:42:02 +08:00
sy f10a320a62 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-22 11:15:12 +08:00
sy 49e3b77995 薪酬系统-薪资档案-初始化导入模板表头属性优化 2022-09-22 10:25:31 +08:00
钱涛 b812454cd3 人员校验规则 2022-09-22 10:10:18 +08:00
Harryxzy 26c3f4580e Merge branch 'origin/feature/salarySobCopyHide_xzy' into develop 2022-09-22 09:39:22 +08:00
Harryxzy f2b83bf837 xzy-删除薪资账套时，删除对应的薪资项目隐藏信息 2022-09-22 09:35:52 +08:00
Harryxzy d647f9fcc3 xzy-复制薪资账套时，复制薪资项目隐藏选项 2022-09-22 09:06:53 +08:00
钱涛 63c7577ef8 工资单不显示空项功能 2022-09-21 19:13:17 +08:00
钱涛 f779b1bb11 工资单不显示空项功能 2022-09-21 19:08:44 +08:00
sy 0003057021 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-21 17:27:22 +08:00
sy b2ea7ebd29 薪酬系统-人员匹配枚举类 2022-09-21 17:26:49 +08:00
Harryxzy 4c7216e0bf Merge branch 'origin/fix/socialBonusUserCount_xzy' into develop 2022-09-21 15:54:40 +08:00
Harryxzy 06175bfa82 xzy-fix-社保福利台账中总览人数不正确问题 2022-09-21 15:52:36 +08:00
sy de150e063e 薪酬系统导入方式配置-人员筛选方法类调用优化以及调整相关调用该方法的代码 2022-09-21 15:49:55 +08:00
钱涛 a1cecd4041 申报表日志 2022-09-21 14:58:59 +08:00
sy ad3a2b4f69 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-21 14:48:49 +08:00
sy ad79cb2b3e 薪酬系统导入方式配置-数据采集-考勤引用-导入,添加导入人员筛选配置化处理 2022-09-21 14:47:26 +08:00
钱涛 d27e4685c5 方案过滤异常 2022-09-21 14:42:39 +08:00
sy 87b2bab9a9 薪酬系统导入方式配置-数据采集-往期累计情况-导入,添加导入人员筛选配置化处理 2022-09-21 13:57:58 +08:00
钱涛 57e4360030 通过员工id导入 2022-09-21 13:40:43 +08:00
sy d49d187506 薪酬系统导入方式配置-数据采集-其他免税扣除-导入,添加导入人员筛选配置化处理 2022-09-21 13:38:06 +08:00
钱涛 19ea334d57 获取员工信息方法 2022-09-21 11:52:06 +08:00
钱涛 0045a0dd59 福利的重新核算功能异常 2022-09-21 11:12:05 +08:00
sy b06eae55d8 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-21 10:47:49 +08:00
sy 78d1bf0554 薪酬系统-福利台账导入数据允许出现负数 2022-09-21 10:47:07 +08:00
钱涛 c08a660fa0 调薪异常 2022-09-20 19:07:56 +08:00
Harryxzy 550eec9198 Merge branch 'origin/fix/oracle_accountingArchive_xzy' into develop 2022-09-20 18:03:31 +08:00
Harryxzy 5c80188165 xzy-fix-oracle数据库中薪资核算归档时报错 2022-09-20 18:03:07 +08:00
钱涛 90c18ec201 定薪 2022-09-20 18:02:45 +08:00
钱涛 22b03f8f7e 调薪 2022-09-20 17:38:21 +08:00
sy a2b936ba23 Merge branch 'feature/checkImport' into develop 2022-09-20 16:56:59 +08:00
sy 16d141980d 薪酬系统-人员匹配方式枚举类 2022-09-20 16:56:40 +08:00
sy d64b73290a 薪酬系统-薪资档案调薪导入，关闭部分调整数据前后一致校验 2022-09-20 16:54:42 +08:00
sy b8a87d2fd8 Merge remote-tracking branch 'origin/develop' into develop 2022-09-20 16:37:21 +08:00
sy 546e976543 薪酬系统-福利台账-补缴导入,新旧数据整合bug修复 2022-09-20 16:36:01 +08:00
钱涛 f302654d0a 排序 2022-09-20 16:32:52 +08:00
Harryxzy 1db57838eb Merge branch 'origin/feature/addedemployeeExport' into develop 2022-09-20 16:19:22 +08:00
Harryxzy 183e63140a xzy-月度绩效环比增加人员导出功能 2022-09-20 16:18:43 +08:00
钱涛 8ef4c37112 Merge remote-tracking branch 'origin/develop' into develop 2022-09-20 15:47:28 +08:00
钱涛 f8f50380f7 排序 2022-09-20 15:47:22 +08:00
sy 5a1f92c3f0 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-20 15:27:11 +08:00
sy 882b1306b0 薪酬系统-薪资档案导入bug修复 2022-09-20 15:26:47 +08:00
钱涛 3a91225d65 排序 2022-09-20 15:07:42 +08:00
sy 5b74873a6e Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-20 10:34:43 +08:00
sy 7f557903a8 薪酬系统-福利台账-补缴导入 2022-09-20 10:13:05 +08:00
Harryxzy 5866136334 Merge branch 'origin/fix/archivePower' into develop 2022-09-20 09:41:04 +08:00
Harryxzy 2c795fe94a xzy-fix-社保福利中社保方案、公积金方案等选择权限问题 2022-09-20 09:20:17 +08:00
钱涛 f678aa46d6 薪资档案排序 2022-09-19 18:21:34 +08:00
sy 7120d80689 薪酬系统-福利台账-补缴导入模板开发 2022-09-19 17:59:12 +08:00
钱涛 bc1e874a1c Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
 2022-09-19 16:45:10 +08:00
钱涛 830e099b57 排序规则 2022-09-19 16:44:32 +08:00
Harryxzy 44b3c76a8e xzy-同比增加人员 2022-09-19 16:05:59 +08:00
sy ff4884fbb9 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-19 15:13:42 +08:00
sy f54481bbf1 薪酬系统-福利台账补缴功能开发v1 2022-09-19 15:13:30 +08:00
sy b0cc2cc19d 薪酬系统导入方式配置-人员匹配全局配置的confValue默认设为0 2022-09-19 15:11:27 +08:00
sy eb033d64fd 薪酬系统-福利台账，补缴页新增补缴数据时，校验数据库中是否已有该组信息的补缴数据 2022-09-19 14:14:17 +08:00
钱涛 b464240ff7 Merge remote-tracking branch 'origin/develop' into develop 2022-09-19 13:45:14 +08:00
钱涛 a7bd4a43d6 排序规则 2022-09-19 13:41:09 +08:00
sy 86ba593d1f 薪酬系统导入方式配置-数据采集-累计附加专项扣除-导入,添加导入人员筛选配置化处理 2022-09-19 11:01:17 +08:00
sy 280c979536 薪酬系统-修改导入信息时对于姓名字段的依赖逻辑 2022-09-16 15:03:48 +08:00
sy 0d1a77d81b 薪酬系统-修复工号字段信息映射有误的问题 2022-09-16 14:22:11 +08:00
sy 4d9b7af975 薪酬系统-福利台账导入项添加社保合计、公积金合计、其他福利合计、合计四个字段可以选择，并增加这四个字段的更新逻辑 2022-09-16 14:21:15 +08:00
sy 478b9a3d16 薪酬系统导入方式配置-薪资核算-导入,添加导入人员筛选配置化处理 2022-09-16 13:23:37 +08:00
sy 7daa256584 薪酬系统-福利台账导入涉及的sql优化 2022-09-16 11:41:09 +08:00
sy 8492c2097b Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-16 09:47:15 +08:00
sy a3ec7caf44 薪酬系统导入方式配置-薪资档案调薪/初始化-导入,添加导入人员筛选配置化处理 2022-09-15 17:54:59 +08:00
钱涛 d88e2bff4e 薪资档案列表按人事排序正序排列 2022-09-15 17:09:38 +08:00
sy c13ca103f3 薪酬系统导入方式配置-社保福利台账核算导入,添加导入人员筛选配置化处理 2022-09-15 16:14:34 +08:00
钱涛 23e89d15ec 定制 2022-09-15 15:43:47 +08:00
钱涛 b61b83976d 1、系统详情接口 2022-09-15 15:41:48 +08:00
sy 3c007f8e0b 薪酬系统导入方式配置-社保福利档案导入,添加导入人员筛选配置化处理 2022-09-15 15:31:34 +08:00
钱涛 d238502b2c 1、修复线下对比 
2、系统配置
 2022-09-15 15:15:34 +08:00
sy d491288296 薪酬系统导入方式配置-各导入模板添加工号字段 2022-09-15 10:43:34 +08:00
sy 8eb769ee05 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-14 14:37:19 +08:00
sy a6028c51e7 福利核算干预数据导入功能优化v2-针对单个保险种类的数值未填值时，默认取数据库中原有数值 2022-09-14 14:36:05 +08:00
钱涛 8c0b9038d6 1、系统配置列表 
2、修复调薪周期对于核算的结果不准确
 2022-09-14 11:28:17 +08:00
钱涛 198075209e 1、核算、合并计税使用税款所属期作为依据 
2、核算列表分页
 2022-09-13 16:03:55 +08:00
钱涛 32f5f25341 防止未归档时合并计税异常 2022-09-08 16:26:24 +08:00
钱涛 28551918c2 修复部门id和岗位id不显示 2022-09-08 10:13:57 +08:00
sy 6a52554d71 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-08 09:44:14 +08:00
sy 8c7a5d477a 福利核算干预数据导入功能优化v1 2022-09-08 09:43:46 +08:00
钱涛 243d8e0d6b 批量调薪前置校验 2022-09-07 16:35:57 +08:00
钱涛 572c4cb9f1 调薪前置校验 2022-09-07 16:12:43 +08:00
sy 1b34914e13 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-07 14:57:46 +08:00
sy 8f9a335dd0 福利核算干预数据导入预览 2022-09-07 14:57:07 +08:00
钱涛 06f6dcf8f2 Merge remote-tracking branch 'origin/develop' into develop 2022-09-07 09:46:02 +08:00
钱涛 8ff4e9e231 停薪操作 2022-09-07 09:45:37 +08:00
sy d4886c0d46 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-06 17:14:31 +08:00
sy 5a6df5a257 福利核算结果干预功能，福利核算项列表接口、福利核算导入模板下载接口、福利核算干预数据导入接口 2022-09-06 17:13:33 +08:00
钱涛 c84836d490 修复调薪导致起始缴纳日期消失 2022-09-06 17:12:56 +08:00
钱涛 e372173b74 获取系统配置接口 2022-09-05 17:20:57 +08:00
钱涛 299bbf1f66 达梦适配 2022-09-05 15:50:01 +08:00
sy 3445642489 优化薪资核算导入相关的唯一匹配逻辑v3 2022-09-02 15:40:05 +08:00
sy 85566329d9 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-02 12:47:36 +08:00
sy dd721aa314 Merge branch 'hotfix/checkImport0902' into develop 2022-09-02 12:45:11 +08:00
sy 43bf76b036 Merge remote-tracking branch 'remotes/origin/develop' into hotfix/checkImport0902 2022-09-02 12:43:53 +08:00
Harryxzy 0269506f78 xzy-fix当用户发薪日期为一个月最后一天时，薪资核算无数据bug 2022-09-02 12:41:58 +08:00
sy a1f310775d 优化薪资核算导入相关的唯一匹配逻辑v3 2022-09-02 12:41:22 +08:00
sy 79cab3629e 福利核算干预功能开发v1 2022-09-02 11:53:38 +08:00
sy 749279e372 优化薪资核算导入相关的唯一匹配逻辑v2 2022-09-02 11:04:51 +08:00
Harryxzy 40728ea598 Merge branch 'origin/fix/salaryArchiveImportDate_xzy' into develop 2022-09-01 17:07:18 +08:00
Harryxzy 38edb1bbb8 xzy-fix薪资档案导入时添加起始发薪日期格式校验 2022-09-01 17:06:30 +08:00
钱涛 cc24406319 向上求偶 2022-09-01 16:17:27 +08:00
Harryxzy 0d3f76c414 Merge branch 'origin/feature/addSubComSearchCondition_xzy' into develop 2022-09-01 09:22:11 +08:00
钱涛 c0498052cb Merge branch 'hotfix/0831' into develop 2022-08-31 17:23:32 +08:00
钱涛 c3201b66a3 fix福利人员导入异常 2022-08-31 17:19:12 +08:00
Harryxzy 387b6a2897 xzy-在薪资档案以及薪资核算的高级搜索中,增加分部搜索条件 2022-08-31 15:06:49 +08:00
Harryxzy 5ade93de8c Merge branch 'fix/peopleCount' into develop 2022-08-30 10:00:16 +08:00
sy 457f144bc6 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-08-30 09:30:38 +08:00
Harryxzy feb1e14c29 xzy-fix社保福利台账人数错误 2022-08-30 09:19:29 +08:00
sy 3fba03d482 优化薪资核算导入相关的唯一匹配逻辑及导入模板 2022-08-30 09:15:37 +08:00
钱涛 a13d56063b fix累计已预扣预缴税额，带入个税调差 2022-08-29 16:06:56 +08:00
Harryxzy e1239d3018 xzy-核算自定义列表添加分部 2022-08-29 14:50:26 +08:00
钱涛 f71e222c73 fix导入 2022-08-26 14:06:21 +08:00
sy 8ea34ef7dd Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-08-26 09:18:06 +08:00
钱涛 aab48a1733 1、可见性范围回显 2022-08-25 17:34:30 +08:00
钱涛 60fb7fb110 1、可见性范围回显 2022-08-25 17:05:36 +08:00
钱涛 7cd4981a5a Merge remote-tracking branch 'origin/develop' into develop 2022-08-25 16:46:26 +08:00
钱涛 bfcda3525a 1、福利方案分权 
2、累计、往期、其他导入分权
3、导入精度
 2022-08-25 16:46:12 +08:00
Harryxzy 14b0797128 xzy-fix薪资项目保存报错 2022-08-25 15:44:00 +08:00
Harryxzy bc794b4585 xzy-fix社保福利方案无法新建自定义福利 2022-08-25 11:52:24 +08:00
sy 2041031e92 薪酬模块导入按钮匹配项优化 
姓名-部门-手机号
涉及接口，薪资档案导入接口、数据采集子菜单中的四个导入接口
 2022-08-25 11:43:52 +08:00
Harryxzy 8b84f0b15f xzy-fix北京城建集团-考勤引用中引用时报错问题 2022-08-25 09:59:19 +08:00
Harryxzy 6809839a2c Merge branch 'feature/addSalaryShowSwitch_xzy' into develop 2022-08-25 09:38:59 +08:00
Harryxzy 9244440a0d xzy-薪资项目显隐控制(修改传参itemHide为字符串) 2022-08-25 09:20:51 +08:00
钱涛 a4e6042adf 调薪流程按钮 2022-08-24 20:00:57 +08:00
钱涛 7a052e5ce0 Merge branch 'hotfix/0801' into develop 2022-08-24 17:12:11 +08:00
钱涛 71b2f6f41c 导入核算结果时去除多余的人员 2022-08-24 16:51:57 +08:00
钱涛 378d3a49e9 Merge branch 'hotfix/0801' into develop 2022-08-24 14:49:57 +08:00
钱涛 1567ecb956 核算结果的导入bug，null 2022-08-24 14:24:20 +08:00
钱涛 7dfe9ee732 福利方案分权 2022-08-24 12:03:04 +08:00
Harryxzy 289e685e09 xzy-薪资项目显隐控制 2022-08-24 10:31:42 +08:00
钱涛 0f62239d4e fix离职日期 
福利档案导出
 2022-08-23 14:16:20 +08:00
钱涛 bdd9b5aa07 修复申报时人员数量和核算时不一致 2022-08-22 10:47:22 +08:00
钱涛 b2704a84a4 Merge remote-tracking branch 'origin/develop' into develop 2022-08-18 15:05:46 +08:00
钱涛 e0a031e197 oracle异常 2022-08-18 15:02:04 +08:00
Harryxzy 4d0a73e030 xzy-解决社保福利方案删除时校验问题 2022-08-18 12:26:53 +08:00
钱涛 1969b44804 见分进角规则 2022-08-17 18:33:46 +08:00
Harryxzy e539c07162 Merge branch 'hotfix/batchSaveOracle' into develop 2022-08-17 13:29:24 +08:00
Harryxzy bf2f05e9ab 'xzy-解决oracle批量添加问题' 2022-08-17 13:28:33 +08:00
钱涛 5124520850 1、其他福利单位合计导出错误 
2、方案删除错误
 2022-08-17 11:46:35 +08:00
钱涛 bf28368845 fix oracle批量插入 2022-08-16 20:01:47 +08:00
钱涛 8f1e5a61bb fix档案搜索 
fix账套人员分页
 2022-08-16 17:26:16 +08:00
钱涛 1d464e5138 fix档案分页 2022-08-16 15:49:15 +08:00
钱涛 061eb55ac3 考勤引用 2022-08-16 14:42:31 +08:00
钱涛 5a99061306 1、薪资档案oracle查询异常 2022-08-16 12:01:04 +08:00
钱涛 a7c022f38d 1、批量插入报表支持oracle 
2、累计、往期返聘人员适配
 2022-08-16 10:39:45 +08:00
钱涛 ddccbb0d78 导入核算结果时，添加sql项 2022-08-15 17:16:48 +08:00
钱涛 20967f04ab 环比减少人员 2022-08-11 16:57:12 +08:00
钱涛 3ec90b3727 去除字符串空格 2022-08-11 14:12:37 +08:00
钱涛 7d79dcdfc2 修复社保福利列表高级搜索 2022-08-11 10:27:15 +08:00
钱涛 65cfe6c28a 去除无效代码 2022-08-09 16:54:29 +08:00
钱涛 4b800c436d 核算时只获取对应分部的档案 2022-08-09 16:45:22 +08:00
钱涛 deffd8e41f 薪资档案增加分部列 2022-08-09 10:09:55 +08:00
钱涛 d62473c356 修复往期累计情况 2022-08-08 17:45:18 +08:00
钱涛 24806d67f5 删除福利的扣缴义务人 2022-08-08 09:28:58 +08:00
钱涛 a91b411c08 去除千分位 2022-08-04 16:17:05 +08:00
钱涛 bdadbf4ca0 Merge remote-tracking branch 'origin/develop' into develop 2022-08-04 15:09:57 +08:00
钱涛 1eba64edd6 1、福利列表统一为个税扣缴义务人 
2、补缴导出无数据
 2022-08-04 15:09:40 +08:00
liuliang b2d8e371d1 Merge branch 'feature_liuliang_salaryAccounting' into develop 2022-08-04 14:54:47 +08:00
liuliang f86fcd29f2 修改核算范围bug 2022-08-04 14:53:06 +08:00
钱涛 d9bfd4d617 1、档案接口增强 
2、sql支持大写
3、合并计税搜索
 2022-08-04 11:45:26 +08:00
钱涛 07614d318f 1、福利核算人员修正 2022-08-04 09:55:10 +08:00
liuliang e4cdddc005 Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop 2022-08-03 17:28:03 +08:00
liuliang a4adb0da84 优化导入 2022-08-03 17:27:44 +08:00
钱涛 a340f1aaaf 1、薪资核算时取账套下的人员范围，且这个人需要再账套所属的扣缴义务人下由档案，且起始发薪和最后发薪日期在这个薪资周期内 
2、福利核算的范围需要在扣缴义务人下，且三个起始结束日期在核算周期内
 2022-08-03 17:02:03 +08:00
钱涛 e6207ad846 fix工资单列表缺少工号 2022-08-03 15:08:34 +08:00
钱涛 11ac3d6d51 Merge branch 'feature/outdatasource' into develop 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
 2022-08-03 15:06:16 +08:00
钱涛 184bbe1e0b fix工资单列表缺少工号 2022-08-03 11:44:30 +08:00
钱涛 591c59228f fix工资单列表缺少工号 2022-08-03 11:42:49 +08:00
钱涛 a05425837d Merge branch 'hotfix/sqlserver' into develop 2022-08-03 11:08:50 +08:00
钱涛 7c5d7bba35 fix批量发放工资单 2022-08-03 11:08:23 +08:00
钱涛 99c0806b73 支持外部数据源 2022-08-03 10:47:26 +08:00
钱涛 c4831a1612 支持外部数据源 2022-08-03 10:08:43 +08:00
liuliang 90c1ad1c6c 优化代码和指定 2022-08-02 18:02:53 +08:00
liuliang 6a42f1c7c6 修改bug 2022-08-02 17:57:29 +08:00
钱涛 e9c95918eb 1、核算表头带上公式 
2、修复核算时取福利台账人员信息不准确
 2022-08-02 14:58:18 +08:00
钱涛 6d5e848a65 Merge remote-tracking branch 'origin/develop' into develop 2022-08-02 11:00:08 +08:00
钱涛 ab87e5cf08 劳务申报表列表 2022-08-02 10:59:12 +08:00
liuliang e06b341023 Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop 2022-08-01 14:35:39 +08:00
liuliang b516b06d8b 去除各种组织合并成个税扣缴义务人 2022-08-01 14:35:07 +08:00
钱涛 1d676365c7 Merge remote-tracking branch 'origin/develop' into develop 2022-08-01 14:16:08 +08:00
钱涛 a252d055ab 1、核算接口代理 
2、获取异常真实信息
 2022-08-01 14:15:09 +08:00
liuliang 50f047fb6f Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop 2022-07-29 17:19:41 +08:00
liuliang ea8a41d930 社保福利档案bug修复 2022-07-29 17:18:38 +08:00
钱涛 3f4c6954d1 Merge remote-tracking branch 'origin/develop' into develop 2022-07-29 10:34:11 +08:00
钱涛 b60758cd28 修复往期累计列表显示异常 2022-07-29 10:33:54 +08:00
liuliang c6c180afef Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop 2022-07-28 17:57:10 +08:00
liuliang 089cb2aa11 删除社保福利方案测试 2022-07-28 17:56:42 +08:00
钱涛 03f7efa2c9 Merge remote-tracking branch 'origin/develop' into develop 2022-07-28 17:20:41 +08:00
钱涛 c92a215bca 薪资档案导出全部时范围修改 2022-07-28 17:20:24 +08:00
liuliang 35fc07bb9a 社保福利方案bug修复 2022-07-28 17:18:51 +08:00
liuliang 28cc6e67f4 Merge branch 'feature_liuliang_20220726' into develop 2022-07-28 16:31:02 +08:00
liuliang f8c0f1b59d Merge branch 'fixbug_liuliang_recalculate' into develop 2022-07-28 16:30:27 +08:00
liuliang 1effdf42aa liuliang 2022-07-28 16:28:53 +08:00
钱涛 c14cca9b08 核算时添加核算人员过滤不是扣缴义务人下的人员 2022-07-28 16:23:39 +08:00
钱涛 b6f8e857d2 1、档案导入初始化修复 
2、核算档案
3、取消入职、离职日期作为核算人员的筛选条件
 2022-07-28 15:42:25 +08:00
钱涛 36e2f96ae5 社保方案起始缴纳和最后缴纳生效 2022-07-28 14:22:59 +08:00
钱涛 d1e6cec693 增加join 2022-07-28 14:17:30 +08:00
钱涛 259c40758f 1、薪资项目增加系统名 
2、薪资项目增加申报项目名
3、账套对应字段
 2022-07-27 16:56:13 +08:00
liuliang f74f70250d Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop 2022-07-27 09:29:26 +08:00
liuliang 12d6f733a6 工资单发放范围修正 2022-07-27 09:27:47 +08:00
钱涛 e7968f2545 1、公共枚举接口 
2、薪资档案封存标识
 2022-07-26 18:01:39 +08:00
liuliang 62d8e6589f liuliang 2022-07-26 16:19:13 +08:00
liuliang eb6f0b81ca 删除社保方案福利功能 2022-07-26 16:14:24 +08:00
钱涛 e01a575d58 初始化和调薪档案范围调整 2022-07-25 16:29:20 +08:00
钱涛 92e7ac17c1 档案状态 2022-07-25 15:56:21 +08:00
钱涛 db31190b9e 调整sql配置 2022-07-25 15:01:10 +08:00
liuliang 9602ed1d87 Merge branch 'feature_liuliang_20220720' into develop 2022-07-25 14:34:31 +08:00
liuliang c8ae60533e 导入修改 2022-07-25 14:33:35 +08:00
liuliang d26ded2261 Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop 2022-07-25 11:14:48 +08:00
liuliang 03c163bd91 Merge branch 'feature_liuliang_20220720' into develop 2022-07-25 11:14:24 +08:00
liuliang e03c24dfbf 社保福利导入 2022-07-25 11:13:18 +08:00
钱涛 eb957fbfec 修复档案初始化 2022-07-25 10:45:13 +08:00
liuliang 341b122fe7 导入可以带出数据功能 2022-07-25 09:57:15 +08:00
钱涛 3ced92cfc5 修复福利核算 2022-07-21 17:28:47 +08:00
钱涛 8e69159900 薪资档案代码合并 2022-07-21 10:51:38 +08:00
钱涛 b90953873c 薪资档案代码合并 2022-07-21 09:48:40 +08:00
钱涛 77ca4c2848 Merge branch 'develop' into feature/personIn2taxAgent 
# Conflicts:
#	src/com/engine/salary/service/SalaryArchiveService.java
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
#	src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
 2022-07-21 09:43:02 +08:00
钱涛 a7b61dc7da 限制福利核算时的扣缴义务人 2022-07-20 18:01:00 +08:00
liuliang 4ff9290d73 Merge branch 'feature_liuliang_20220705' into develop 2022-07-20 16:06:27 +08:00
liuliang 32c15c1c35 Merge branch 'feature_liuliang_20220705' into develop 2022-07-20 15:58:49 +08:00
liuliang 71728b20e9 Merge branch 'feature_liuliang_20220718' into develop 2022-07-20 15:42:14 +08:00
liuliang 6b2c5ba314 社保福利台账重新核算 2022-07-20 15:40:51 +08:00
钱涛 967413827e 修改社保个人实际承担方为个人 2022-07-20 14:25:01 +08:00
钱涛 27c84676b7 修复工资单撤回 2022-07-20 11:50:09 +08:00
钱涛 d1770aadbb 薪资档案定薪调薪适配多个扣缴义务人 2022-07-19 18:40:41 +08:00
liuliang 6cda380aa2 Merge branch 'fix_liuliang_20220719' into develop 2022-07-19 14:23:08 +08:00
liuliang 76661474c4 修改社保福利台账导出按钮无法正确导出bug 2022-07-19 14:05:25 +08:00
钱涛 cd7684120b 福利核算 2022-07-19 11:36:19 +08:00
钱涛 f65f3c01eb 流程对接 2022-07-19 10:20:21 +08:00
钱涛 2275f53861 档案设置 2022-07-18 19:14:02 +08:00
钱涛 a721898d3d 薪资档案增加起始发薪和最后发薪 2022-07-18 18:08:59 +08:00
liuliang b9528442f9 薪酬档案导入对接流程-liuliang 2022-07-18 16:19:15 +08:00
钱涛 136641649d 薪资档案 2022-07-18 09:38:12 +08:00
钱涛 9dcebdc994 暂存 2022-07-15 10:15:59 +08:00
钱涛 92977e81c3 更新历史版本排序权重 2022-07-14 15:56:48 +08:00
钱涛 c8aa08fc9f 档案列表显示扣缴义务人 2022-07-14 14:32:59 +08:00
钱涛 01bd6fefd4 支持人员可在多个扣缴单位 2022-07-14 10:36:51 +08:00
liuliang 758a78996d 导入薪酬档案对接流程功能 2022-07-13 18:59:30 +08:00
钱涛 bb8c863bcc 薪酬报表与解密方法 2022-07-13 13:55:31 +08:00
钱涛 1d5c69278f 描述异常 2022-07-13 11:45:16 +08:00
钱涛 057ca97c9e 修复往期累计不显示的问题 2022-07-13 10:13:49 +08:00
钱涛 1d90bb148e 修复往期累计导入数量限制 2022-07-13 09:53:11 +08:00
钱涛 4258e7f545 薪酬版本功能 2022-07-12 17:42:33 +08:00
钱涛 c8d056ee2f 薪酬版本记录 2022-07-12 17:28:06 +08:00
钱涛 91f1fda342 核算档案项不可编辑 2022-07-11 18:24:12 +08:00
钱涛 bf31d993a7 薪酬报表-薪酬核算完成，将数据存储到非加密表，删除人员信息，补充：分部、部门、岗位等其他字段，供数据中心引用 2022-07-11 17:31:33 +08:00
钱涛 97763cc280 定时同步人员范围 2022-07-11 09:39:57 +08:00
钱涛 075f70b0fd 修复福利导入提示行号错误 2022-07-08 14:57:57 +08:00
钱涛 12917f4f8b 去除无用todo 2022-07-08 11:30:10 +08:00
钱涛 f3a216027f 修复福利台账的分权 2022-07-08 11:19:08 +08:00
钱涛 6967a7224c 优化往期删除逻辑 2022-07-07 20:26:43 +08:00
钱涛 eab3e9a6a9 1、福利列表显示扣税扣缴义务人 
2、导入限制
3、修改福利查询异常
4、核算人员范围限制
 2022-07-07 18:29:52 +08:00
钱涛 16c43f8679 考勤引用适配加班数据 2022-07-07 14:37:10 +08:00
钱涛 b23f790fc9 去除Spring注解 2022-07-06 17:36:30 +08:00
钱涛 24853722cb 1、去除@resource 2022-07-06 17:33:45 +08:00
钱涛 7301ee1033 1、福利档案限制缴纳组织必须为扣税扣缴义务人 
2、福利档案人员限制为个税扣缴义务人下
3、个税扣缴义务人单个申报
 2022-07-06 16:42:13 +08:00
钱涛 3c3c679757 获取个税扣缴义务人下的实际人员配置接口 2022-07-06 10:52:37 +08:00
钱涛 9bd1074258 1、档案限制应为个税扣缴义务人下的人员 
2、个税扣缴义务人未开启分权的情况下显示管理员
 2022-07-06 10:13:06 +08:00
钱涛 48d70400e5 薪资档案验证人员是否在义务扣缴人下 2022-07-05 19:19:17 +08:00
钱涛 053c436d49 获取薪酬版本信息 2022-07-05 16:56:09 +08:00
钱涛 190d6da1b2 操作实际管理的个税扣缴人 2022-07-05 15:31:18 +08:00
钱涛 d244883190 薪酬对外提供的解密方法 2022-07-05 15:08:59 +08:00
钱涛 03ba0418ab 福利核算精度异常 2022-07-05 15:04:00 +08:00
钱涛 47113434ad 薪酬报表 2022-07-04 19:21:44 +08:00
钱涛 4fe3a61d5d 修复核算工号不显示的问题 2022-07-04 18:58:49 +08:00
钱涛 c2c4149442 报表接口 2022-07-04 15:34:04 +08:00
钱涛 3f086e154d sql执行 2022-07-04 13:44:17 +08:00
钱涛 c372fff59c 系统异常处理 2022-07-01 15:18:29 +08:00
钱涛 6262aeeb01 1、合并计税处理 
2、考勤引用不生成空记录
 2022-06-30 16:15:19 +08:00
钱涛 7f7cdaf4a8 修复考勤引用删除适配问题 2022-06-30 14:21:29 +08:00
钱涛 317c04a121 公式编辑器，防止参数名和字段名呈现一对多的问题 2022-06-30 11:10:46 +08:00
钱涛 7b468045c8 1、限制核算的人员范围 
2、薪资工资单的导出功能
3、修复工资单批量发放和撤回的问题
4、核算时取各个扣缴义务人的数据
 2022-06-29 17:38:00 +08:00
钱涛 3e300e62eb 修复福利台账补缴功能异常 2022-06-29 14:13:23 +08:00
钱涛 f34eaa7c6f 修复福利台账总览数据 2022-06-28 18:21:44 +08:00
钱涛 4be0d70c4d fix 2022-06-28 16:46:42 +08:00
钱涛 63ce165a74 修复sql的XSS 2022-06-28 16:08:20 +08:00
钱涛 b64f34a14c 福利核算时只核算当前扣缴义务人的 2022-06-28 11:26:01 +08:00
钱涛 43175f6e40 处理福利带名字查询失败 2022-06-28 10:35:30 +08:00
钱涛 12fe1405ba 修复工资单导出 2022-06-27 18:34:41 +08:00
钱涛 75c84566b6 考勤导出自定义字段 2022-06-27 16:01:33 +08:00
钱涛 bcc44fe65e fix 2022-06-27 14:45:23 +08:00
钱涛 e7dc9e1a57 限制个税扣缴名字个备注字符数量 2022-06-27 13:17:15 +08:00
钱涛 7f3cc0a82a fix 2022-06-27 10:58:16 +08:00
钱涛 abdd87a005 fix 2022-06-24 18:05:08 +08:00
钱涛 3682ebd4f2 fix 2022-06-24 15:18:00 +08:00
钱涛 f680aa27d9 fix 2022-06-23 18:05:48 +08:00
钱涛 31a8b4bff9 fix 2022-06-23 17:15:39 +08:00
钱涛 b357bd18a6 fix 2022-06-23 14:08:55 +08:00
钱涛 e1a075cab3 fix 2022-06-22 19:26:05 +08:00
钱涛 15fbf8ac91 fix 2022-06-22 13:45:26 +08:00
钱涛 a577645329 fix 2022-06-22 10:58:18 +08:00
钱涛 fc35eff75d fix 2022-06-21 22:37:22 +08:00
钱涛 e1629a021e oracle错误和薪资项目错误 2022-06-21 15:08:23 +08:00
钱涛 ff88b1f9ca 员工字段不可重复 2022-06-21 11:38:55 +08:00
钱涛 3363120c44 修复核算分权的问题 2022-06-20 19:39:01 +08:00
钱涛 5cea57d477 fix bug 2022-06-17 17:22:48 +08:00
MustangDeng c701314f15 fix bug 福利方案删除多余的编辑 2022-06-16 22:09:50 +08:00
MustangDeng e49f68b842 fix bug 45 2022-06-16 21:04:06 +08:00
钱涛 dfe8fdf57c fixbug 2022-06-16 19:06:45 +08:00
钱涛 035503f26c fixbug 2022-06-16 17:55:26 +08:00
钱涛 5396d7bee3 加解密 2022-06-16 14:22:01 +08:00
钱涛 3e93a85873 Merge branch 'feature/authitem' into release 2022-06-16 14:21:38 +08:00
钱涛 b5871e1ea9 权限项 2022-06-16 14:13:22 +08:00
MustangDeng f51a4e4fd7 加解密 2022-06-16 11:30:28 +08:00
MustangDeng 9042a9bbed 加解密 2022-06-16 11:01:03 +08:00
MustangDeng bd99d3ccf8 加解密问题 2022-06-16 10:31:11 +08:00
MustangDeng fc3cbe8111 Merge remote-tracking branch 'origin/release' into release 2022-06-16 10:24:58 +08:00
MustangDeng 2badaab552 加解密问题 2022-06-16 10:24:43 +08:00
钱涛 17dbef3ef2 sql 2022-06-15 17:53:12 +08:00
MustangDeng 3c13b90a4d Merge remote-tracking branch 'origin/release' into release 2022-06-15 17:04:03 +08:00
MustangDeng 62054871ce 发送工资单 2022-06-15 17:03:48 +08:00
钱涛 2731e4eddd sql 2022-06-15 16:31:40 +08:00
钱涛 455ff23134 申报表导出修改 2022-06-15 16:02:34 +08:00
钱涛 f5b8806eff 账套 2022-06-15 15:27:23 +08:00
钱涛 b42586600a fix申报表 2022-06-15 12:03:17 +08:00
钱涛 baa06f4011 Merge remote-tracking branch 'origin/release' into release 2022-06-15 11:02:55 +08:00
钱涛 cfe2d3c1dc fix申报表 2022-06-15 11:02:44 +08:00
MustangDeng 0e0cc9f97b 福利档案列表 2022-06-15 11:01:09 +08:00
钱涛 fda668ba90 Merge remote-tracking branch 'origin/release' into release 2022-06-15 10:24:54 +08:00
钱涛 7955d67da6 fix申报表 2022-06-15 10:24:46 +08:00
MustangDeng d5228ff1bf 福利档案列表 2022-06-15 10:23:39 +08:00
钱涛 8d6a3c41d7 fix人员同步 2022-06-15 09:29:43 +08:00
钱涛 5634377e47 Merge remote-tracking branch 'origin/release' into release 2022-06-14 16:05:58 +08:00
钱涛 0e8c916262 保存 2022-06-14 16:05:47 +08:00
MustangDeng 8846346dda 台账核算回滚数据 2022-06-14 16:05:23 +08:00
钱涛 811a90f50d 账套项目的顺序性 2022-06-14 11:13:31 +08:00
钱涛 bf7d8dd634 导入时人员唯一校验 2022-06-13 17:05:36 +08:00
钱涛 b78e96c875 考勤列表适配sqlserver 2022-06-13 15:37:52 +08:00
钱涛 081747b334 考勤引用修复 2022-06-13 10:52:32 +08:00
钱涛 1aee6f7ef0 往期累计 2022-06-10 18:16:11 +08:00
钱涛 99e7c1eaef Merge remote-tracking branch 'origin/release' into release 2022-06-10 18:07:36 +08:00
钱涛 33914eae1d 解密 2022-06-10 18:07:25 +08:00
MustangDeng 3bedc88f44 福利加解密 2022-06-10 18:01:55 +08:00
MustangDeng fcb55bc269 fix 冲突 2022-06-10 17:15:19 +08:00
钱涛 df7e3febc3 冲突 2022-06-10 17:03:25 +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
钱涛 6ddf483767 加解密 2022-06-10 16:43:38 +08:00
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
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
钱涛 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
钱涛 9540b0a2ce 自增bug 2022-05-13 11:27:25 +08:00
钱涛 022a78b659 Merge remote-tracking branch 'origin/develop' into develop 2022-05-13 11:22:18 +08:00
钱涛 282c0abc22 薪资项目不使用自增 2022-05-13 11:22:10 +08:00
MustangDeng ed9a9012ad Merge remote-tracking branch 'origin/develop' into develop 2022-05-13 10:32:06 +08:00
MustangDeng 0750ea0f51 福利档案列表报错问题 2022-05-13 10:31:51 +08:00
钱涛 e49bc9943f 薪酬核算第一步不使用线程池 2022-05-12 15:41:12 +08:00
钱涛 a2c59d15f4 项目分类bug 2022-05-12 14:36:16 +08:00
钱涛 83cc76ba77 个税扣缴义务人不存在提醒 2022-05-11 11:23:28 +08:00
钱涛 9dc5a396f2 Merge remote-tracking branch 'origin/develop' into develop 2022-05-10 17:27:10 +08:00
钱涛 c440ccd0a6 修复 2022-05-10 17:26:58 +08:00
MustangDeng b3ca582e3a 我的薪资列表调薪记录 2022-05-10 16:17:37 +08:00
MustangDeng c68af43652 Merge remote-tracking branch 'origin/develop' into develop 2022-05-10 10:55:02 +08:00
MustangDeng fbf6baa676 我的薪资列表工资单列表 2022-05-10 10:54:41 +08:00
钱涛 08ff95bf77 Merge remote-tracking branch 'origin/develop' into develop 2022-05-09 17:47:37 +08:00
钱涛 6f3d8e85c0 个税申报bug 2022-05-09 17:47:19 +08:00
MustangDeng db4cbea487 Merge branch '20220505' into develop 2022-05-09 16:40:48 +08:00
MustangDeng 733bd2b034 档案导入模板调整 2022-05-09 16:40:14 +08:00
钱涛 2c432ab1c0 可删除 2022-05-09 16:39:04 +08:00
钱涛 fd856e0750 入职日期 2022-05-09 14:24:40 +08:00
钱涛 bf37add9dd 修复导出异常 2022-05-09 14:11:07 +08:00
MustangDeng c287aca4a8 工资单撤回 2022-05-09 12:28:59 +08:00
MustangDeng 9dd71e5045 工资单撤回 2022-05-09 12:15:13 +08:00
钱涛 d2a37df97f 申报表异常 2022-05-09 11:46:49 +08:00
MustangDeng 22de36ce59 Merge branch '20220505' into develop 2022-05-09 11:19:35 +08:00
MustangDeng 2200d0c793 工资单撤回 2022-05-09 11:18:54 +08:00
钱涛 b0b18ecb5e 导出日志和申报表异常 2022-05-09 10:32:14 +08:00
钱涛 525fcc49a7 公式模拟运行 2022-05-08 12:34:05 +08:00
钱涛 c852211b0e 核算log 2022-05-07 15:20:39 +08:00
MustangDeng 10f76c102c 福利档案导入模板 2022-05-06 16:58:01 +08:00
钱涛 0b523846d7 日期类型处理 2022-05-06 16:54:58 +08:00
钱涛 d2a564cb92 sql兼容性处理 2022-05-06 16:01:33 +08:00
钱涛 ba67612e40 sql兼容性处理 2022-05-06 13:22:16 +08:00
钱涛 5a406d52f3 系统项目及公式初始化脚本 2022-05-06 10:23:23 +08:00
钱涛 0a2640b459 公式变量累计 2022-05-05 15:22:12 +08:00
钱涛 88b94b7aac 薪资项目列表优化 2022-05-05 15:02:12 +08:00
钱涛 231961663f 核算结果导出 2022-05-05 14:10:19 +08:00
钱涛 fafd206101 账套删除校验 2022-05-05 11:19:13 +08:00
钱涛 a530532a45 去除run方法 2022-05-05 10:35:58 +08:00
钱涛 f2f678c6d1 核算进度 2022-04-29 17:15:22 +08:00
钱涛 ad6ab6daff 核算3.0 2022-04-29 14:56:33 +08:00
钱涛 dff9657c3d 核算字段 2022-04-29 14:17:31 +08:00
钱涛 e445e654de 往期累计 2022-04-28 19:32:38 +08:00
钱涛 beb725fb8a 导入 2022-04-28 18:27:25 +08:00
钱涛 712e4edb0b Merge remote-tracking branch 'origin/develop' into develop 2022-04-28 17:44:36 +08:00
钱涛 b0ee96eb41 导入模板改为内存生成 2022-04-28 17:44:26 +08:00
MustangDeng 48429fdcf6 福利档案列表添加delete_type判断 2022-04-28 17:29:40 +08:00
钱涛 23da0fb5e4 sql公式 2022-04-28 15:02:11 +08:00
钱涛 5c2bb1bf58 入职日期改为String 2022-04-28 10:05:27 +08:00
钱涛 e74931aa54 人员字段默认删除 2022-04-27 18:48:41 +08:00
钱涛 6ca41e8e59 字段分类 2022-04-27 18:29:38 +08:00
钱涛 c899d370a9 默认员工字段不可删除 2022-04-27 17:20:33 +08:00
reset 2d68d686ca
!33 提供字段描述给薪资账 
Merge pull request !33 from reset/archive
 2022-04-27 08:23:19 +00:00
Chengliang fb4f1a13fb 提供字段描述给薪资账套 2022-04-27 16:21:24 +08:00
reset 5dc9b79633
!32 增加福利数据供账套使用 
Merge pull request !32 from reset/archive
 2022-04-27 06:37:51 +00:00
Chengliang 7e28c952cc 增加福利数据供账套使用 2022-04-27 14:36:05 +08:00
钱涛 01354b2be9 fix线下对比404 2022-04-27 13:33:44 +08:00
钱涛 8abfb7631e fix线下对比404 2022-04-27 09:43:24 +08:00
钱涛 8b2f54afc2 线下对比公式详情 2022-04-26 16:42:22 +08:00
钱涛 151fa2b575 线下对比 2022-04-26 16:39:41 +08:00
钱涛 d521bf5bf7 账套周期 2022-04-26 14:44:42 +08:00
钱涛 741a81bd29 除去导入无效的代码 2022-04-26 13:36:16 +08:00
钱涛 ebc602b328 Merge remote-tracking branch 'origin/develop' into develop 2022-04-26 11:26:23 +08:00
钱涛 11241d0b6f 权限构造 2022-04-26 11:26:13 +08:00
reset 52ae98df10
!31 1 
Merge pull request !31 from reset/archive
 2022-04-26 02:07:14 +00:00
Chengliang 8a0e4744cd 分页 2022-04-26 10:06:09 +08:00
钱涛 6a024cb35b 权限构造 2022-04-25 18:06:09 +08:00
钱涛 daeb41f092 fix列 2022-04-25 16:31:33 +08:00
钱涛 e0c2fafede 考勤 2022-04-25 16:20:57 +08:00
钱涛 12efa69503 同步考勤字段值 2022-04-25 15:51:35 +08:00
钱涛 416ccd57a6 同步考勤字段值 2022-04-25 14:51:30 +08:00
钱涛 26dd841aa8 同步考勤字段 2022-04-25 13:57:33 +08:00
钱涛 446523a87a fix 2022-04-25 10:25:38 +08:00
钱涛 2ec48b2be1 考勤账套列表 2022-04-25 10:14:43 +08:00
钱涛 11190ee37d 区时+8 2022-04-24 17:42:32 +08:00
钱涛 f7760bf833 公式去除id生成 2022-04-24 10:47:38 +08:00
钱涛 82230fba96 fix 比较 2022-04-24 09:29:39 +08:00
钱涛 ffd5bd20a8 Merge remote-tracking branch 'origin/develop' into develop 2022-04-22 19:22:50 +08:00
钱涛 3b342d4ec7 我的薪资福利 2022-04-22 19:22:40 +08:00
Chengliang cd2f61be29 修复分页 2022-04-22 18:50:03 +08:00
reset de39d7e26b
!29 11 
Merge pull request !29 from reset/archive
 2022-04-22 10:06:52 +00:00
Chengliang 906f9a8a36 修改保存 2022-04-22 18:05:19 +08:00
钱涛 16a4f32ec1 sqlserver的批量插入bug 2022-04-22 18:00:35 +08:00
钱涛 3e9d02e78b 日期 2022-04-22 17:26:17 +08:00
reset df5fa147e1
!28 修复xml报错 
Merge pull request !28 from reset/archive
 2022-04-22 08:43:04 +00:00
Chengliang 9dc29b2b3c 修复xml文件报错 2022-04-22 16:42:06 +08:00
钱涛 5347c70809 Merge remote-tracking branch 'origin/develop' into develop 2022-04-22 15:46:14 +08:00
钱涛 6b76829b39 考勤接口 2022-04-22 15:46:03 +08:00
reset ef4ffacbcc
!27 修复方案列表 
Merge pull request !27 from reset/archive
 2022-04-22 07:19:56 +00:00
Chengliang c2c7d2dee5 修复方案列表 2022-04-22 15:17:31 +08:00
钱涛 afb65fced8 Merge remote-tracking branch 'origin/develop' into develop 2022-04-22 15:02:34 +08:00
钱涛 bb418ff6b6 title 2022-04-22 15:02:24 +08:00
MustangDeng ee9116ae2b 工资单列表问题处理 2022-04-22 11:02:15 +08:00
钱涛 3c03d7144d 删除bug 2022-04-21 20:36:04 +08:00
钱涛 a20198fc4f Merge remote-tracking branch 'origin/develop' into develop 2022-04-21 20:29:25 +08:00
钱涛 cd8df85e54 公式字段 2022-04-21 20:29:11 +08:00
MustangDeng c327aafd6c Merge branch 'feature/salaryBill' into develop 2022-04-21 16:45:33 +08:00
MustangDeng 3003d0fadb 生成工资单 2022-04-21 16:45:03 +08:00
MustangDeng 2f2b48b172 Merge remote-tracking branch 'origin/develop' into develop 2022-04-21 15:45:58 +08:00
MustangDeng a93949e8c5 Merge branch 'feature/salaryBill' into develop 
# Conflicts:
#	src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
 2022-04-21 15:42:47 +08:00
reset 926b132d50
!26 导出 
Merge pull request !26 from reset/archive
 2022-04-21 07:05:43 +00:00
Chengliang d0f12c2faf 6个列表页导出完成 2022-04-21 15:04:35 +08:00
MustangDeng 38179daee9 我的工资单 2022-04-21 14:46:45 +08:00
钱涛 36d65de007 fix 2022-04-21 14:15:56 +08:00
MustangDeng d0425fc387 福利档案-批量保存 2022-04-21 14:08:18 +08:00
18895359881@163.com 21e4afcbbb Merge branch 'test_xxy' into develop 2022-04-20 21:37:39 +08:00
18895359881@163.com d15cccca8d 申报表生成 2022-04-20 21:36:27 +08:00
钱涛 a0957ecd7b Merge remote-tracking branch 'origin/develop' into develop 2022-04-20 19:23:25 +08:00
钱涛 343cc1ad26 档案导入 2022-04-20 19:23:16 +08:00
reset 5320e0b4f8
!25 福利台账 
Merge pull request !25 from reset/archive
 2022-04-20 11:14:23 +00:00
Chengliang 72e9e152d6 福利台账相关 2022-04-20 19:12:01 +08:00
18895359881@163.com e66defc3a2 身份类型 2022-04-20 16:45:59 +08:00
18895359881@163.com 5b90c0524f 身份类型 2022-04-20 16:45:09 +08:00
18895359881@163.com c5ac683981 Merge branch 'test_xxy' into develop 2022-04-20 16:03:41 +08:00
18895359881@163.com ad3af977ab 申报表导出完善 2022-04-20 16:02:52 +08:00
钱涛 d2ba2c3afe 公式参数 2022-04-20 11:31:55 +08:00
钱涛 643160e714 Merge remote-tracking branch 'origin/develop' into develop 2022-04-20 11:17:34 +08:00
钱涛 7882048217 公式 2022-04-20 11:17:25 +08:00
18895359881@163.com 4fd63c1999 Merge remote-tracking branch 'origin/develop' into develop 2022-04-19 20:59:33 +08:00
18895359881@163.com bfdb9a33d5 个税申报表接口 2022-04-19 20:58:30 +08:00
钱涛 cb30e24e95 公式 2022-04-19 20:33:06 +08:00
钱涛 b1b086caf1 预览 2022-04-19 19:50:00 +08:00
钱涛 ccd4768a0e 线下对比导入 2022-04-19 19:34:57 +08:00
钱涛 72b52de3aa Merge remote-tracking branch 'origin/develop' into develop 2022-04-19 19:32:34 +08:00
钱涛 dc008dad5c 核算导入 2022-04-19 19:32:09 +08:00
reset 24a20e14d0
!24 福利台账导出及列表bug修 
Merge pull request !24 from reset/archive
 2022-04-19 09:47:11 +00:00
Chengliang bef9b30a2e 福利台账导出及列表bug修复 2022-04-19 17:46:24 +08:00
reset 6be53605d5
!23 福利台账导出及列表bug修 
Merge pull request !23 from reset/archive
 2022-04-19 09:45:08 +00:00
钱涛 c2cbdce9ec 补充列 2022-04-19 17:21:27 +08:00
钱涛 c4c757d055 Merge branch 'feature/v1' into develop 2022-04-19 15:13:23 +08:00
钱涛 c537b7d944 补充列 2022-04-19 15:13:08 +08:00
钱涛 e16a533089 补充列 2022-04-19 13:42:16 +08:00
Chengliang 0feadcf0b2 1 2022-04-19 13:32:11 +08:00
钱涛 2afab36ee7 补充列 2022-04-19 13:30:41 +08:00
reset 37830fc89e
!22 增加datakey 
Merge pull request !22 from reset/archive
 2022-04-19 04:20:18 +00:00
Chengliang 9c02c9c9fd 列表增加datakey 2022-04-19 12:19:06 +08:00
钱涛 982fffeb73 Merge branch 'feature/v1' into develop 2022-04-19 10:42:01 +08:00
钱涛 51e816ab56 补充列 2022-04-19 10:40:47 +08:00
钱涛 10e39169e3 Merge remote-tracking branch 'origin/develop' into develop 2022-04-18 21:36:24 +08:00
钱涛 fc806ebcc7 sql 2022-04-18 21:35:08 +08:00
reset 8ed7bbb3b6
!21 福利台账导出各接口 
Merge pull request !21 from reset/archive
 2022-04-18 12:26:02 +00:00
Chengliang 651df1842e 福利台账导出 2022-04-18 20:24:43 +08:00
18895359881@163.com cd41ca92c7 Merge branch 'test_xxy' into develop 2022-04-18 19:53:52 +08:00
18895359881@163.com 545e8f5b7a 个税申报表相关信息SQL 2022-04-18 19:50:28 +08:00
钱涛 2cd32a5168 Merge branch 'feature/v1' into develop 2022-04-18 19:11:46 +08:00
钱涛 dcdb7ec4ac sql 2022-04-18 19:11:32 +08:00
18895359881@163.com 6fce8cdf4c 薪酬接口 2022-04-18 18:56:17 +08:00
钱涛 bba5b7b5ca sql 2022-04-18 18:29:58 +08:00
MustangDeng 3b3e9ee6fc 福利核算-batchList 2022-04-18 18:25:45 +08:00
钱涛 3bfdef7966 Merge remote-tracking branch 'origin/develop' into develop 2022-04-18 17:28:49 +08:00
钱涛 91da4ab831 自定义按钮 2022-04-18 17:28:34 +08:00
reset 11f0354d3a
!20 合并 
Merge pull request !20 from reset/archive
 2022-04-18 09:16:30 +00:00
钱涛 cc8f5d54f1 公式bug 2022-04-18 15:56:52 +08:00
钱涛 beb7061707 公式 2022-04-18 15:45:21 +08:00
钱涛 38a4c524f3 公式 2022-04-18 15:38:27 +08:00
钱涛 dcec31bf06 Merge branch 'feature/acctV2' into develop 2022-04-18 15:24:47 +08:00
钱涛 bbcb5916ce 公式更换jar 2022-04-18 14:45:12 +08:00
MustangDeng fee9a35b42 Merge branch 'feature/salaryBill' into develop 2022-04-18 09:20:00 +08:00
MustangDeng 86d3604c7e 工资单发放-问题处理 2022-04-18 09:19:07 +08:00
钱涛 7fbe29b36a Merge branch 'feature/acctV2' into develop 2022-04-16 16:49:57 +08:00
钱涛 50d502632f 公式 2022-04-16 16:49:22 +08:00
Chengliang 2d98890c04 台账相关列表 2022-04-16 16:43:33 +08:00
18895359881@163.com a5b73098c9 Merge branch 'develop' into test_xxy 2022-04-16 16:14:56 +08:00
18895359881@163.com 3e64b1cfde 薪酬接口 2022-04-16 15:33:51 +08:00
钱涛 18025fd4b6 Merge branch 'feature/acctV2' into develop 2022-04-16 13:52:29 +08:00
钱涛 9971e9a760 jar 2022-04-16 13:51:53 +08:00
钱涛 f2b56fedeb init 2022-04-16 13:51:24 +08:00
Chengliang 8ec04e8efc 福利 2022-04-16 13:20:52 +08:00
钱涛 94ab8bf4f1 init 2022-04-16 11:18:04 +08:00
reset ed096261d3
!19 福利台账相关接口 
Merge pull request !19 from reset/archive
 2022-04-15 11:02:47 +00:00
Chengliang 9813012249 福利台账相关接口 2022-04-15 19:01:09 +08:00
钱涛 3d12b4bbd0 init 2022-04-15 17:13:01 +08:00
钱涛 fa5f8b7da0 Merge branch 'feature/acctV2' into develop 2022-04-15 13:55:16 +08:00
钱涛 7d440ce005 薪资项目分页 2022-04-15 13:54:47 +08:00
reset 5cb511bdc1
!18 社保档案详情-保存等接口 
Merge pull request !18 from reset/archive
 2022-04-15 05:18:56 +00:00
Chengliang 6ddf60a548 福利台账核算接口 2022-04-15 13:17:25 +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
MustangDeng a739d746f7 工资单发放-测试 2022-04-14 19:32:09 +08:00
MustangDeng 775b39074d 工资单发放-工资单发放信息列表 2022-04-14 16:11:44 +08:00
reset 23388ef017
!17 台账保存核算 
Merge pull request !17 from reset/archive
 2022-04-14 03:56:10 +00:00
Chengliang 2eadc713e1 薪资台账保存核算 2022-04-14 11:54:16 +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
reset ac86ad0d62
!16 台账 
Merge pull request !16 from reset/archive
 2022-04-12 11:31:07 +00:00
Chengliang 985456ed14 社保台账 2022-04-12 19:29:19 +08:00
钱涛 340fe4c38e Merge remote-tracking branch 'origin/develop' into develop 2022-04-12 19:25:29 +08:00
钱涛 692c2f5a79 核算 2022-04-12 19:25:19 +08:00
MustangDeng 897c98114f 工资单发放-工资单模板接口 2022-04-12 18:28:12 +08:00
reset 9b907a7a36
!15 福利台账 
Merge pull request !15 from reset/archive
 2022-04-12 02:25:50 +00:00
Chengliang 0dd6f4ae35 福利台账 2022-04-12 10:24:21 +08:00
MustangDeng bd8305763e 工资单发放-编译 2022-04-12 10:11:53 +08:00
钱涛 4d674bdd37 Merge branch 'feature/acc' into develop 2022-04-11 20:46:44 +08:00
钱涛 43d97d87b3 核算基础公式 2022-04-11 20:46:25 +08:00
钱涛 a069447f02 核算基础公式 2022-04-11 20:17:47 +08:00
Chengliang 568cc1811e 薪资台账列表 2022-04-11 19:07:35 +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
钱涛 61a8605f5a fix 2022-04-07 18:41:40 +08:00
钱涛 0dedda4dbd 核算 2022-04-07 16:54:10 +08:00
钱涛 caf83c6386 fix 2022-04-07 14:19:06 +08:00
钱涛 76eca07701 fix 2022-04-07 13:51:26 +08:00
钱涛 90335032fd 调整原因 2022-04-07 11:39:22 +08:00
钱涛 0fd2ddf78c Merge branch 'develop' into feature/qt 2022-04-07 09:59:14 +08:00
钱涛 0faa5c5670 删除测试代码 2022-04-07 09:59:02 +08:00
钱涛 c1bcff5fb2 Merge branch 'feature/qt' into develop 2022-04-07 09:54:25 +08:00
钱涛 0735bdf99b 记录表头 2022-04-07 09:50:30 +08:00
钱涛 91b7a8ffc6 Merge branch 'feature/qt' into develop 2022-04-06 20:01:14 +08:00
钱涛 9d223c7a06 核算基础类 2022-04-06 20:01:00 +08:00
钱涛 9b7f1e69b3 Merge branch 'feature/qt' into develop 2022-04-06 13:23:20 +08:00
钱涛 75f64648d6 档案类修复 2022-04-06 13:21:30 +08:00
钱涛 8d9ff236f7 档案类修复 2022-04-06 11:02:02 +08:00
钱涛 56a167619b Merge branch 'feature/qt' into develop 2022-04-02 16:57:35 +08:00
钱涛 1c38214f6f 薪资档案表单 2022-04-02 16:57:27 +08:00
钱涛 aa63a067b1 Merge remote-tracking branch 'origin/develop' into develop 2022-04-02 15:34:56 +08:00
钱涛 3307c5c67e 薪资档案后续接口 2022-04-02 15:34:27 +08:00
钱涛 126444b9f3 薪资档案 2022-04-01 18:25:24 +08:00
MustangDeng 5534a4689a Merge branch 'feature/djp' into develop 2022-04-01 15:06:45 +08:00
MustangDeng 3631a67ebf 福利方案列表公司,个人 显示 2022-04-01 15:06:14 +08:00
钱涛 77229d18a0 列表 2022-04-01 14:13:04 +08:00
钱涛 63e414e5d7 Merge branch 'develop' into feature/qt 
# Conflicts:
#	src/com/engine/salary/enums/UserStatusEnum.java
 2022-04-01 13:54:27 +08:00
钱涛 f95d8a7d0d 暂存 2022-04-01 13:50:24 +08:00
钱涛 036b6fea96 Merge remote-tracking branch 'origin/develop' into develop 2022-04-01 10:26:55 +08:00
钱涛 c03078cb12 Merge branch 'feature/qt' into develop 2022-04-01 10:26:44 +08:00
钱涛 8326f3ae6f 导入参数 2022-04-01 10:26:28 +08:00
MustangDeng 266745c241 Merge branch 'feature/djp' into develop 2022-04-01 09:21:19 +08:00
MustangDeng e5100c8f44 福利方案列表 2022-04-01 09:20:44 +08:00
钱涛 e8de53d51f Merge remote-tracking branch 'origin/develop' into develop 2022-03-31 18:42:23 +08:00
钱涛 e9e03880d9 Merge branch 'feature/qt' into develop 2022-03-31 18:42:06 +08:00
钱涛 163963d463 fix bug 2022-03-31 18:41:41 +08:00
钱涛 a8732708a8 薪资档案导入 2022-03-31 15:41:55 +08:00
MustangDeng 13b69c76eb 档案列表快捷搜索 2022-03-31 14:22:42 +08:00
MustangDeng b10c09f0c4 档案列表列表问题 2022-03-31 13:41:40 +08:00
钱涛 cd6ad5f4be Merge branch 'feature/qt' into develop 2022-03-30 20:27:33 +08:00
钱涛 4167cb55ee 限制薪资项目的删除 2022-03-30 20:27:17 +08:00
钱涛 b30bcb8453 Merge branch 'feature/qt' into develop 2022-03-30 18:32:55 +08:00
钱涛 93686e38c5 bug 2022-03-30 18:32:44 +08:00
钱涛 fbfb5f5005 Merge branch 'feature/qt' into develop 2022-03-30 18:01:07 +08:00
钱涛 922a055f97 统一sql 2022-03-30 18:00:56 +08:00
钱涛 b573118641 Merge branch 'feature/qt' into develop 2022-03-30 15:58:40 +08:00
钱涛 d6ed96e891 sql修改 2022-03-30 15:58:29 +08:00
钱涛 94bef09608 Merge branch 'feature/qt' into develop 2022-03-30 14:56:45 +08:00
钱涛 6d61297dd1 sql修改 2022-03-30 14:56:31 +08:00
钱涛 50a62e3b29 Merge branch 'feature/qt' into develop 2022-03-30 12:16:07 +08:00
钱涛 a3604a28f0 校驗規則列表 2022-03-30 12:15:49 +08:00
钱涛 f8a704e66c 修改sql 2022-03-30 11:29:48 +08:00
钱涛 cf39049530 Merge branch 'feature/qt' into develop 2022-03-29 17:11:15 +08:00
钱涛 5c550365f1 薪资档案 2022-03-29 17:10:59 +08:00
钱涛 2a5a72f6ab Merge branch 'feature/qt' into develop 2022-03-28 20:04:51 +08:00
钱涛 ba707878fc 薪资档案 2022-03-28 20:04:27 +08:00
钱涛 019cdd9968 Merge branch 'feature/qt' into develop 2022-03-28 16:37:03 +08:00
钱涛 5ae4eb5fc8 项目id 2022-03-28 16:36:40 +08:00
钱涛 dc6ebdb4df Merge branch 'feature/qt' into develop 2022-03-28 13:48:55 +08:00
钱涛 93154ada71 薪资账套项目保存 2022-03-28 13:48:43 +08:00
钱涛 faca2d4d1b Merge branch 'feature/qt' into develop 2022-03-28 11:38:46 +08:00
钱涛 045293426c 账套校验规则 2022-03-28 11:38:33 +08:00
钱涛 00c0fe477e 税率 2022-03-28 10:49:23 +08:00
钱涛 c9281bd6db Merge branch 'feature/qt' into develop 2022-03-25 18:05:18 +08:00
钱涛 1db71a97ff 薪资账套 2022-03-25 18:05:07 +08:00
钱涛 cc233e82a5 Merge branch 'feature/qt' into develop 2022-03-25 10:46:05 +08:00
钱涛 24c50f7f17 名称模糊查询 2022-03-25 10:45:53 +08:00
钱涛 cc13dd5c7b Merge branch 'feature/qt' into develop 2022-03-25 10:31:45 +08:00
钱涛 980415c8ca 账套 2022-03-25 10:31:31 +08:00
钱涛 c4142801bc Merge branch 'feature/qt' into develop 2022-03-24 20:01:56 +08:00
钱涛 f2cf03ebbf departmentIds 2022-03-24 20:01:25 +08:00
钱涛 5ad46ffabd Merge branch 'feature/qt' into develop 2022-03-24 19:42:11 +08:00
钱涛 a9d486bef6 相对更新 2022-03-24 19:42:03 +08:00
钱涛 48f1497f96 Merge remote-tracking branch 'origin/develop' into develop 2022-03-24 17:00:19 +08:00
钱涛 466966dac6 Merge branch 'feature/qt' into develop 2022-03-24 17:00:08 +08:00
钱涛 83e1cf2805 相对更新 2022-03-24 16:59:52 +08:00
reset 8df72164cc
!13 福利方案高级搜索接口 
Merge pull request !13 from reset/archive
 2022-03-23 13:07:37 +00:00
Chengliang d82e3e9e6f 福利方按高级搜索接口 2022-03-23 21:05:01 +08:00
钱涛 288c274aaf Merge branch 'feature/qt' into develop 2022-03-23 20:54:22 +08:00
钱涛 79f9e010af 账套薪资项目 2022-03-23 20:54:08 +08:00
钱涛 00150f1696 Merge branch 'feature/qt' into develop 2022-03-23 18:41:52 +08:00
钱涛 b3d7123401 列表添加id 2022-03-23 18:41:38 +08:00
钱涛 2c65022174 Merge branch 'feature/qt' into develop 2022-03-23 13:52:58 +08:00
钱涛 e66445ce20 人员sql 2022-03-23 13:52:43 +08:00
钱涛 578b8f7aaa Merge remote-tracking branch 'origin/develop' into develop 2022-03-23 09:26:33 +08:00
钱涛 c01e63040c 薪资项目&账套 2022-03-22 21:01:38 +08:00
reset 24a5b0b48d
!12 福利档案接口 
Merge pull request !12 from reset/archive
 2022-03-22 11:48:54 +00:00
Chengliang 56036bf9cb 福利方案getSearchCondition接口 2022-03-22 19:47:46 +08:00
reset 0789b1c7a9
!11 福利档案getSearchCondition接口 
Merge pull request !11 from reset/archive
 2022-03-22 11:46:35 +00:00
Chengliang b0982f7d7f 福利台账getSearch接口 2022-03-22 19:44:35 +08:00
钱涛 f94e64b492 Merge branch 'feature/qt' into develop 2022-03-22 10:42:47 +08:00
钱涛 0b3b971ecd 参数验证，运行期功能 2022-03-22 10:42:26 +08:00
钱涛 87d304d63e Merge remote-tracking branch 'origin/develop' into develop 2022-03-21 20:10:28 +08:00
钱涛 2f8b56e4ac 参数验证类 2022-03-21 20:09:10 +08:00
reset 7fa5f12f6e
!10 优化listpage接口 
Merge pull request !10 from reset/archive
 2022-03-21 08:14:47 +00:00
Chengliang e9ee672a66 社保档案listPage优化 2022-03-21 16:13:08 +08:00
钱涛 994a1dbd16 分页 2022-03-21 10:08:39 +08:00
钱涛 f0a0680bdc Merge branch 'feature/qt' into develop 
# Conflicts:
#	src/com/engine/salary/common/BaseQueryParam.java
#	src/com/engine/salary/demo/DemoPageCmd.java
 2022-03-21 09:36:56 +08:00
钱涛 f8d68fa7bc 分页 2022-03-21 09:33:21 +08:00
Chengliang 19dd1eed17 社保档案动态列接口 2022-03-18 18:00:51 +08:00
钱涛 54925dc51e Merge remote-tracking branch 'origin/develop' into develop 2022-03-17 15:47:42 +08:00
钱涛 eaaf69b09c Merge branch 'feature/qt' into develop 2022-03-17 15:47:31 +08:00
钱涛 5b0374ca42 分页 2022-03-17 15:47:14 +08:00
reset 4749bdbdc4
!8 社保档案详情-保存等接口 
Merge pull request !8 from reset/archive
 2022-03-17 07:28:29 +00:00
Chengliang 7194ae4026 社保档案详情-保存等接口 2022-03-17 15:26:33 +08:00
钱涛 a6bd9f38de Merge remote-tracking branch 'origin/develop' into develop 2022-03-17 15:15:00 +08:00
钱涛 2a6f3a10ce Merge branch 'feature/qt' into develop 2022-03-17 15:14:53 +08:00
钱涛 5a7cc85e53 分页 2022-03-17 15:14:35 +08:00
Chengliang cc9a650b92 批量保存，批量删除社保档案 2022-03-16 18:26:49 +08:00
reset 23519e2050
!6 payform 及表单组件 
Merge pull request !6 from reset/archive
 2022-03-16 09:06:09 +00:00
Chengliang b0124e250d 福利档案payForm及表单组件 2022-03-16 17:04:21 +08:00
钱涛 59fc1ded4e Merge branch 'feature/qt' into develop 2022-03-16 14:30:54 +08:00
钱涛 00bf811075 考勤导出接口 2022-03-16 14:29:02 +08:00
Chengliang 88c0cc67e6 福利档案获取baseForm 2022-03-15 17:39:19 +08:00
钱涛 1a49dd331d 考勤字段相关接口 2022-03-15 14:18:04 +08:00
Chengliang 67fe45cd2a bug修复 2022-03-15 09:56:56 +08:00
钱涛 27c9d669f7 Merge remote-tracking branch 'origin/develop' into develop 2022-03-15 09:56:30 +08:00
钱涛 eb4ca765d7 考勤相关接口 2022-03-15 09:55:58 +08:00
reset 64eff51ab2
!4 福利方案表单接口 
Merge pull request !4 from reset/archive
 2022-03-15 01:39:24 +00:00
Chengliang 69a1b4d5ae 福利项目表单接口修复 2022-03-15 09:34:53 +08:00
钱涛 fe14008e39 sql适配 2022-03-12 17:45:39 +08:00
钱涛 4e9d103021 fix bug 2022-03-12 14:20:39 +08:00
钱涛 3abcf90ee2 连表查询 2022-03-12 13:21:27 +08:00
钱涛 3a09014291 bug 2022-03-11 19:00:58 +08:00
钱涛 2ce8d8ca5d Merge branch 'feature/qt' into develop 2022-03-11 18:14:35 +08:00
钱涛 502450baab bug 2022-03-11 18:14:19 +08:00
reset 7c30485b88
!3 bug修复 
Merge pull request !3 from reset/archive
 2022-03-11 10:06:47 +00:00
Chengliang 99c9ad807f 福利方案bug修复 2022-03-11 17:46:26 +08:00
钱涛 5c1adf9774 Merge branch 'feature/qt' into develop 2022-03-11 17:27:34 +08:00
钱涛 298d432152 预览 2022-03-11 17:27:15 +08:00
钱涛 dded82ac7c Merge branch 'feature/qt' into develop 2022-03-11 17:15:43 +08:00
钱涛 7f3b381e5c 导出过滤 2022-03-11 17:15:33 +08:00
钱涛 07979a5c00 Merge branch 'feature/qt' into develop 2022-03-11 16:29:47 +08:00
钱涛 cae1b1062e 申报月份 2022-03-11 16:28:37 +08:00
钱涛 333af1c924 Merge remote-tracking branch 'origin/feature/qt' into develop 2022-03-11 16:20:05 +08:00
钱涛 1c46bd28f7 累计bug 2022-03-11 16:19:47 +08:00
钱涛 9c8238d218 Merge branch 'feature/qt' into develop 2022-03-11 15:47:35 +08:00
钱涛 692a57ae63 累计bug 2022-03-11 15:47:08 +08:00
钱涛 1a7478ff57 Merge branch 'feature/qt' into develop 2022-03-11 15:15:14 +08:00
钱涛 822f9d4289 删除本地代码 2022-03-11 15:14:32 +08:00
Chengliang c4e63e101b 表增加自增 2022-03-11 14:33:35 +08:00
Chengliang 0474872ab5 Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop 2022-03-11 14:29:08 +08:00
Chengliang f09c6d197c 福利台账listPage 2022-03-11 14:28:39 +08:00
钱涛 8aabe78182 Merge branch 'feature/qt' into develop 2022-03-11 13:45:03 +08:00
钱涛 d748f3733a 累计bug 2022-03-11 13:44:47 +08:00
钱涛 2ba52fe82b Merge remote-tracking branch 'origin/feature/qt' into develop 2022-03-11 13:20:17 +08:00
钱涛 4a15c5614b 累计bug 2022-03-11 13:20:00 +08:00
钱涛 d601f2fd59 Merge branch 'feature/qt' into develop 2022-03-11 11:09:16 +08:00
钱涛 9676102894 累计bug 2022-03-11 11:08:50 +08:00
钱涛 3f32fa98d6 累计实体错误 2022-03-11 10:18:30 +08:00
钱涛 934e9b1729 Merge branch 'feature/qt' into develop 2022-03-11 10:06:47 +08:00
钱涛 92fc902fba 明细表加checkbox 2022-03-11 10:06:13 +08:00
钱涛 628253ed0c Merge branch 'feature/qt' into develop 
# Conflicts:
#	src/com/engine/salary/init.sql
 2022-03-10 19:02:28 +08:00
钱涛 882665ff09 明细表加checkbox 2022-03-10 19:01:58 +08:00
Chengliang 843900882b listPage 2022-03-10 18:24:08 +08:00
钱涛 e3c602a8a0 Merge branch 'feature/qt' into develop 2022-03-10 18:00:21 +08:00
钱涛 98c49db986 其他扣除项接口 2022-03-10 17:57:46 +08:00
Chengliang 0957528179 更新自定义福利状态接口 2022-03-10 15:26:09 +08:00
Chengliang 04cf94e498 自定义福利接口 getCustomCategoryForm createSICategory.... 2022-03-10 15:23:56 +08:00
钱涛 784f58533a 导出明细 2022-03-10 11:12:13 +08:00
钱涛 8a7251c076 Merge branch 'feature/qt' into develop 
# Conflicts:
#	src/com/engine/salary/web/AddUpDeductionController.java
 2022-03-10 11:10:40 +08:00
钱涛 d55fca8eeb 导出明细 2022-03-10 11:09:08 +08:00
钱涛 8da28ec05f Merge branch 'feature/qt' into develop 
# Conflicts:
#	src/com/engine/salary/init.sql
 2022-03-09 19:00:21 +08:00
钱涛 1319543251 累计接口 2022-03-09 18:58:30 +08:00
Chengliang 5cb2f02e69 福利方案修复更新操作 2022-03-09 17:46:03 +08:00
Chengliang 927b25908e solve conflict 2022-03-09 17:02:36 +08:00
钱涛 7ee952e63c 累计 2022-03-09 16:40:14 +08:00
Chengliang 7d245e786e 社保自定义福利控制器 getForm 2022-03-09 16:12:47 +08:00
Chengliang 0c3322796f solve conflict 2022-03-09 10:09:07 +08:00
Chengliang a090937930 solove conflict 2022-03-09 10:00:51 +08:00
Chengliang da98b66700 rebase 2022-03-09 09:58:39 +08:00
钱涛 880cf9ef66 excel导入导出 2022-03-09 09:58:36 +08:00
Chengliang 91958201e5 福利模块insert getForm delete update copy接口 2022-03-09 09:42:10 +08:00
钱涛 0e3412ad44 列表checkbox 2022-03-08 18:14:20 +08:00
钱涛 e860b30567 累计附加接口 2022-03-08 18:10:03 +08:00
钱涛 a190dc439d 日期转换 2022-03-08 16:35:05 +08:00
钱涛 9de0f08415 日期转换 2022-03-08 15:40:26 +08:00
钱涛 c8b05f5ef1 查询参数 2022-03-08 13:17:54 +08:00
Chengliang 2b61b030d7 福利模块getForm接口 2022-03-07 22:22:09 +08:00
钱涛 daee5b4c35 添加泛型 2022-03-07 19:34:02 +08:00
钱涛 382781fa26 列表注解 2022-03-07 19:27:32 +08:00
钱涛 0759628eb2 excel导入导出 2022-03-07 15:08:56 +08:00
钱涛 97cc5d154f 累计附加扣除-条件接口 2022-03-04 10:10:38 +08:00
钱涛 b028ad6845 税率修改接口bug 2022-03-03 14:52:50 +08:00
钱涛 c183a11cba 统一税率保存参数 2022-03-03 13:50:03 +08:00
钱涛 aa528eccd8 sql异常 2022-03-02 14:07:18 +08:00
MustangDeng 2bef264ce1 Merge branch 'master' of https://gitee.com/qlmr/weaver-hrm-salary 2022-03-02 11:12:41 +08:00
MustangDeng d83d945c19 列表转化和选择框权限 2022-03-02 11:12:22 +08:00
钱涛 1e134de35b 税率表详细信息接口 2022-03-02 11:09:23 +08:00
钱涛 87d278448c 暂存税率表接口 2022-03-02 09:54:55 +08:00
钱涛 fb42a5f041 删除接口ids改为json入参 2022-03-01 18:49:22 +08:00
钱涛 b56a48c885 税率接口 2022-03-01 18:31:29 +08:00
MustangDeng a41d76d0ab Merge branch 'master' of https://gitee.com/qlmr/weaver-hrm-salary 2022-03-01 17:24:24 +08:00
MustangDeng ee93ab4b35 编辑删除按钮 2022-03-01 17:23:42 +08:00
钱涛 8922047306 税率接口及相关基础类 2022-03-01 16:45:57 +08:00
钱涛 7dc77d0dab sql拼接异常 2022-03-01 15:00:09 +08:00
钱涛 363325b3af 软删除bug 2022-03-01 14:13:02 +08:00
钱涛 fb56c4d379 Merge remote-tracking branch 'origin/master' 2022-03-01 13:45:19 +08:00
钱涛 51b42bb726 sql bug 2022-03-01 13:45:01 +08:00
钱涛 1519c0a79c mysql查询语句拼接 2022-03-01 13:44:38 +08:00
MustangDeng 9685f03db4 删除demoController相关接口 2022-03-01 11:13:17 +08:00
钱涛 8876390719 前端名称对应 2022-03-01 10:28:40 +08:00
钱涛 f591c09dc9 个税扣缴义务人相关接口（6） 2022-02-28 17:19:07 +08:00
钱涛 a35259c1ef 异常处理框架 2022-02-28 11:12:55 +08:00
钱涛 b4a60e00da 修复mybatis版本不支持locadatatime的bug 2022-02-25 20:00:00 +08:00
钱涛 4a081d6ad9 初始化项目结构、demo样例、mybatis使用样例 2022-02-25 19:41:22 +08:00