Commits · 4ad7fbc029319bb2a431266d53192dbb24644b95 · zry / performance

09 Sep, 2021 1 commit
- Merge branch 'feature/绩效汇报表' into develop · 4ad7fbc0
  lcx committed Sep 09, 2021
  
  4ad7fbc0 Browse Files
08 Sep, 2021 3 commits
- 归档后个人绩效查询 · f9e57df7
  ruyun.zhang@suvalue.com committed Sep 08, 2021
  
  f9e57df7 Browse Files
- Merge branch 'develop' into feature/绩效汇报表 · b8c28b86
  lcx committed Sep 08, 2021
  
  b8c28b86 Browse Files
- 提取数据时5.1、5.2等子表删除不为公式的数据 · 67cd1fcb
  lcx committed Sep 08, 2021
  
  67cd1fcb Browse Files
01 Sep, 2021 1 commit
- 接口修改 · cc35fa85
  lcx committed Sep 01, 2021
  
  cc35fa85 Browse Files
30 Aug, 2021 1 commit
- 返回列头 · 32495d57
  lcx committed Aug 30, 2021
  
  32495d57 Browse Files
27 Aug, 2021 1 commit
- 键值对不区分大小写保存 · fc3f2397
  ruyun.zhang@suvalue.com committed Aug 27, 2021
  
  fc3f2397 Browse Files
26 Aug, 2021 2 commits

Merge branch 'develop' into feature/绩效汇报表 · 79216817

# Conflicts:
#	performance/Performance.Api/Controllers/ReportController.cs
#	performance/Performance.Api/wwwroot/Performance.Api.xml
#	performance/Performance.Services/ReportService.cs

committed Aug 26, 2021

79216817 Browse Files

报表 · f8184c42
lcx committed Aug 26, 2021

f8184c42 Browse Files

23 Aug, 2021 8 commits
- Merge branch 'feature/运营分析' into develop · 56a8db93
```
# Conflicts:
#	performance/Performance.Repository/PerforReportRepository .cs
```
  lcx committed Aug 23, 2021
  56a8db93 Browse Files
- 其他绩效审核修改判断条件 · 67e9a4a3
  lcx committed Aug 23, 2021
  
  67e9a4a3 Browse Files
- 添加接口 · 434b9a9a
  lcx committed Aug 23, 2021
  
  434b9a9a Browse Files
- Merge branch 'develop' of http://gitlab.suvalue.com/zry/performance into develop · dddb73c3
  钟博 committed Aug 23, 2021
  
  dddb73c3 Browse Files
- 人员字典保存修改，预算管理错误修改 · d85d1415
  钟博 committed Aug 23, 2021
  
  d85d1415 Browse Files
- Merge branch 'feature/清理0赋空' into develop · 46afbe62
  ruyun.zhang@suvalue.com committed Aug 23, 2021
  
  46afbe62 Browse Files
- 清理将所有0赋空 · c460ae30
  ruyun.zhang@suvalue.com committed Aug 23, 2021
  
  c460ae30 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · b3574823
  ruyun.zhang@suvalue.com committed Aug 23, 2021
  
  b3574823 Browse Files
20 Aug, 2021 3 commits
- 个人绩效查询用户创建问题修改，方法拆分 · 8e927fdb
  钟博 committed Aug 20, 2021
  
  8e927fdb Browse Files
- Merge branch 'feature/二次分配小数位' into develop · 3a4ce197
  ruyun.zhang@suvalue.com committed Aug 20, 2021
  
  3a4ce197 Browse Files
- 二次分配小数位 · 3e285b7a
  ruyun.zhang@suvalue.com committed Aug 20, 2021
  
  3e285b7a Browse Files
19 Aug, 2021 5 commits
- 运营分析增加参数:科室 · 84b4df0f
  lcx committed Aug 19, 2021
  
  84b4df0f Browse Files
- Merge branch 'feature/个人账号登陆查询绩效' into develop · 8b9aafc9
  钟博 committed Aug 19, 2021
  
  8b9aafc9 Browse Files
- 修改个人绩效查询问题 · c9b2aff2
  钟博 committed Aug 19, 2021
  
  c9b2aff2 Browse Files
- Merge branch 'feature/个人绩效查询' into feature/个人账号登陆查询绩效 · 91ced9f1
  钟博 committed Aug 19, 2021
  
  91ced9f1 Browse Files
- 绩效查询用户添加，查询 · 87d8d98c
  钟博 committed Aug 19, 2021
  
  87d8d98c Browse Files
18 Aug, 2021 4 commits
- Merge branch 'develop' into feature/运营分析 · 2d341f65
  lcx committed Aug 18, 2021
  
  2d341f65 Browse Files
- 新增人员字典列头 · 2fcf5b0b
  钟博 committed Aug 18, 2021
  
  2fcf5b0b Browse Files
- 二次分配多工作量名称返回 · 86dd9971
  ruyun.zhang@suvalue.com committed Aug 18, 2021
  
  86dd9971 Browse Files
- 优化 · 3cb09656
  ruyun.zhang@suvalue.com committed Aug 18, 2021
  
  3cb09656 Browse Files
17 Aug, 2021 2 commits
- 返回数据 · 1fa36210
  lcx committed Aug 17, 2021
  
  1fa36210 Browse Files
- 个人绩效查询 · 5c4a9e2e
  ruyun.zhang@suvalue.com committed Aug 17, 2021
  
  5c4a9e2e Browse Files
16 Aug, 2021 2 commits
- Merge branch 'feature/二次分配误差金额' into develop · 0ac56eb4
  ruyun.zhang@suvalue.com committed Aug 16, 2021
  
  0ac56eb4 Browse Files
- 二次分配误差金额改为0 · d447dce8
  ruyun.zhang@suvalue.com committed Aug 16, 2021
  
  d447dce8 Browse Files
13 Aug, 2021 3 commits
- Merge branch 'feature/预留绩效' into develop · d1979dac
  ruyun.zhang@suvalue.com committed Aug 13, 2021
  
  d1979dac Browse Files
- Merge branch 'feature/行政工勤一次分配重算' into develop · 17276664
  ruyun.zhang@suvalue.com committed Aug 13, 2021
  
  17276664 Browse Files
- 支持行政工勤分表读取 · 268a77f1
  ruyun.zhang@suvalue.com committed Aug 13, 2021
  
  268a77f1 Browse Files
12 Aug, 2021 3 commits
- 新增绩效copy数据时异常修改 · a33754f7
  lcx committed Aug 12, 2021
  
  a33754f7 Browse Files
- 预留绩效重算，数据来自视图 · 93eed7af
  ruyun.zhang@suvalue.com committed Aug 12, 2021
  
  93eed7af Browse Files
- 新增运营分析接口 · a2aef2fd
  lcx committed Aug 12, 2021
  
  a2aef2fd Browse Files
11 Aug, 2021 1 commit
- Merge remote-tracking branch 'origin/develop' into develop · cc23b62f
  ruyun.zhang@suvalue.com committed Aug 11, 2021
  
  cc23b62f Browse Files