m

youxiw2000
1 parent 48c41f3c
Showing 5 changed files with 42 additions and 9 deletions
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchAsk.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchAskServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderMatchAskMapper.xml
trash-ui/src/views/ask/ask/index.vue
trash-ui/src/views/ask/ask/orderDetail.vue
@@ -167,6 +167,10 @@ public class GarOrderMatchAsk implements Serializable {
     private int dropPointId;
  
  
+    /**
+     * 投放点 编号
+     */
+    private String dropPointNo;
  
  
     /**
@@ -229,8 +233,18 @@ public class GarOrderMatchAsk implements Serializable {
      */
     @TableField(exist = false)
     private Integer finishedTrips;
+    
+    
  
-    /**
+    public String getDropPointNo() {
+		return dropPointNo;
+	}
+
+	public void setDropPointNo(String dropPointNo) {
+		this.dropPointNo = dropPointNo;
+	}
+
+	/**
      * 待完成趟次数
      */
     @TableField(exist = false)
@@ -44,8 +44,13 @@ public class GarOrderMatchAskServiceImpl extends ServiceImpl&lt;GarOrderMatchAskMap
      */
     @Override
     public GarOrderMatchAsk selectGarOrderMatchAskById(String garId)
-    {
-        return garOrderMatchAskMapper.selectGarOrderMatchAskById(garId);
+    {	
+    	
+    	
+    	GarOrderMatchAsk ask = garOrderMatchAskMapper.selectGarOrderMatchAskById(garId);
+    	
+    	
+        return ask;
     }
  
     /**
@@ -18,6 +18,9 @@
             <result property="garCreateBy" column="gar_create_by" jdbcType="VARCHAR"/>
             <result property="garUpdateBy" column="gar_update_by" jdbcType="VARCHAR"/>
             <result property="garRemark" column="gar_remark" jdbcType="VARCHAR"/>
+            <result property="dropPointNo" column="drop_point_no" jdbcType="VARCHAR"/>
+            
+            
     </resultMap>
  
     <sql id="Base_Column_List">
@@ -111,7 +114,18 @@
     </select>
  
     <select id="selectGarOrderMatchAskById" parameterType="String" resultMap="GarOrderMatchAskResult">
-        <include refid="selectGarOrderMatchAskVo"/>
+        
+        select gar_id,gar_order_id,gar_order_handler_tel,
+        	gar_order_handler_name,gar_order_container_volume,
+        	gar_order_handler_id,gar_handler_car_code,gar_order_handler_company_id,
+        	gar_order_handler_company_name,gar_create_time,gar_update_time,gar_create_by,
+        	gar_update_by,gar_remark,gar_carrying_weight,drop_point_id,a.drop_point_name,
+        	gar_order_type,disposal_id,disposal_site_name,gar_order_number,gar_order_phone,
+        	gar_order_name,drop_custodian_phone,drop_address,drop_car_num,gar_car_code,a.create_time,
+        	a.create_by,a.update_time,a.update_by,gar_order_time,transport_distance,b.drop_point_no
+        	from gar_order_match_ask a
+        	left join drop_point_info b
+        	on a.drop_point_id = b.id
         where gar_id = #{garId}
     </select>
  
@@ -108,7 +108,7 @@
           <span>{{ parseTime(scope.row.garCreateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="下单人" align="center" prop="garOrderName" />
+      <el-table-column label="投放点名称" align="center" prop="dropPointName" />
       <el-table-column label="运输企业" align="center" prop="garOrderHandlerCompanyName" />
       <el-table-column label="运输驾驶员" align="center" prop="garOrderHandlerName" />
       <el-table-column label="车牌号" align="center" prop="garHandlerCarCode" />
@@ -174,13 +174,13 @@
           </tr>
           <tr>
             <td style="width:20%;">投放点编号</td>
-            <td style="width:30%;">{{ form.dropPointId || '-' }}</td>
+            <td style="width:30%;">{{ form.dropPointNo || '-' }}</td>
             <td style="width:20%;">运距</td>
             <td style="width:30%;">{{ form.transportDistance || '-' }}</td>
           </tr>
           <tr>
             <td style="width:20%;">投放点名称</td>
-            <td style="width:30%;">{{ form.garOrderName || '-' }}</td>
+            <td style="width:30%;">{{ form.dropPointName || '-' }}</td>
             <td style="width:20%;">订单时间</td>
             <td style="width:30%;">{{ form.garOrderTime || '-' }}</td>
           </tr>
@@ -19,13 +19,13 @@
         </tr>
         <tr>
           <td class="label">投放点编号</td>
-          <td>{{ form.dropPointId || '-' }}</td>
+          <td>{{ form.dropPointNo || '-' }}</td>
           <td class="label">运距</td>
           <td>{{ form.transportDistance || '-' }}</td>
         </tr>
         <tr>
           <td class="label">投放点名称</td>
-          <td>{{ form.garOrderName || '-' }}</td>
+          <td>{{ form.dropPointName || '-' }}</td>
           <td class="label">订单时间</td>
           <td>{{ form.garOrderTime || '-' }}</td>
         </tr>