diff --git a/nursing-unit-common/src/main/java/com/nu/entity/QgdInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/QgdInfoEntity.java index 7b2be5ae..1cca98b4 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/QgdInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/QgdInfoEntity.java @@ -93,32 +93,25 @@ public class QgdInfoEntity implements Serializable { private String suppliers; - @TableField(exist = false) private String unitPrice; - @TableField(exist = false) private String materialUnits; - @TableField(exist = false) private String oneUnit; - @TableField(exist = false) private String oneUnitProportion; - @TableField(exist = false) private String oneUnitPrice; - @TableField(exist = false) private String twoUnit; - @TableField(exist = false) private String twoUnitProportion; - @TableField(exist = false) private String twoUnitPrice; - @TableField(exist = false) private String multiUnitType; + private String threeUnitProportion; + private String threeUnitPrice; } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdInfo.java index 32e8e979..626c9fb4 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdInfo.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdInfo.java @@ -159,5 +159,10 @@ public class QgdInfo implements Serializable { @TableField(exist = false) private String suppliers; + @TableField(exist = false) + private String threeUnitProportion; + @TableField(exist = false) + private String threeUnitPrice; + } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/xml/QgdInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/xml/QgdInfoMapper.xml index 305834e5..49b021e0 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/xml/QgdInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/xml/QgdInfoMapper.xml @@ -31,6 +31,8 @@ c.two_unit, c.two_unit_proportion, c.two_unit_price, + c.multi_unit_switch as three_unit_proportion, + c.reference_unit_price as three_unit_price, c.multi_unit_type, c.suppliers FROM nu_invoicing_qgd_info a