From 6b1077a1cb9f1fe09a8e1e92db23ffa840ddc478 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 07 三月 2024 15:33:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
index c08db94..37398d2 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
@@ -1,5 +1,6 @@
package com.ycl.platform.service.impl;
+import com.ycl.platform.base.BaseSelect;
import com.ycl.platform.domain.entity.CheckTemplate;
import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.mapper.CheckTemplateMapper;
@@ -144,9 +145,14 @@
@Override
public Result all() {
List<CheckTemplate> entities = baseMapper.selectList(null);
- List<CheckTemplateVO> vos = entities.stream()
+ List<BaseSelect> vos = entities.stream()
.map(
- entity -> CheckTemplateVO.getVoByEntity(entity, null)
+ entity -> {
+ BaseSelect baseSelect = new BaseSelect();
+ baseSelect.setId(entity.getId());
+ baseSelect.setValue(entity.getTemplateName());
+ return baseSelect;
+ }
)
.collect(Collectors.toList());
return Result.ok().data(vos);
--
Gitblit v1.8.0