From b82c71a3e3a97a78bd18ff598d27f3062600d22a Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 02 二月 2024 22:47:41 +0800
Subject: [PATCH] 增加车间和工段的维护接口
---
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/workshop/WorkshopService.java | 47 +++++++++++++++++++++++++++--------------------
1 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/workshop/WorkshopService.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/workshop/WorkshopService.java
index 99df22f..dcdf10c 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/workshop/WorkshopService.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/workshop/WorkshopService.java
@@ -1,19 +1,22 @@
package com.qianwen.mdc.service.workshop;
+import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
+import org.apache.tomcat.util.buf.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import com.qianwen.mdc.domain.Machine;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.qianwen.mdc.domain.Section;
import com.qianwen.mdc.domain.workshop.Workshop;
import com.qianwen.mdc.domain.workshop.WorkshopAssembler;
-import com.qianwen.mdc.dto.WorkshopDTO;
-import com.qianwen.mdc.dto.machine.MachineDTO;
-import com.qianwen.mdc.mapper.MachineMapper;
+import com.qianwen.mdc.dto.workshop.WorkshopDTO;
+import com.qianwen.mdc.dto.workshop.WorkshopFullDTO;
+import com.qianwen.mdc.dto.workshop.WorkshopQueryDTO;
import com.qianwen.mdc.mapper.SectionMapper;
import com.qianwen.mdc.mapper.WorkshopMapper;
@@ -27,29 +30,15 @@
private WorkshopMapper workshopMapper;
@Autowired
private SectionMapper sectionMapper;
- @Transactional
- public void save(WorkshopDTO workshopDTO) {
- Workshop ws = new Workshop();
- ws.setName(workshopDTO.getName());
-
- workshopMapper.insert(ws);
- }
- @Transactional
- public void modify(WorkshopDTO workshopDTO) {
-
- Workshop ws = workshopMapper.selectById(workshopDTO.getId());
- ws.setName(workshopDTO.getName());
-
- workshopMapper.updateById(ws);
- }
/**
* 鑾峰彇杞﹂棿鍒楄〃锛岄檮甯﹁溅闂翠笅鐨勫伐娈垫暟鎹�
* @return
*/
+ @Transactional(readOnly=true)
public List<WorkshopDTO> listWithSections() {
- List<Workshop> list = workshopMapper.selectList(null);
+ List<Workshop> list = workshopMapper.selectList(Wrappers.emptyWrapper());
return list.stream().map(ws -> {
List<Section> sectionList = sectionMapper.queryByWorkshopId(ws.getId());
WorkshopDTO wsDTO = WorkshopAssembler.toDTO(ws,sectionList);
@@ -57,4 +46,22 @@
return wsDTO;
}).collect(Collectors.toList());
}
+
+ @Transactional(readOnly=true)
+ public Page<WorkshopFullDTO> pageQuery(WorkshopQueryDTO dto) {
+ Page<WorkshopFullDTO> rowPage = new Page<>(dto.finalPageNo(),dto.finalPageSize());
+ rowPage = workshopMapper.queryPage(rowPage, dto);
+
+ rowPage.getRecords().forEach((ws) -> {
+ List<Section> sectionList = sectionMapper.queryByWorkshopId(ws.getId());
+ List<String> nameList = new ArrayList<>();
+ for(Section s : sectionList) {
+ nameList.add(s.getName());
+ }
+
+ ws.setSectionNames(StringUtils.join(nameList,','));
+ });
+
+ return rowPage;
+ }
}
--
Gitblit v1.9.3