From cafbd6b7c808e93f3a514e0e0ac0c84f82f172ca Mon Sep 17 00:00:00 2001
From: guoqibing <guoqibing@sino-assistance.com>
Date: Mon, 25 Aug 2025 14:22:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zentao/service/impl/IZtCountService.java  | 23 +++++++++++--------
 .../service/impl/ZtKanbanlaneServiceImpl.java |  8 ++++++-
 .../impl/ZtStoryFeedbackServiceImpl.java      |  3 +++
 .../mapper/ZtStoryFeedbackMapper.xml          |  4 +++-
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/sa/zentao/service/impl/IZtCountService.java b/src/main/java/com/sa/zentao/service/impl/IZtCountService.java
index 090a19d..5999952 100644
--- a/src/main/java/com/sa/zentao/service/impl/IZtCountService.java
+++ b/src/main/java/com/sa/zentao/service/impl/IZtCountService.java
@@ -249,16 +249,16 @@ public class IZtCountService {
             result.setPstgCount(list.stream().filter(o ->
                     Arrays.asList("active", "unconfirmed", "waitcommunicate", "waitdesign", "designdoing", "designdone", "storyunconfirmed", "confirmed").contains(o.getStatus()))
                     .map(o -> o.getId() + "").collect(Collectors.joining(",")));
-
-            result.setPlanCount(ztStory.stream().filter(o -> "active".equals(o.getStatus()))
-                    .filter(o -> o.getStage().equals("wait")).map(o -> o.getId() + "").collect(Collectors.joining(",")));
+            //改为待确认
+            result.setPlanCount(list.stream().filter(o -> "storyunconfirmed".equals(o.getStatus()))
+                    .map(o -> o.getId() + "").collect(Collectors.joining(",")));
 
             result.setTestingCount(ztStory.stream().filter(o -> "active".equals(o.getStatus()))
                     .filter(o -> Arrays.asList("testing", "tested").contains(o.getStage())).map(o -> o.getId() + "").collect(Collectors.joining(",")));
 //            developing 研发中 developed 研发完毕  testing 测试中 tested测试完毕
 
             result.setJxzCount(ztStory.stream().filter(o -> "active".equals(o.getStatus()))
-                    .filter(o -> Arrays.asList("developing", "developed").contains(o.getStage())
+                    .filter(o -> Arrays.asList("wait","developing", "developed").contains(o.getStage())
                     ).map(o -> o.getId() + "").collect(Collectors.joining(",")));
 
 
@@ -348,18 +348,21 @@ public class IZtCountService {
                 }
             }
 
-            //待评审特殊
+            //待评审特殊 待确认
             result.setDpsCount(storyUsers.stream().filter(o -> "reviewing".equals(o.getStatus())).map(o -> o.getId() + "").collect(Collectors.joining(",")));
 
-            result.setPstgCount(storyUsers.stream().filter(o ->
-                    Arrays.asList("active", "unconfirmed", "waitcommunicate", "waitdesign", "designdoing", "designdone", "storyunconfirmed", "confirmed").contains(o.getStatus()))
+            //0825 改为待确认
+            result.setPlanCount(storyUsers.stream().filter(o -> "storyunconfirmed".equals(o.getStatus()))
                     .map(o -> o.getId() + "").collect(Collectors.joining(",")));
 
-            result.setPlanCount(ztStory.stream().filter(o -> "active".equals(o.getStatus()))
-                    .filter(o -> o.getStage().equals("wait")).map(o -> o.getId() + "").collect(Collectors.joining(",")));
 
+            result.setPstgCount(storyUsers.stream().filter(o ->
+                    Arrays.asList("active", "unconfirmed", "waitcommunicate", "waitdesign", "designdoing", "designdone", "confirmed").contains(o.getStatus()))
+                    .map(o -> o.getId() + "").collect(Collectors.joining(",")));
+
+            //0825 计划中和研发中合并
             result.setJxzCount(ztStory.stream().filter(o -> "active".equals(o.getStatus()))
-                    .filter(o -> Arrays.asList("tested", "testing", "developed", "developing").contains(o.getStage())
+                    .filter(o -> Arrays.asList("wait","tested", "testing", "developed", "developing").contains(o.getStage())
                     ).map(o -> o.getId() + "").collect(Collectors.joining(",")));
 
             result.setCswbCount(ztStory.stream().filter(o -> "active".equals(o.getStatus()))
diff --git a/src/main/java/com/sa/zentao/service/impl/ZtKanbanlaneServiceImpl.java b/src/main/java/com/sa/zentao/service/impl/ZtKanbanlaneServiceImpl.java
index 2411917..cca7eaf 100644
--- a/src/main/java/com/sa/zentao/service/impl/ZtKanbanlaneServiceImpl.java
+++ b/src/main/java/com/sa/zentao/service/impl/ZtKanbanlaneServiceImpl.java
@@ -139,6 +139,9 @@ public class ZtKanbanlaneServiceImpl extends ServiceImpl<ZtKanbanlaneMapper, ZtK
 
                             }
                         }
+                        //排序
+                        ztStoryDTOS.sort(Comparator.comparing(ZtStoryDTO::getPlanEndDate, Comparator.nullsLast(Comparator.naturalOrder())).reversed()
+                                .thenComparing(ZtStoryDTO::getPri, Comparator.nullsLast(Comparator.naturalOrder())).thenComparing(ZtStoryDTO::getId,Comparator.reverseOrder()));
                         d.setList(ztStoryDTOS);
                     }else if("bug".equalsIgnoreCase(d.getCardType())){
                         List<ZtBug> ztBugs = bugService.bugListByIds(ids);
@@ -155,7 +158,8 @@ public class ZtKanbanlaneServiceImpl extends ServiceImpl<ZtKanbanlaneMapper, ZtK
                                 }
                             }
                         }
-                        d.setList(ztBugDTOS);
+                        ztBugDTOS.sort(Comparator.comparing(ZtBugDTO::getDeadline, Comparator.nullsLast(Comparator.naturalOrder())).reversed()
+                                .thenComparing(ZtBugDTO::getPri, Comparator.nullsLast(Comparator.naturalOrder())).thenComparing(ZtBugDTO::getId,Comparator.reverseOrder()));                        d.setList(ztBugDTOS);
                     }else if("task".equalsIgnoreCase(d.getCardType())){
                         List<ZtTask> ztTasks = taskService.taskListByIds(ids);
                         List<ZtTaskDTO> ztTaskDTOS =new ArrayList<>();
@@ -189,6 +193,8 @@ public class ZtKanbanlaneServiceImpl extends ServiceImpl<ZtKanbanlaneMapper, ZtK
 
                             }
                         }
+                        ztTaskDTOS.sort(Comparator.comparing(ZtTaskDTO::getDeadline, Comparator.nullsLast(Comparator.naturalOrder())).reversed()
+                                .thenComparing(ZtTaskDTO::getPri, Comparator.nullsLast(Comparator.naturalOrder())).thenComparing(ZtTaskDTO::getId,Comparator.reverseOrder()));
                         d.setList(ztTaskDTOS);
                     }
                 }
diff --git a/src/main/java/com/sa/zentao/service/impl/ZtStoryFeedbackServiceImpl.java b/src/main/java/com/sa/zentao/service/impl/ZtStoryFeedbackServiceImpl.java
index 2d04f5a..20f19b9 100644
--- a/src/main/java/com/sa/zentao/service/impl/ZtStoryFeedbackServiceImpl.java
+++ b/src/main/java/com/sa/zentao/service/impl/ZtStoryFeedbackServiceImpl.java
@@ -442,6 +442,9 @@ public class ZtStoryFeedbackServiceImpl extends ServiceImpl<ZtStoryFeedbackMappe
         if (!org.apache.commons.lang3.StringUtils.isEmpty(qo.getSource())) {
             query.eq(ZtStoryFeedback::getSource, qo.getSource());
         }
+        if (qo.getId()!=null) {
+            query.eq(ZtStoryFeedback::getId, qo.getId());
+        }
         query.orderByDesc(ZtStoryFeedback::getId);
 
 
diff --git a/src/main/resources/mapper/ZtStoryFeedbackMapper.xml b/src/main/resources/mapper/ZtStoryFeedbackMapper.xml
index 71abd61..752eabb 100644
--- a/src/main/resources/mapper/ZtStoryFeedbackMapper.xml
+++ b/src/main/resources/mapper/ZtStoryFeedbackMapper.xml
@@ -101,7 +101,9 @@
         <if test="qo.searchVal == 'YGB' ">
             and s.status = 'closed'
         </if>
-
+        <if test="qo.id != null ">
+            and s.id = #{qo.id}
+        </if>
         order by id desc
     </select>