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

379 Commits

Author SHA1 Message Date
MustangDeng d3c82acac1 发送撤回工资单 2022-06-06 13:56:47 +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
钱涛 2bfd6c90a0 Merge branch 'develop' into release 
# Conflicts:
#	src/com/engine/salary/service/impl/SISchemeServiceImpl.java
 2022-06-06 10:23:19 +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
钱涛 758e64e6bc 档案导入 2022-06-01 20:46:51 +08:00
钱涛 bb665500ae 档案 2022-06-01 19:14:05 +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
钱涛 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 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
钱涛 0898055d77 fix 2022-05-31 10:29:18 +08:00
钱涛 8b14038b90 分权 2022-05-31 09:58:35 +08:00
钱涛 5925fb5606 分权 2022-05-30 20:13:03 +08:00
钱涛 f8ecb548ed Merge branch 'auth' into release 
# Conflicts:
#	src/com/engine/salary/biz/AddUpDeductionBiz.java
#	src/com/engine/salary/biz/AddUpSituationBiz.java
#	src/com/engine/salary/biz/SIAccountBiz.java
#	src/com/engine/salary/biz/SIArchivesBiz.java
#	src/com/engine/salary/biz/SalaryArchiveBiz.java
#	src/com/engine/salary/biz/SalaryArchiveItemBiz.java
#	src/com/engine/salary/biz/SalaryItemBiz.java
#	src/com/engine/salary/biz/SalarySobCheckRuleBiz.java
#	src/com/engine/salary/cmd/datacollection/AddUpDeductionImportCmd.java
#	src/com/engine/salary/cmd/datacollection/AddUpSituationImportCmd.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java
#	src/com/engine/salary/enums/UserStatusEnum.java
#	src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml
#	src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
 2022-05-30 18:50:00 +08:00
MustangDeng 4e4c190f31 bug修改 2022-05-30 17:31:29 +08:00
钱涛 60ae1ff35b sqlserver 
适配
 2022-05-27 18:07:26 +08:00
钱涛 ad991954cd 暂存 2022-05-27 11:49:23 +08:00
钱涛 b5d6adfbde 暂存 2022-05-26 18:16:48 +08:00
钱涛 c6ea4c5698 线下对比 2022-05-26 15:45:37 +08:00
钱涛 f6eb69e62a 暂存 2022-05-26 11:02:55 +08:00
MustangDeng 05dc46894d 总览数据不对问题 2022-05-26 11:00:38 +08:00
钱涛 586fad5f2c 分权累计专项附加扣除 2022-05-25 16:51:43 +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
钱涛 f555192e70 升级 2022-05-24 11:24:21 +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
钱涛 ed0ba7ed6d 暂存 2022-05-19 14:50:01 +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
钱涛 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
钱涛 a2c59d15f4 项目分类bug 2022-05-12 14:36:16 +08:00
钱涛 6f3d8e85c0 个税申报bug 2022-05-09 17:47:19 +08:00
钱涛 fd856e0750 入职日期 2022-05-09 14:24:40 +08:00
钱涛 bf37add9dd 修复导出异常 2022-05-09 14:11:07 +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
钱涛 525fcc49a7 公式模拟运行 2022-05-08 12:34:05 +08:00
钱涛 c852211b0e 核算log 2022-05-07 15:20:39 +08:00
钱涛 88b94b7aac 薪资项目列表优化 2022-05-05 15:02:12 +08:00
钱涛 231961663f 核算结果导出 2022-05-05 14:10:19 +08:00
钱涛 a530532a45 去除run方法 2022-05-05 10:35:58 +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
钱涛 6ca41e8e59 字段分类 2022-04-27 18:29:38 +08:00
钱涛 c899d370a9 默认员工字段不可删除 2022-04-27 17:20:33 +08:00
钱涛 01354b2be9 fix线下对比404 2022-04-27 13:33:44 +08:00
钱涛 8abfb7631e fix线下对比404 2022-04-27 09:43:24 +08:00
钱涛 151fa2b575 线下对比 2022-04-26 16:39:41 +08:00
钱涛 d521bf5bf7 账套周期 2022-04-26 14:44:42 +08:00
钱涛 12efa69503 同步考勤字段值 2022-04-25 15:51:35 +08:00
钱涛 416ccd57a6 同步考勤字段值 2022-04-25 14:51:30 +08:00
钱涛 11190ee37d 区时+8 2022-04-24 17:42:32 +08:00
钱涛 3b342d4ec7 我的薪资福利 2022-04-22 19:22:40 +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
MustangDeng ee9116ae2b 工资单列表问题处理 2022-04-22 11:02:15 +08:00
钱涛 cd8df85e54 公式字段 2022-04-21 20:29:11 +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
钱涛 36d65de007 fix 2022-04-21 14:15:56 +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
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
钱涛 d2ba2c3afe 公式参数 2022-04-20 11:31:55 +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
钱涛 c4c757d055 Merge branch 'feature/v1' into develop 2022-04-19 15:13:23 +08:00
钱涛 c537b7d944 补充列 2022-04-19 15:13:08 +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
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
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
钱涛 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
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
钱涛 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