From 4f8d0fe75e976551a86d7bbd33eb179a32ab476c Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 8 Apr 2026 10:12:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=98=E6=AC=BE=E5=8D=95?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/NuInvoicingCgdInfoController.java | 12 ++++++++++++ .../nu/modules/cgd/entity/NuInvoicingCgdInfo.java | 8 ++++++++ .../cgd/mapper/NuInvoicingCgdInfoMapper.java | 2 ++ .../cgd/mapper/xml/NuInvoicingCgdInfoMapper.xml | 15 ++++++++++++++- .../cgd/service/INuInvoicingCgdInfoService.java | 3 +++ .../impl/NuInvoicingCgdInfoServiceImpl.java | 5 +++++ 6 files changed, 44 insertions(+), 1 deletion(-) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdInfoController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdInfoController.java index e4e543e7..a9f150f7 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdInfoController.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdInfoController.java @@ -209,4 +209,16 @@ public class NuInvoicingCgdInfoController extends JeecgController> getFkdList(NuInvoicingCgdInfo nuInvoicingCgdInfo) { + List pageList = nuInvoicingCgdInfoService.getFkdList(nuInvoicingCgdInfo); + return Result.OK(pageList); + } + } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdInfo.java index 6a91a439..89a779fe 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdInfo.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdInfo.java @@ -225,6 +225,14 @@ public class NuInvoicingCgdInfo implements Serializable { private BigDecimal xiaoJi; @TableField(exist = false) private BigDecimal zongJinE; + @TableField(exist = false) + private String brandType; + @TableField(exist = false) + private String manufacturer; + @TableField(exist = false) + private String pkId; + @TableField(exist = false) + private String cgdNo; // // 格式化getter方法 // public BigDecimal getProcurementPrice() { diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdInfoMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdInfoMapper.java index bd81dd18..810d6705 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdInfoMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdInfoMapper.java @@ -26,4 +26,6 @@ public interface NuInvoicingCgdInfoMapper extends BaseMapper List totalPrice(@Param("dto") NuInvoicingCgdInfo nuInvoicingCgdInfo); IPage pageList(IPage page, @Param("dto") NuInvoicingCgdInfo nuInvoicingCgdInfo); + + List getFkdList(@Param("params") NuInvoicingCgdInfo nuInvoicingCgdInfo); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdInfoMapper.xml index 6f67f838..8a4f77dc 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdInfoMapper.xml @@ -39,9 +39,10 @@ + diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdInfoService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdInfoService.java index 9a8f5d17..f90895f8 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdInfoService.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdInfoService.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.nu.modules.cgd.entity.NuInvoicingCgdMain; import java.math.BigDecimal; +import java.util.List; /** * @Description: nu_invoicing_cgd_info @@ -21,4 +22,6 @@ public interface INuInvoicingCgdInfoService extends IService IPage pageList(Page page, NuInvoicingCgdInfo nuInvoicingCgdInfo); BigDecimal calcTotalPrice(NuInvoicingCgdInfo nuInvoicingCgdInfo); + + List getFkdList(NuInvoicingCgdInfo nuInvoicingCgdInfo); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdInfoServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdInfoServiceImpl.java index 6d7b2922..45e079fc 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdInfoServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdInfoServiceImpl.java @@ -71,4 +71,9 @@ public class NuInvoicingCgdInfoServiceImpl extends ServiceImpl getFkdList(NuInvoicingCgdInfo nuInvoicingCgdInfo) { + return baseMapper.getFkdList(nuInvoicingCgdInfo); + } }