diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java index 500f4313..03150269 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java @@ -105,6 +105,6 @@ public class CgdMainEntity implements Serializable { @ApiModelProperty(value = "审核时间") private Date wjTime; - + private String nuId; private String izNew; } 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 5efd0d70..c71fafe5 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 @@ -245,7 +245,8 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl mapList = new ArrayList<>(); // 创建一个临时Map来按suppliersId分组 Map> tempMap = new HashMap<>(); - String nuId = ""; + String nuId = infoEntityList.get(0).getNuId(); + for (QgdInfoEntity qgdInfoEntity : infoEntityList) { String suppliersId = qgdInfoEntity.getSuppliersId(); @@ -289,6 +290,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl cgdInfoList = new ArrayList<>(); BigDecimal totalPrice = new BigDecimal(0); String qgdId = ""; @@ -397,6 +399,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl-1){