From 23003e5ece97193921dacc7a7dc98926449b64d6 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 09 四月 2024 11:55:46 +0800
Subject: [PATCH] 新增工单
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
index 89b1ced..8f9d143 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
@@ -1,8 +1,11 @@
package com.ycl.platform.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.HashMap;
import java.util.List;
+import com.ycl.platform.base.BaseSelect;
import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.domain.form.YwUnitForm;
import com.ycl.platform.domain.query.YwUnitQuery;
@@ -142,11 +145,38 @@
@Override
public Result all() {
List<YwUnit> entities = baseMapper.selectList(null);
- List<YwUnitVO> vos = entities.stream()
+
+ List<BaseSelect> vos = entities.stream()
+ .map(
+ entity -> {
+ BaseSelect baseSelect = new BaseSelect();
+ baseSelect.setId(entity.getId());
+ baseSelect.setValue(entity.getUnitName());
+ return baseSelect;
+ }
+ )
+ .collect(Collectors.toList());
+ return Result.ok().data(vos);
+ }
+
+ @Override
+ public List<YwUnitVO> export(YwUnitQuery query) {
+ // 鍒嗛〉鏉′欢鏌ヨ浣�
+ IPage<YwUnit> page = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(StringUtils.hasText(query.getUnitCode()), YwUnit::getUnitCode, query.getUnitCode())
+ .like(StringUtils.hasText(query.getUnitName()), YwUnit::getUnitName, query.getUnitName())
+ .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),
+ YwUnit::getCreateTime,
+ DateUtils.getDayStart(query.getStart()),
+ DateUtils.getDayEnd(query.getEnd()))
+ .orderByDesc(YwUnit::getCreateTime)
+ .page(PageUtil.getPage(query, YwUnit.class));
+
+ List<YwUnitVO> vos = page.getRecords().stream()
.map(
entity -> YwUnitVO.getVoByEntity(entity, null)
)
.collect(Collectors.toList());
- return Result.ok().data(vos);
+ return vos;
}
}
--
Gitblit v1.8.0