From 781f2999683ca99577026df7ef4b748bf6366dac Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 31 五月 2024 17:17:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java
index 5edb2c7..068ea86 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java
@@ -1,10 +1,18 @@
package com.yuanchu.mom.service.impl;
-import com.yuanchu.mom.pojo.InsBushing;
-import com.yuanchu.mom.mapper.InsBushingMapper;
-import com.yuanchu.mom.service.InsBushingService;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.dto.BushingDto;
+import com.yuanchu.mom.dto.FibersDto;
+import com.yuanchu.mom.mapper.InsBushingMapper;
+import com.yuanchu.mom.pojo.InsBushing;
+import com.yuanchu.mom.service.InsBushingService;
+import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* <p>
@@ -15,6 +23,26 @@
* @since 2024-05-30 05:58:16
*/
@Service
+@AllArgsConstructor
public class InsBushingServiceImpl extends ServiceImpl<InsBushingMapper, InsBushing> implements InsBushingService {
+ private InsBushingMapper insBushingMapper;
+
+ @Override
+ public List<BushingDto> selectBushingBySampleId(Integer sampleId) {
+ List<InsBushing> insBushings = insBushingMapper.selectList(Wrappers.<InsBushing>lambdaQuery().eq(InsBushing::getInsSampleId, sampleId));
+ List<BushingDto> bushingDtos = new ArrayList<>();
+ for (InsBushing insBushing : insBushings) {
+ BushingDto bushingDto = JSON.parseObject(JSON.toJSONString(insBushing), BushingDto.class);
+ bushingDto.setFiber(insBushingMapper.selectFiberByBushingId(bushingDto.getId()));
+ if(bushingDto.getFiber().size()==0){
+ bushingDto.setFibers(insBushingMapper.selectFibersByBushingId(insBushing.getId()));
+ for (FibersDto fibers : bushingDto.getFibers()) {
+ fibers.setFiber(insBushingMapper.selectFiberByFibersId(fibers.getId()));
+ }
+ }
+ bushingDtos.add(bushingDto);
+ }
+ return bushingDtos;
+ }
}
--
Gitblit v1.9.3