From eb4db6de9a76da4af501925227359ca28144284e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 27 九月 2024 10:51:51 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/mission/MissionList.jsx | 7 ++++---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java | 2 ++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java | 23 +++++++++++++++++++----
3 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/zy-acs-flow/src/page/mission/MissionList.jsx b/zy-acs-flow/src/page/mission/MissionList.jsx
index 712cc13..0bb97c4 100644
--- a/zy-acs-flow/src/page/mission/MissionList.jsx
+++ b/zy-acs-flow/src/page/mission/MissionList.jsx
@@ -30,6 +30,7 @@
ReferenceArrayInput,
AutocompleteInput,
ListToolbar,
+ Title,
} from 'react-admin';
import { matchPath, useLocation } from 'react-router';
import { Box, Typography, Card, Stack } from '@mui/material';
@@ -67,13 +68,13 @@
const { data, isPending, filterValues } = useListContext();
if (isPending) return null;
console.log(data);
-
+
if (!data?.length) {
return (
<>
{/* <MissionEmpty> */}
- <MissionShow open={!!matchShow} id={matchShow?.params.id} />
- {/* <DealArchivedList /> */}
+ <MissionShow open={!!matchShow} id={matchShow?.params.id} />
+ {/* <DealArchivedList /> */}
{/* </MissionEmpty> */}
</>
);
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java
index 69b6e71..9247976 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java
@@ -8,6 +8,8 @@
@Data
public class MissionVo {
+ private Long id;
+
String groupNo;
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java
index 7a0f298..e394705 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java
@@ -1,6 +1,9 @@
package com.zy.acs.manager.manager.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.manager.controller.result.MissionVo;
+import com.zy.acs.manager.manager.entity.Segment;
import com.zy.acs.manager.manager.enums.SegmentStateType;
import com.zy.acs.manager.manager.service.MissionService;
import com.zy.acs.manager.manager.service.SegmentService;
@@ -24,13 +27,25 @@
List<MissionVo> result = new ArrayList<>();
List<String> runningGroupNos = segmentService.getGroupNo(SegmentStateType.RUNNING);
for (String groupNo : runningGroupNos) {
- MissionVo vo = new MissionVo();
-
- vo.setGroupNo(groupNo);
- result.add(vo);
+ MissionVo vo = generate(groupNo);
+ if (null != vo) {
+ result.add(vo);
+ }
}
return result;
}
+ public MissionVo generate(String groupNo) {
+ List<Segment> list = segmentService.list(new LambdaQueryWrapper<Segment>().eq(Segment::getGroupId, groupNo));
+ if (Cools.isEmpty(list)) {
+ return null;
+ }
+ Segment segment = list.get(0);
+ MissionVo vo = new MissionVo();
+ vo.setGroupNo(groupNo);
+ vo.setId(segment.getId());
+ return vo;
+ }
+
}
--
Gitblit v1.9.1