Commit Graph

5397 Commits

Author SHA1 Message Date
KingChan ee1b0556ad Merge pull request '调整pm饼图返回值' (#264) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-30 14:32:56 +08:00
呱呱呱 a5a22f6889 add default pm project statistics 2024-01-30 14:29:37 +08:00
KingChan eb00419eb4 Merge pull request '修复 pm project statistics 问题' (#263) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-30 14:23:25 +08:00
呱呱呱 9538767167 update pm project statistics 2024-01-30 14:20:16 +08:00
KingChan 932fa04a45 Merge pull request '增加默认返回值' (#262) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-30 14:06:57 +08:00
呱呱呱 7d8e0d018e add default for project polyline 2024-01-30 14:03:34 +08:00
KingChan 69b9ae0cb0 Merge pull request 'pm 项目统计新增 open data 返回结果' (#261) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-30 11:44:05 +08:00
呱呱呱 53083d3030 add open data for pm project statistics 2024-01-30 11:40:56 +08:00
KingChan fc007d8f0b Merge pull request '调整返回值' (#260) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-30 11:18:29 +08:00
呱呱呱 f39b83692b update 2024-01-30 11:16:06 +08:00
KingChan 0c148b0fad Merge pull request '修复bug' (#259) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-30 11:14:15 +08:00
呱呱呱 3094c81d2c fix bug 2024-01-30 11:07:01 +08:00
KingChan 0e72e11275 Merge pull request '修复数据问题,新增开启中的工作项数量返回' (#258) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-30 11:00:06 +08:00
呱呱呱 3505d29410 fix 2024-01-30 10:56:46 +08:00
xxq250 b6b81b6092 Merge remote-tracking branch 'origin/pm_project_develop' into pm_project_develop 2024-01-26 15:39:39 +08:00
xxq250 28de064841 issues_count增加我负责的统计 2024-01-26 15:38:32 +08:00
KingChan ea0bdd83d0 Merge pull request '调整燃烬图系数' (#257) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-25 17:16:30 +08:00
呱呱呱 efef195c27 update burndown_charts base_number -1 2024-01-25 17:13:57 +08:00
KingChan 0ce1b5fd9c Merge pull request '调整燃烬图的数字类型' (#256) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-25 17:13:16 +08:00
呱呱呱 45e8b4d832 update burndown_charts base_number 2024-01-25 17:10:43 +08:00
xxq250 088bb3d1ac pm中多项目id查询issue 2024-01-25 15:49:03 +08:00
xxq250 3986b86852 pm中多项目id查询issue 2024-01-25 15:44:55 +08:00
KingChan b33c4bf78b Merge pull request '调整请求路由' (#254) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-25 14:30:26 +08:00
呱呱呱 0d250e0d4e update routes 2024-01-25 14:28:00 +08:00
KingChan 5649f5b67a Merge pull request '新增获取饼图 折线图数据接口' (#253) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-25 14:08:33 +08:00
呱呱呱 406da81ccf add project statistics and project polyline 2024-01-25 14:04:36 +08:00
KingChan 5a0c7cddcf Merge pull request '调整燃烬图' (#252) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-25 09:04:04 +08:00
呱呱呱 27b81a5479 update burndown_charts 2024-01-25 09:01:35 +08:00
kingchan dbdebc6232 update 2024-01-24 16:55:10 +08:00
KingChan 4889eb8554 Merge pull request '调整燃烬图返回值' (#251) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-23 17:26:23 +08:00
呱呱呱 f85f9fe4f4 update burndown_charts response 2024-01-23 17:22:58 +08:00
KingChan c9b6484b66 Merge pull request '燃烬图接口' (#250) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-23 17:18:18 +08:00
呱呱呱 191153a39e add burndown_charts 2024-01-23 17:08:06 +08:00
KingChan 07a563f769 Merge pull request '新增 typoe 工时解析' (#249) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-01-23 11:21:36 +08:00
呱呱呱 ea6295c888 update pm statistics hour 2024-01-23 11:19:00 +08:00
yystopf ccdacb641f 新增:导入禅道需求数据脚本 2024-01-15 14:53:29 +08:00
yystopf d55ff07296 新增:排除组织项目ID参数 2024-01-15 10:59:01 +08:00
yystopf f893ce41d0 新增:排除组织项目ID参数 2024-01-15 10:52:30 +08:00
yystopf ebdfbbf420 新增:导入禅道数据脚本 2024-01-13 14:31:35 +08:00
yystopf 8edc150800 新增:项目信息返回name 2024-01-13 08:26:15 +08:00
yystopf f9ce2a8b26 新增:项目标记创建时不能为空 2024-01-12 16:39:35 +08:00
yystopf 05aeecf67a 新增:项目标记关联组织初始化 2024-01-10 14:03:08 +08:00
yystopf 5fafd8195c 新增:项目标记关联组织接口 2024-01-04 14:25:40 +08:00
xxq250 7d1b4da72c Merge branch 'standalone_develop' into pm_project_develop
# Conflicts:
#	app/controllers/attachments_controller.rb
#	app/services/api/v1/issues/concerns/checkable.rb
#	app/services/api/v1/issues/concerns/loadable.rb
2023-12-15 10:43:54 +08:00
yystopf d98ad8a3f4 Merge branch 'develop' into standalone_develop 2023-12-15 09:42:30 +08:00
yystopf ad96991730 更改:提示语逗号为中文逗号 2023-12-15 09:01:11 +08:00
yystopf e78f7ab9dd Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop 2023-12-14 16:45:49 +08:00
xxq250 835f2db759 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2023-12-14 16:45:36 +08:00
yystopf ac601b4b22 Merge branch 'develop' into standalone_develop 2023-12-14 16:45:32 +08:00
xxq250 c972d538ee fixed 用户搜索按昵称和登录时间倒排序 2023-12-14 16:45:29 +08:00