From e4a6eded81c65cdb34cd40c8f6c1999fd09ea82a Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Mon, 15 Dec 2025 10:42:33 +0800 Subject: [PATCH] =?UTF-8?q?pad=E6=8E=A5=E5=8F=A3-=E9=80=80=E8=B4=A7-?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=89=A9=E6=96=99=E4=B8=80=E4=BA=8C=E7=BA=A7=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nu/modules/nu/mapper/xml/NuInvoicingNuKcslMapper.xml | 6 +++++- .../nu/modules/qld/service/impl/QingLingServiceImpl.java | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/xml/NuInvoicingNuKcslMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/xml/NuInvoicingNuKcslMapper.xml index f65a179f..3d8204b8 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/xml/NuInvoicingNuKcslMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/xml/NuInvoicingNuKcslMapper.xml @@ -41,9 +41,13 @@ material.iz_ybbx AS "materialInfo.izYbbx", material.iz_jgyh AS "materialInfo.izJgyh", if(gwc.wl_id is null, '0', '1') as isAdd, - gwc.th_num AS thNum + gwc.th_num AS thNum, + maca.category_name as "materialInfo.categoryName", + maty.type_name as "materialInfo.typeName" from nu_invoicing_nu_kcsl nukcsl LEFT JOIN nu_config_material_info material ON nukcsl.wl_id = material.id + LEFT JOIN nu_config_material_category maca ON material.category_id = maca.id + LEFT JOIN nu_config_material_type maty ON material.type_id = maty.id LEFT JOIN nu_invoicing_thd_gwc gwc ON nukcsl.wl_id = gwc.wl_id and pk_id = #{id} nukcsl.wl_num is not null diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java index ab11d43f..e0cca249 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java @@ -34,6 +34,7 @@ import com.nu.modules.qld.service.INuInvoicingQldWlzdService; import com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo; import com.nu.modules.warehouseMaterialInfo.mapper.BlWarehouseMaterialInfoMapper; import com.nu.modules.warehouseMaterialInfo.service.IBlWarehouseMaterialInfoService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; @@ -59,6 +60,7 @@ import java.util.stream.Collectors; * @Version: V1.0 */ @Service +@Slf4j public class QingLingServiceImpl implements IQinglingApi { @Autowired