From c45ce58884c59ddf8a6051ba370215e6f62adeb8 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期五, 28 七月 2023 10:11:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesServiceImpl.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesServiceImpl.java
index a39956c..2560c99 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.alarmpoints.tube.service.impl;
import java.util.List;
+
import com.ruoyi.alarmpoints.tube.domain.ArdTubes;
import com.ruoyi.alarmpoints.tube.domain.ArdTubesDetails;
import com.ruoyi.alarmpoints.tube.mapper.ArdTubesDetailsMapper;
@@ -10,6 +11,7 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
/**
@@ -24,6 +26,7 @@
private ArdTubesMapper ardTubesMapper;
@Resource
private ArdTubesDetailsMapper ardTubesDetailsMapper;
+
/**
* 鏌ヨ绠＄嚎绠＄悊
*
@@ -44,13 +47,16 @@
@Override
@DataScope(deptAlias = "d", userAlias = "u")
public List<ArdTubes> selectArdTubesList(ArdTubes ardTubes) {
- ArdTubesDetails tubesDetails=new ArdTubesDetails();
- tubesDetails.setTubeId(ardTubes.getId());
- List<ArdTubesDetails> ardTubesDetails = ardTubesDetailsMapper.selectArdTubesDetailsList(tubesDetails);
- ArdTubes arttube=new ArdTubes();
- arttube.setChildCount(ardTubesDetails.size());
- ardTubesMapper.updateArdTubes(arttube);
- return ardTubesMapper.selectArdTubesList(ardTubes);
+
+ List<ArdTubes> tubes = ardTubesMapper.selectArdTubesList(ardTubes);
+ for (ArdTubes tube : tubes) {
+ ArdTubesDetails tubesDetails = new ArdTubesDetails();
+ tubesDetails.setTubeId(tube.getId());
+ List<ArdTubesDetails> ardTubesDetails = ardTubesDetailsMapper.selectArdTubesDetailsList(tubesDetails);
+ tube.setChildCount(ardTubesDetails.size());
+ ardTubesMapper.updateArdTubes(tube);
+ }
+ return tubes;
}
/**
@@ -90,11 +96,11 @@
*/
@Override
public int deleteArdTubesByIds(String[] ids) {
- for (String id: ids ) {
- ArdTubesDetails tubesDetails=new ArdTubesDetails();
+ for (String id : ids) {
+ ArdTubesDetails tubesDetails = new ArdTubesDetails();
tubesDetails.setTubeId(id);
List<ArdTubesDetails> ardTubesDetails = ardTubesDetailsMapper.selectArdTubesDetailsList(tubesDetails);
- if(ardTubesDetails.size()>0) {
+ if (ardTubesDetails.size() > 0) {
for (ArdTubesDetails tubesDetail : ardTubesDetails) {
int i = ardTubesDetailsMapper.deleteArdTubesDetailsById(tubesDetail.getId());
}
@@ -111,10 +117,10 @@
*/
@Override
public int deleteArdTubesById(String id) {
- ArdTubesDetails tubesDetails=new ArdTubesDetails();
+ ArdTubesDetails tubesDetails = new ArdTubesDetails();
tubesDetails.setTubeId(id);
List<ArdTubesDetails> ardTubesDetails = ardTubesDetailsMapper.selectArdTubesDetailsList(tubesDetails);
- if(ardTubesDetails.size()>0) {
+ if (ardTubesDetails.size() > 0) {
for (ArdTubesDetails tubesDetail : ardTubesDetails) {
int i = ardTubesDetailsMapper.deleteArdTubesDetailsById(tubesDetail.getId());
}
--
Gitblit v1.9.3