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

1647 Commits

Author SHA1 Message Date
钱涛 d800ab1925 Merge branch 'develop' into release 2022-05-31 18:29:34 +08:00
钱涛 99b5c36864 暂存 2022-05-31 16:41:11 +08:00
MustangDeng df3535c77d 和代码build处理 2022-05-31 16:02:41 +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
钱涛 8b14038b90 分权 2022-05-31 09:58:35 +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
钱涛 841ca27c84 暂存 2022-05-27 17:21:39 +08:00
钱涛 71ea4b8609 导入 2022-05-27 15:43:38 +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
钱涛 c6ea4c5698 线下对比 2022-05-26 15:45:37 +08:00
钱涛 6103c9233e 批量操作数量限制 2022-05-26 13:41:58 +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
钱涛 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
钱涛 082d02ae67 Merge branch 'develop' into auth 2022-05-24 11:26:37 +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
钱涛 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
钱涛 ed0ba7ed6d 暂存 2022-05-19 14:50:01 +08:00
MustangDeng 1f636c28d6 福利台账异动清单 2022-05-19 11:23:25 +08:00
MustangDeng 69246485ee 福利导入模板 2022-05-19 09:33:07 +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
钱涛 dc1c865a4b 账套项目删除bug 2022-05-18 14:34:06 +08:00
钱涛 fa4d605c8d 暂存 2022-05-18 09:19:50 +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
钱涛 c440ccd0a6 修复 2022-05-10 17:26:58 +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
钱涛 bf37add9dd 修复导出异常 2022-05-09 14:11:07 +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
钱涛 d2a564cb92 sql兼容性处理 2022-05-06 16:01:33 +08:00
钱涛 ba67612e40 sql兼容性处理 2022-05-06 13:22:16 +08:00
钱涛 0a2640b459 公式变量累计 2022-05-05 15:22: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
钱涛 b0ee96eb41 导入模板改为内存生成 2022-04-28 17:44:26 +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
钱涛 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
钱涛 741a81bd29 除去导入无效的代码 2022-04-26 13:36:16 +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
钱涛 11190ee37d 区时+8 2022-04-24 17:42:32 +08:00
钱涛 f7760bf833 公式去除id生成 2022-04-24 10:47:38 +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
钱涛 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
钱涛 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 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
钱涛 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
钱涛 b1b086caf1 预览 2022-04-19 19:50:00 +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
Chengliang 0feadcf0b2 1 2022-04-19 13:32:11 +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
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 6fce8cdf4c 薪酬接口 2022-04-18 18:56:17 +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
钱涛 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
钱涛 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
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
钱涛 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
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
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
钱涛 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
钱涛 0faa5c5670 删除测试代码 2022-04-07 09:59:02 +08:00
钱涛 9d223c7a06 核算基础类 2022-04-06 20:01:00 +08:00
钱涛 75f64648d6 档案类修复 2022-04-06 13:21:30 +08:00
钱涛 8d9ff236f7 档案类修复 2022-04-06 11:02:02 +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
钱涛 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
钱涛 c03078cb12 Merge branch 'feature/qt' into develop 2022-04-01 10:26:44 +08:00
钱涛 8326f3ae6f 导入参数 2022-04-01 10:26:28 +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
钱涛 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
钱涛 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
钱涛 faca2d4d1b Merge branch 'feature/qt' into develop 2022-03-28 11:38:46 +08:00
钱涛 045293426c 账套校验规则 2022-03-28 11:38:33 +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
钱涛 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
钱涛 466966dac6 Merge branch 'feature/qt' into develop 2022-03-24 17:00:08 +08:00
钱涛 83e1cf2805 相对更新 2022-03-24 16:59:52 +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
钱涛 2f8b56e4ac 参数验证类 2022-03-21 20:09:10 +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
钱涛 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
钱涛 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
钱涛 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
钱涛 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
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
钱涛 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
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 04cf94e498 自定义福利接口 getCustomCategoryForm createSICategory.... 2022-03-10 15:23:56 +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
钱涛 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
钱涛 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
钱涛 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
钱涛 0759628eb2 excel导入导出 2022-03-07 15:08:56 +08:00
钱涛 97cc5d154f 累计附加扣除-条件接口 2022-03-04 10:10:38 +08:00
钱涛 c183a11cba 统一税率保存参数 2022-03-03 13:50:03 +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
钱涛 8922047306 税率接口及相关基础类 2022-03-01 16:45:57 +08:00
MustangDeng 9685f03db4 删除demoController相关接口 2022-03-01 11:13:17 +08:00
钱涛 f591c09dc9 个税扣缴义务人相关接口（6） 2022-02-28 17:19:07 +08:00
钱涛 4a081d6ad9 初始化项目结构、demo样例、mybatis使用样例 2022-02-25 19:41:22 +08:00