接口修改

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiloutbound/CrudeOilOutboundAppMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoiloutbound.CrudeOilOutboundVo">
         SELECT
-        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,f.number as flowmeterNumber ,f.name as flowmeterName
+        c.*,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,f.number as flowmeterNumber ,f.name as flowmeterName
         FROM
         crude_oil_outbound c
         left join  tank_information t on t.sid =c.tankSid

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilpricerecord/CrudeOilPriceRecordAppMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoilpricerecord.CrudeOilPriceRecordVo">
         SELECT
-        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
+        c.*,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
         s.supplierName as supplierName
         FROM
         crude_oil_storage c

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorageVo">
         SELECT
-        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
+        c.*,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
         s.supplierName as supplierName
         FROM
         crude_oil_storage c

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoilinventoryrecord.CrudeOilInventoryRecordVo">
         SELECT
-        *,t.number as tankNumber
+        c.*,t.number as tankNumber
         FROM
         crude_oil_inventory_record c
         left join  tank_information t on t.sid =c.tankSid

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoiloutbound.CrudeOilOutboundVo">
         SELECT
-        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,f.number as flowmeterNumber ,f.name as flowmeterName
+        c.*,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,f.number as flowmeterNumber ,f.name as flowmeterName
         FROM
         crude_oil_outbound c
         left join  tank_information t on t.sid =c.tankSid

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilpricerecord/CrudeOilPriceRecordMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoilpricerecord.CrudeOilPriceRecordVo">
         SELECT
-        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
+        c.*,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
         s.supplierName as supplierName
         FROM
         crude_oil_storage c

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorageVo">
         SELECT
-        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
+        c.*,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
         s.supplierName as supplierName,d.orderNumber as contractNumber
         FROM
         crude_oil_storage c

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.materialinventory.MaterialInventoryVo">
         SELECT
-        *,t.name as typeName
+        r.*,t.name as typeName
         FROM
         material_inventory r
         left join material_type t on t.sid=r.typeSid

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventoryrecord/MaterialInventoryRecordMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.materialinventoryrecord.MaterialInventoryRecordVo">
         SELECT
-        *,i.name as name,i.inventory as inventory,t.name as typeName
+        r.*,i.name as name,i.inventory as inventory,t.name as typeName
         FROM
         material_inventory_record r
         left join material_inventory i on r.inventorySid =i.sid

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialoutbound/MaterialOutboundMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.materialoutbound.MaterialOutboundVo">
         SELECT
-        *,t.name as typeName,i.inventory as inventory
+        o.*,t.name as typeName,i.inventory as inventory
         FROM
         material_outbound o
         left join material_inventory i on i.sid=o.inventorySid

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialstorage/MaterialStorageMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.materialstorage.MaterialStorageVo">
         SELECT
-        *,t.name as typeName,i.inventory as inventory
+        s.*,t.name as typeName,i.inventory as inventory
         FROM
         material_storage s
         left join material_inventory i on i.sid=s.inventorySid

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.packaginginventory.PackagingInventoryVo">
         SELECT
-        *,t.name as typeName
+        r.*,t.name as typeName
         FROM
         packaging_inventory r
         left join packaging_type t on t.sid=r.typeSid

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.packaginginventoryrecord.PackagingInventoryRecordVo">
         SELECT
-        *,i.name as name,i.inventory as inventory,t.name as typeName
+        r.*,i.name as name,i.inventory as inventory,t.name as typeName
         FROM
         packaging_inventory_record r
         left join packaging_inventory i on r.inventorySid =i.sid

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.packagingoutbound.PackagingOutboundVo">
         SELECT
-        *,t.name as typeName,i.inventory as inventory
+        o.*,t.name as typeName,i.inventory as inventory
         FROM
         packaging_outbound o
         left join packaging_inventory i on i.sid=o.inventorySid

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.packagingstorage.PackagingStorageVo">
         SELECT
-        *,t.name as typeName,i.inventory as inventory,
+        s.*,t.name as typeName,i.inventory as inventory,
         u.sid as supplierSid, u.supplierName as supplierName
         FROM
         packaging_storage s