From 4363a64b1589d1426eb2648680471ee141453571 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 25 Nov 2025 13:34:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E8=AF=B7?= =?UTF-8?q?=E8=B4=AD=E7=89=A9=E6=96=99=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/NuInvoicingCgdMainServiceImpl.java | 30 ++++++++++++++++++- .../xml/BlWarehouseMaterialInfoMapper.xml | 4 +-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java index ad85d7a5..3be31897 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java @@ -29,6 +29,7 @@ import com.nu.modules.qgd.mapper.QgdInfoMapper; import com.nu.modules.sysconfig.ISysConfigApi; import com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo; import com.nu.modules.warehouseMaterialInfo.mapper.BlWarehouseMaterialInfoMapper; +import com.nu.utils.DictUtils; import io.swagger.models.auth.In; import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; @@ -99,6 +100,8 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl map = new HashMap<>(); + map.put("id",cgdMain.getId()); + map.put("cgdNo",cgdMain.getCgdNo()); + map.put("status",cgdMain.getStatus()); + map.put("cgdType",cgdMain.getCgdType()); + map.put("qgBy",cgdMain.getQgBy()); + map.put("qgDate",DateUtils.formatDate(cgdMain.getQgDate(),"yyyy-MM-dd")); + map.put("jhBy",cgdMain.getJhBy()); + if(cgdMain.getJhTime()!=null){ + map.put("jhTime",DateUtils.formatDate(cgdMain.getJhTime(),"yyyy-MM-dd HH:mm:ss")); + }else{ + map.put("jhTime",null); + } + map.put("wjBy",cgdMain.getWjBy()); + if(cgdMain.getWjTime()!=null){ + map.put("wjTime",DateUtils.formatDate(cgdMain.getWjTime(),"yyyy-MM-dd HH:mm:ss")); + }else{ + map.put("wjTime",null); + } + map.put("gysName",cgdMain.getGysName()); + map.put("gysId_dictText",cgdMain.getGysName()); + map.put("totalPrice",cgdMain.getTotalPrice().toString()); + map.put("status_dictText", dictUtils.translateDictValue("cgd_status",cgdMain.getStatus())); + map.put("cgdType_dictText", dictUtils.translateDictValue("cgd_type",cgdMain.getCgdType())); + map.put("izNew", cgdMain.getIzNew()); + result.put("cgdInfo",map); return result; } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml index ba8d4399..fe74fe2d 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml @@ -30,10 +30,10 @@ b.reference_unit_price, b.material_img, c.item_text as tagName, - if(d.id is null, '0', '1') as isAdd + if(d.wl_id is null, '0', '1') as isAdd from nu_warehouse_material_info a left join nu_config_material_info b on a.wl_id = b.id - left join nu_invoicing_qgd_info d on a.wl_id = d.wl_id + left join (select nu_id,wl_id from nu_invoicing_qgd_info GROUP BY nu_id,wl_id) d on a.wl_id = d.wl_id left join sys_dict_item c on b.tag_type = c.item_value and c.dict_id = '1978662656563613698' ) a ${ew.customSqlSegment}