From f21be3ec126a2aecbbe91d9708d2470a3239632b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Mon, 25 Oct 2021 13:53:34 +0800
Subject: [PATCH]  * code for task #43341.

---
 api/v1/entries/user.php   | 26 +++++++++++++++++++++++++-
 module/bug/lang/zh-cn.php | 15 +++++++++------
 module/my/model.php       |  2 +-
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/api/v1/entries/user.php b/api/v1/entries/user.php
index 030090ba3e..c543aac41d 100644
--- a/api/v1/entries/user.php
+++ b/api/v1/entries/user.php
@@ -135,8 +135,32 @@ class userEntry extends Entry
 
                     if($data->status == 'success')
                     {
+                        $bugs = array();
+                        foreach($data->data->bugs as $bug)
+                        {
+                            $status = array('code' => $bug->status, 'name' => $this->lang->bug->statusList[$bug->status]);
+                            if($bug->status == 'active' and $bug->confirmed) $status = array('code' => 'confirmed', 'name' => $this->lang->bug->labelConfirmed);
+                            if($bug->resolution == 'postponed') $status = array('code' => 'postponed', 'name' => $this->lang->bug->labelPostponed);
+                            if(!empty($bug->delay)) $status = array('code' => 'delay', 'name' => $this->lang->bug->overdueBugs);
+                            $bug->status = $status;
+
+                            $bugs[$bug->id] = $bug;
+                        }
+
+                        $storyChangeds = $this->dao->select('t1.id')->from(TABLE_BUG)->alias('t1')
+                            ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story=t2.id')
+                            ->where('t1.id')->in(array_keys($bugs))
+                            ->andWhere('t1.story')->ne('0')
+                            ->andWhere('t1.storyVersion != t2.version')
+                            ->fetchAll();
+                        foreach($storyChangeds as $bugID)
+                        {
+                            $status = array('code' => 'storyChanged', 'name' => $this->lang->bug->storyChanged);
+                            $bugs[$bugID]->status = $status;
+                        }
+
                         $info->bug['total'] = $data->data->pager->recTotal;
-                        $info->bug['bugs']  = array_values((array)$data->data->bugs);
+                        $info->bug['bugs']  = array_values($bugs);
                     }
 
                     break;
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index 8c11dead7d..fe7157f155 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -150,12 +150,15 @@ $lang->bug->assignToMeAB   = '指派给我';
 $lang->bug->openedByMeAB   = '由我创建';
 $lang->bug->resolvedByMeAB = '由我解决';
 
-$lang->bug->ditto         = '同上';
-$lang->bug->dittoNotice   = '该bug与上一bug不属于同一产品！';
-$lang->bug->noAssigned    = '未指派';
-$lang->bug->noBug         = '暂时没有Bug。';
-$lang->bug->noModule      = '<div>您现在还没有模块信息</div><div>请维护测试模块</div>';
-$lang->bug->delayWarning  = " <strong class='text-danger'> 延期%s天 </strong>";
+$lang->bug->ditto          = '同上';
+$lang->bug->dittoNotice    = '该bug与上一bug不属于同一产品！';
+$lang->bug->noAssigned     = '未指派';
+$lang->bug->noBug          = '暂时没有Bug。';
+$lang->bug->noModule       = '<div>您现在还没有模块信息</div><div>请维护测试模块</div>';
+$lang->bug->delayWarning   = " <strong class='text-danger'> 延期%s天 </strong>";
+$lang->bug->labelConfirmed = '已确认';
+$lang->bug->labelPostponed = '被延期';
+$lang->bug->storyChanged   = '需求变动';
 
 /* 页面标签。*/
 $lang->bug->lblAssignedTo = '当前指派';
diff --git a/module/my/model.php b/module/my/model.php
index da415df6a8..0b2a63a211 100644
--- a/module/my/model.php
+++ b/module/my/model.php
@@ -66,7 +66,7 @@ class myModel extends model
      */
     public function getProducts($type = 'undone')
     {
-        $products = $this->dao->select('t1.id as id,t1.*')->from(TABLE_PRODUCT)->alias('t1')
+        $products = $this->dao->select('t1.*, t2.name as programName')->from(TABLE_PRODUCT)->alias('t1')
             ->leftJoin(TABLE_PROGRAM)->alias('t2')->on('t1.program = t2.id')
             ->where('t1.deleted')->eq(0)
             ->beginIF($type == 'undone')->andWhere('t1.status')->eq('normal')->fi()