OA/zentao
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

报表修改，排序等

Browse Source
This commit is contained in:
郭其兵
2025-08-25 14:22:28 +08:00
parent 632f381e02
commit cafbd6b7c8
4 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/sa/zentao/service/impl/IZtCountService.java
View File

@ -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()))

8
src/main/java/com/sa/zentao/service/impl/ZtKanbanlaneServiceImpl.java
View File

@ -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);
}
}

3
src/main/java/com/sa/zentao/service/impl/ZtStoryFeedbackServiceImpl.java
View File

@ -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);