From a0ad47463f16d42ba3d4f6b9887f6b5bee4b6d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Tue, 15 Apr 2025 16:24:10 +0800 Subject: [PATCH] fix:bug --- .../yxgh/df/service/DfCheckingRecordV2Service.java | 2 +- .../com/kms/yxgh/df/service/DfCheckingV2Service.java | 11 ++--------- .../yxgh/dw/service/DwCheckingRecordV2Service.java | 2 +- .../com/kms/yxgh/dw/service/DwCheckingV2Service.java | 8 +++----- .../yxgh/sz/service/SzCheckingRecordV2Service.java | 2 +- .../com/kms/yxgh/sz/service/SzCheckingV2Service.java | 8 +++----- 6 files changed, 11 insertions(+), 22 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java index e7de1ba0..5a73740f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java @@ -66,7 +66,7 @@ public class DfCheckingRecordV2Service extends BaseService() .eq(StringUtils.isNotBlank(record.getId()), DfCheckingProblemV2::getRecordId, record.getId()))); - DfTaskV2Manage manage = dfTaskV2Service.getOne(new LambdaQueryWrapper().eq(DfTaskV2Manage::getCheckingId, record.getCheckingId())); + DfTaskV2Manage manage = dfTaskV2Service.getOne(new LambdaQueryWrapper().eq(DfTaskV2Manage::getId, record.getTaskId())); if (!Objects.isNull(manage)) { dto.setResponsibleUnit(manage.getResponsibleUnit()); dto.setResponsibleUnitId(manage.getResponsibleUnitId()); diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java index 6479356c..367fde38 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java @@ -49,10 +49,6 @@ public class DfCheckingV2Service extends BaseService list(SearchParam sp) { // 分页参数 @@ -199,14 +195,11 @@ public class DfCheckingV2Service extends BaseService 0) { - int count = dfTaskV2Service.count(new LambdaQueryWrapper().in(DfTaskV2Manage::getCheckingId, getIntList(ids))); + int count = count(new LambdaQueryWrapper().in(DfCheckingV2ProjectManage::getId, getIntList(ids))); if (count > 0) { throw new RuntimeException("请先删除子项"); } - dfTaskV2Service.remove(new LambdaQueryWrapper() - .in(DfTaskV2Manage::getCheckingId, getIntList(ids))); - return remove(new LambdaQueryWrapper() - .in(DfCheckingV2ProjectManage::getId, getIntList(ids))); + return removeById(ids); } return Boolean.FALSE; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java index eeb54d9b..1f7a924a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java @@ -70,7 +70,7 @@ public class DwCheckingRecordV2Service extends BaseService() .eq(StringUtils.isNotBlank(record.getId()), DwCheckingProblemV2::getRecordId, record.getId()))); - DwTaskV2Manage manage = dwTaskV2Service.getOne(new LambdaQueryWrapper().eq(DwTaskV2Manage::getCheckingId, record.getCheckingId())); + DwTaskV2Manage manage = dwTaskV2Service.getOne(new LambdaQueryWrapper().eq(DwTaskV2Manage::getId, record.getTaskId())); if (!Objects.isNull(manage)) { dto.setResponsibleUnit(manage.getResponsibleUnit()); dto.setResponsibleUnitId(manage.getResponsibleUnitId()); diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java index 443a2577..96198a92 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.common.utils.UserUtils; import com.kms.yg.df.domain.BsSgcDfManateam; import com.kms.yg.df.service.BsSgcDfManateamService; +import com.kms.yxgh.df.domain.DfCheckingV2ProjectManage; import com.kms.yxgh.df.service.DfCheckingV2Service; import com.kms.yxgh.dw.domain.DwCheckingV2ProjectItem; import com.kms.yxgh.dw.domain.DwCheckingV2ProjectManage; @@ -211,14 +212,11 @@ public class DwCheckingV2Service extends BaseService 0) { - int count = dwTaskV2Service.count(new LambdaQueryWrapper().in(DwTaskV2Manage::getCheckingId, getIntList(ids))); + int count = count(new LambdaQueryWrapper().in(DwCheckingV2ProjectManage::getId, getIntList(ids))); if (count > 0) { throw new RuntimeException("请先删除子项"); } - dwTaskV2Service.remove(new LambdaQueryWrapper() - .in(DwTaskV2Manage::getCheckingId, getIntList(ids))); - return remove(new LambdaQueryWrapper() - .in(DwCheckingV2ProjectManage::getId, getIntList(ids))); + return removeById(ids); } return Boolean.FALSE; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java index f823ff50..944e5a2a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java @@ -66,7 +66,7 @@ public class SzCheckingRecordV2Service extends BaseService() .eq(StringUtils.isNotBlank(record.getId()), SzCheckingProblemV2::getRecordId, record.getId()))); - SzTaskV2Manage manage = szTaskV2Service.getOne(new LambdaQueryWrapper().eq(SzTaskV2Manage::getCheckingId, record.getCheckingId())); + SzTaskV2Manage manage = szTaskV2Service.getOne(new LambdaQueryWrapper().eq(SzTaskV2Manage::getId, record.getTaskId())); if (!Objects.isNull(manage)) { dto.setResponsibleUnit(manage.getResponsibleUnit()); dto.setResponsibleUnitId(manage.getResponsibleUnitId()); diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java index b1e0af3c..8a8cf0c7 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java @@ -9,6 +9,7 @@ import com.kms.common.utils.UserUtils; import com.kms.yg.sz.domain.BsSgcSzManateam; import com.kms.yg.sz.service.BsSgcSzManateamService; import com.kms.yxgh.df.service.DfCheckingV2Service; +import com.kms.yxgh.dw.domain.DwCheckingV2ProjectManage; import com.kms.yxgh.sz.domain.SzCheckingV2ProjectItem; import com.kms.yxgh.sz.domain.SzCheckingV2ProjectManage; import com.kms.yxgh.sz.domain.SzTaskV2Manage; @@ -209,14 +210,11 @@ public class SzCheckingV2Service extends BaseService 0) { - int count = szTaskV2Service.count(new LambdaQueryWrapper().in(SzTaskV2Manage::getCheckingId, getIntList(ids))); + int count = count(new LambdaQueryWrapper().in(SzCheckingV2ProjectManage::getId, getIntList(ids))); if (count > 0) { throw new RuntimeException("请先删除子项"); } - szTaskV2Service.remove(new LambdaQueryWrapper() - .in(SzTaskV2Manage::getCheckingId, getIntList(ids))); - return remove(new LambdaQueryWrapper() - .in(SzCheckingV2ProjectManage::getId, getIntList(ids))); + return removeById(ids); } return Boolean.FALSE; }