From cf4f8c022412536ee272024d132a3c2a9b9f210b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 31 五月 2024 17:30:21 +0800
Subject: [PATCH] 完善工时统计的原始工时
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 31fdace..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
@@ -2,11 +2,12 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.yuanchu.mom.dto.BushingDto;
-import com.yuanchu.mom.pojo.InsBushing;
-import com.yuanchu.mom.mapper.InsBushingMapper;
-import com.yuanchu.mom.service.InsBushingService;
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;
@@ -34,6 +35,12 @@
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