Tấn Trần Thanh · @tantt · Hoang Phuc Do · Hoang Phuc Do · Hoang Phuc Do · Hoang Phuc Do
--- a/plugins/workflow_report/app/models/workflow_report_issue.rb
+++ b/plugins/workflow_report/app/models/workflow_report_issue.rb
-  TESTCASE_FIELD_ID = 22
-  BUGS_FIELD_ID = 23
-  STG_BUGS_FIELD_ID = 27
-  PROD_BUGS_FIELD_ID = 28
-  PR_FIELD_ID = 18
-  JP_REQUEST_FIELD_ID = 16
+  belongs_to :workflow_report_version, class_name: 'Version', foreign_key: 'fixed_version_id'
+  has_many :workflow_report_custom_values, class_name: 'WorkflowReportCustomValue', foreign_key: 'customized_id'

-  scope :find_root_ids, ->(year, month, project_ids) {
-    joins(:project, project: :enabled_modules)
-      .joins('LEFT OUTER JOIN time_entries ON issues.id = time_entries.issue_id')
-      .where.not(projects: { status: 9 })
+  scope :raw_tasks_records, -> (year, month, project_ids) {
+    includes(:project, :workflow_report_version, :workflow_report_custom_values, :time_entries, :status, project: :enabled_modules)
+      .where.not(projects: { status: 9 }, issues: { tracker_id: 1 })
--- a/plugins/workflow_report/lib/workflow_report.rb
+++ b/plugins/workflow_report/lib/workflow_report.rb
        end
        pull_request = ''
        jp_request = ''
-        record.each do |issue|
+        issues.each do |issue|
          if issue.tracker_id == 12