Parcourir la source

轮换计划上报字段

ZeroLiYi il y a 1 an
Parent
commit
502459e118

+ 4 - 2
src/main/java/com/chinaitop/depot/rp/mapper/BusinessRpOutboundMapper.xml

@@ -50,6 +50,8 @@
50 50
         <result column="grainGradeName" property="grainGradeName" />
51 51
         <result column="warehouseName" property="warehouseName" />
52 52
         <result column="remarks" property="remarks" jdbcType="LONGVARCHAR" />
53
+        <result column="orgName" property="orgName" />
54
+
53 55
 
54 56
     </resultMap>
55 57
     <resultMap id="ResultMapWithBLOBs" type="com.chinaitop.depot.rp.model.BusinessRpOutbound" extends="BaseResultMap" >
@@ -623,8 +625,8 @@
623 625
     d.inspection_report_id,
624 626
     d.regular_inspection_report_ids,
625 627
     d.plan_quantity,
626
-        o.org_name orgName,
627
-    st.storehouse_name as "storehouseName",
628
+    o.org_name as "orgName",
629
+    st.storehouse_name as "basicStorehouseName",
628 630
     wa.warehouse_name  as "warehouseName",
629 631
     pz.enumname as "grainVarietyName",
630 632
     xz.enumname as "grainNatureName",

+ 2 - 0
src/main/java/com/chinaitop/depot/rp/model/BusinessRpOutbound.java

@@ -105,4 +105,6 @@ public class BusinessRpOutbound implements Serializable {
105 105
 
106 106
     @ApiModelProperty(value = "粮食等级;basic_enum的id;粮食等级名称")
107 107
     private String grainGradeName;
108
+
109
+    private String orgName;
108 110
 }