diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index 46497e5f..cc82820d 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -1279,16 +1279,13 @@ public class BaseInvoiceController extends AbstractController { List uuidList = Arrays.asList(uuidArray); //查询库中是否包含对应数据 - QueryWrapper queryWrap = new QueryWrapper<>(); - queryWrap.in("uuid",uuidList); - DynamicContextHolder.push("business"+ DbConstant.BUSINESS_READ); - List list = baseIRzTDxRecordInvoiceService.list(queryWrap); + List list = baseIRzTDxRecordInvoiceService.findSuspendStatus(uuidList); if (list == null || list.isEmpty()){ return ResponseEntity.ok(R.error("没有可操作的数据")); } - List suspendTypes = list.stream().map(BaseTDxRecordInvoice::getSuspendStatus).collect(Collectors.toList()); - if (suspendTypes.contains("1")&& (suspendTypes.contains("0")||suspendTypes.contains(null) || suspendTypes.contains(""))){ + + if (list.contains("1")&& (list.contains("0")||list.contains(null) || list.contains(""))){ return ResponseEntity.ok(R.error("同时存在暂挂状态为是和否的数据,请重新选择!")); } diff --git a/dxhy-base/src/main/java/com/dxhy/base/dao/BaseTDxRecordInvoiceDao.java b/dxhy-base/src/main/java/com/dxhy/base/dao/BaseTDxRecordInvoiceDao.java index d09f3e73..3d808fa7 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/dao/BaseTDxRecordInvoiceDao.java +++ b/dxhy-base/src/main/java/com/dxhy/base/dao/BaseTDxRecordInvoiceDao.java @@ -216,4 +216,6 @@ public interface BaseTDxRecordInvoiceDao extends BaseMapper selectInTellingCheck(Map pramsMap); void updateSuspendType(Map pramsMap); + + List findSuspendStatus(List uuids); } diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseIRzTDxRecordInvoiceService.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseIRzTDxRecordInvoiceService.java index 92599be8..1a9a06a4 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseIRzTDxRecordInvoiceService.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseIRzTDxRecordInvoiceService.java @@ -71,4 +71,6 @@ public interface BaseIRzTDxRecordInvoiceService extends MpBaseService pramsMap); String updateSuspendType(Map pramsMap); + + List findSuspendStatus(List uuidList); } diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java index 70da7d43..ad633f7f 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java @@ -441,6 +441,11 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl findSuspendStatus(List uuidList) { + return super.baseMapper.findSuspendStatus(uuidList); + } + @Override public String identifiByAll(Map pramsMap) { diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index e60bee2e..7d7f452f 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -1422,4 +1422,12 @@ #{uuid} + +