diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java index 63af3690..864c3ecd 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java @@ -6,19 +6,20 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Maps; -import com.nu.entity.*; +import com.nu.entity.InvoicingThdGwcEntity; +import com.nu.entity.InvoicingThdLogEntity; +import com.nu.entity.InvoicingThdMainEntity; +import com.nu.entity.NuKcslEntity; import com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo; import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialInfoMapper; import com.nu.modules.cgd.entity.NuWarehouseMaterialCrkInfo; import com.nu.modules.cgd.service.INuWarehouseMaterialCrkInfoService; -import com.nu.modules.invoicing.api.IInvoicingThOrdersApi; import com.nu.modules.invoicing.api.ITuiHuoApi; import com.nu.modules.nu.entity.NuInvoicingNuCrkLog; import com.nu.modules.nu.entity.NuInvoicingNuKcsl; import com.nu.modules.nu.mapper.NuInvoicingNuKcslMapper; import com.nu.modules.nu.service.INuInvoicingNuCrkLogService; import com.nu.modules.nu.service.INuInvoicingNuKcslService; -import com.nu.modules.qld.entity.NuInvoicingQldGwc; import com.nu.modules.thd.entity.NuInvoicingThdGwc; import com.nu.modules.thd.entity.NuInvoicingThdInfo; import com.nu.modules.thd.entity.NuInvoicingThdLog; @@ -31,7 +32,6 @@ import com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo; 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; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.vo.LoginUser; @@ -654,8 +654,8 @@ public class ThdServiceImpl implements ITuiHuoApi { qw.eq("nu_id", dto.getNuId()); qw.eq("elder_id", dto.getElderId()); qw.eq("status", status); - NuInvoicingThdMain qwMain = thdMainMapper.selectOne(qw); - if(qwMain!=null){ + List qwMain = thdMainMapper.selectList(qw); + if(CollectionUtils.isEmpty(qwMain)){ map.put("success", false); map.put("message", "退货单已存在"); }