diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersApply/controller/NuConfigSuppliersApplyController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersApply/controller/NuConfigSuppliersApplyController.java index 2e173365..f90359a3 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersApply/controller/NuConfigSuppliersApplyController.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersApply/controller/NuConfigSuppliersApplyController.java @@ -123,7 +123,7 @@ public class NuConfigSuppliersApplyController extends JeecgController { List getDirectiveList(@Param("directiveId") String directiveId); List getSubDirectiveList(@Param("packageId") String packageId); + + List queryOrderInfoList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderSubMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderSubMapper.xml index 1ccdd2ac..8dcf6e36 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderSubMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderSubMapper.xml @@ -58,4 +58,10 @@ and b.iz_enabled = 'Y' + + + \ No newline at end of file diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java index f1f36f2b..a452f9b0 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java @@ -108,7 +108,7 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(directiveOrderSub, req.getParameterMap()); - List list = directiveOrderSubMapper.selectList(queryWrapper); + List list = directiveOrderSubMapper.queryOrderInfoList(queryWrapper); List list1 = new ArrayList<>(); list1 = BeanUtil.copyToList(list, DirectiveOrderSubEntity.class); return list1;