fix:bug

shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java

@@ -66,7 +66,7 @@ public class DfCheckingRecordV2Service extends BaseService<DfCheckingRecordV2Map
                     dto.setProblemCount(dfCheckingProblemV2Service
                             .count(new LambdaQueryWrapper<DfCheckingProblemV2>()
                                     .eq(StringUtils.isNotBlank(record.getId()), DfCheckingProblemV2::getRecordId, record.getId())));
-                    DfTaskV2Manage manage = dfTaskV2Service.getOne(new LambdaQueryWrapper<DfTaskV2Manage>().eq(DfTaskV2Manage::getCheckingId, record.getCheckingId()));
+                    DfTaskV2Manage manage = dfTaskV2Service.getOne(new LambdaQueryWrapper<DfTaskV2Manage>().eq(DfTaskV2Manage::getId, record.getTaskId()));
                     if (!Objects.isNull(manage)) {
                         dto.setResponsibleUnit(manage.getResponsibleUnit());
                         dto.setResponsibleUnitId(manage.getResponsibleUnitId());

shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java

@@ -49,10 +49,6 @@ public class DfCheckingV2Service extends BaseService<DfCheckingV2Mapper, DfCheck
 
     private final BsSgcDfManateamService bsSgcDfManateamService;
 
-    private final DfTaskV2Service dfTaskV2Service;
-
-    private final DfCheckingRecordV2Mapper dfCheckingRecordV2Mapper;
-
 
     public IPage<DfV2CheckingDto> list(SearchParam<DfV2CheckingSearchDto> sp) {
         // 分页参数
@@ -199,14 +195,11 @@ public class DfCheckingV2Service extends BaseService<DfCheckingV2Mapper, DfCheck
     @Transactional(rollbackFor = Exception.class)
     public boolean myRemove(String[] ids) {
         if (null != ids && ids.length > 0) {
-            int count = dfTaskV2Service.count(new LambdaQueryWrapper<DfTaskV2Manage>().in(DfTaskV2Manage::getCheckingId, getIntList(ids)));
+            int count = count(new LambdaQueryWrapper<DfCheckingV2ProjectManage>().in(DfCheckingV2ProjectManage::getId, getIntList(ids)));
             if (count > 0) {
                 throw new RuntimeException("请先删除子项");
             }
-            dfTaskV2Service.remove(new LambdaQueryWrapper<DfTaskV2Manage>()
-                    .in(DfTaskV2Manage::getCheckingId, getIntList(ids)));
-            return remove(new LambdaQueryWrapper<DfCheckingV2ProjectManage>()
-                    .in(DfCheckingV2ProjectManage::getId, getIntList(ids)));
+            return removeById(ids);
         }
         return Boolean.FALSE;
     }

shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java

@@ -70,7 +70,7 @@ public class DwCheckingRecordV2Service extends BaseService<DwCheckingRecordV2Map
                     dto.setProblemCount(dwCheckingProblemV2Service
                             .count(new LambdaQueryWrapper<DwCheckingProblemV2>()
                                     .eq(StringUtils.isNotBlank(record.getId()), DwCheckingProblemV2::getRecordId, record.getId())));
-                    DwTaskV2Manage manage = dwTaskV2Service.getOne(new LambdaQueryWrapper<DwTaskV2Manage>().eq(DwTaskV2Manage::getCheckingId, record.getCheckingId()));
+                    DwTaskV2Manage manage = dwTaskV2Service.getOne(new LambdaQueryWrapper<DwTaskV2Manage>().eq(DwTaskV2Manage::getId, record.getTaskId()));
                     if (!Objects.isNull(manage)) {
                         dto.setResponsibleUnit(manage.getResponsibleUnit());
                         dto.setResponsibleUnitId(manage.getResponsibleUnitId());

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<DwCheckingV2Mapper, DwCheck
     @Transactional(rollbackFor = Exception.class)
     public boolean myRemove(String[] ids) {
         if (null != ids && ids.length > 0) {
-            int count = dwTaskV2Service.count(new LambdaQueryWrapper<DwTaskV2Manage>().in(DwTaskV2Manage::getCheckingId, getIntList(ids)));
+            int count = count(new LambdaQueryWrapper<DwCheckingV2ProjectManage>().in(DwCheckingV2ProjectManage::getId, getIntList(ids)));
             if (count > 0) {
                 throw new RuntimeException("请先删除子项");
             }
-            dwTaskV2Service.remove(new LambdaQueryWrapper<DwTaskV2Manage>()
-                    .in(DwTaskV2Manage::getCheckingId, getIntList(ids)));
-            return remove(new LambdaQueryWrapper<DwCheckingV2ProjectManage>()
-                    .in(DwCheckingV2ProjectManage::getId, getIntList(ids)));
+            return removeById(ids);
         }
         return Boolean.FALSE;
     }

shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java

@@ -66,7 +66,7 @@ public class SzCheckingRecordV2Service extends BaseService<SzCheckingRecordV2Map
                             .count(new LambdaQueryWrapper<SzCheckingProblemV2>()
                                     .eq(StringUtils.isNotBlank(record.getId()), SzCheckingProblemV2::getRecordId, record.getId())));
 
-                    SzTaskV2Manage manage = szTaskV2Service.getOne(new LambdaQueryWrapper<SzTaskV2Manage>().eq(SzTaskV2Manage::getCheckingId, record.getCheckingId()));
+                    SzTaskV2Manage manage = szTaskV2Service.getOne(new LambdaQueryWrapper<SzTaskV2Manage>().eq(SzTaskV2Manage::getId, record.getTaskId()));
                     if (!Objects.isNull(manage)) {
                         dto.setResponsibleUnit(manage.getResponsibleUnit());
                         dto.setResponsibleUnitId(manage.getResponsibleUnitId());

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<SzCheckingV2Mapper, SzCheck
     @Transactional(rollbackFor = Exception.class)
     public boolean myRemove(String[] ids) {
         if (null != ids && ids.length > 0) {
-            int count = szTaskV2Service.count(new LambdaQueryWrapper<SzTaskV2Manage>().in(SzTaskV2Manage::getCheckingId, getIntList(ids)));
+            int count = count(new LambdaQueryWrapper<SzCheckingV2ProjectManage>().in(SzCheckingV2ProjectManage::getId, getIntList(ids)));
             if (count > 0) {
                 throw new RuntimeException("请先删除子项");
             }
-            szTaskV2Service.remove(new LambdaQueryWrapper<SzTaskV2Manage>()
-                    .in(SzTaskV2Manage::getCheckingId, getIntList(ids)));
-            return remove(new LambdaQueryWrapper<SzCheckingV2ProjectManage>()
-                    .in(SzCheckingV2ProjectManage::getId, getIntList(ids)));
+            return removeById(ids);
         }
         return Boolean.FALSE;
     }