调整-11-29-a

lichao
1 parent 06aa26f8
Showing 6 changed files with 24 additions and 226 deletions
trash-framework/src/main/java/com/trash/framework/config/SecurityConfig.java
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMatchAskMapper.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/orderDetail.vue
@@ -125,7 +125,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
 //                .antMatchers("/user/logout").anonymous()
                 .antMatchers("/system/post/all").anonymous()
                 .antMatchers("/system/user/all").anonymous()
-                .antMatchers("/order/queryByCarCode").anonymous()
+                .antMatchers("/order/queryByCarCode/**").anonymous()
 //                .antMatchers("/workflow/add").anonymous()//测试
 //                .antMatchers("/workflow/addtest").anonymous()//测试
                 // 除上面外的所有请求全部需要鉴权认证
@@ -327,9 +327,9 @@ public class GarbageOrderController {
     }
  
     @GetMapping("/queryByCarCode/{carCode}")
-    public Result<String> queryByCarCode(@PathVariable("carCode") String carCode) {
-                System.out.println("进入2");
-        return Result.OK(garOrderMatchHandlerService.queryOrderNo(carCode));
+    public Result<OrderDetailVo> queryByCarCode(@PathVariable("carCode") String carCode) {
+        String orderNo = garOrderMatchHandlerService.queryOrderNo(carCode);
+        return Result.OK(garOrderService.queryOrderWebDetail(orderNo));
     }
  
     @GetMapping("/evaluate/detail/{orderId}")
@@ -66,6 +66,8 @@ public interface GarOrderMatchAskMapper extends BaseMapper&lt;GarOrderMatchAsk&gt; {
  
     int queryGarOrderMatchAsks(String orderId);
  
+    List<GarOrderMatchAsk> selectGarOrderMatchAskByOrderId(String orderId);
+
     int queryErrType(String phone);
  
     GarOrderMatchAsk selectByGarOrderAskId(String garOrderId);
@@ -77,6 +79,7 @@ public interface GarOrderMatchAskMapper extends BaseMapper&lt;GarOrderMatchAsk&gt; {
     int addDriverSend(DriverSend driverSend);
     int updateDriverSendState(DriverSend driverSend);
     DriverSend queryDriverSend(String phoneNumber);
+
 }
  
  
@@ -31,9 +31,7 @@ public class GarOrderMatchAskServiceImpl extends ServiceImpl&lt;GarOrderMatchAskMap
  
     @Override
     public List<GarOrderMatchAsk> queryByOrderId(String orderId) {
-        LambdaQueryWrapper<GarOrderMatchAsk> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(GarOrderMatchAsk::getGarOrderId, orderId);
-        return list(wrapper);
+        return garOrderMatchAskMapper.selectGarOrderMatchAskByOrderId(orderId);
     }
  
     /**
@@ -113,6 +113,21 @@
         order by gar_create_time desc
     </select>
  
+    <select id="selectGarOrderMatchAskByOrderId" parameterType="String" resultMap="GarOrderMatchAskResult">
+        select a.gar_id,a.gar_order_id,a.gar_order_handler_tel,
+               a.gar_order_handler_name,a.gar_order_container_volume,
+               a.gar_order_handler_id,a.gar_handler_car_code,a.gar_order_handler_company_id,
+               a.gar_order_handler_company_name,a.gar_create_time,a.gar_update_time,a.gar_create_by,
+               a.gar_update_by,a.gar_remark,a.gar_carrying_weight,a.drop_point_id,a.drop_point_name,
+               a.gar_order_type,a.disposal_id,a.disposal_site_name,a.gar_order_number,a.gar_order_phone,
+               a.gar_order_name,a.drop_custodian_phone,a.drop_address,a.drop_car_num,a.gar_car_code,a.create_time,
+               a.create_by,a.update_time,a.update_by,a.gar_order_time,a.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 a.gar_order_id = #{gar_order_id}
+    </select>
+
     <select id="selectGarOrderMatchAskById" parameterType="String" resultMap="GarOrderMatchAskResult">
  
         select gar_id,gar_order_id,gar_order_handler_tel,
@@ -126,7 +141,7 @@
         	from gar_order_match_ask a
         	left join drop_point_info b
         	on a.drop_point_id = b.id
-        where gar_id = #{garId}
+        where gar_order_id = #{gar_order_id}
     </select>
  
     <insert id="insertGarOrderMatchAsk" parameterType="GarOrderMatchAsk">
-
-<template>
-  <div class="order-detail-container">
-    <div class="header">
-      <h1>装修垃圾收运处电子联单</h1>
-    </div>
-
-    <div class="order-info">
-      <div class="order-number">
-        <span>联单编号：<span class="highlight">{{ form.garOrderNumber }}</span></span>
-      </div>
-
-      <table class="detail-table">
-        <!-- 投放端信息 -->
-        <tr>
-          <td colspan="4" class="section-header">
-            投放端信息
-          </td>
-        </tr>
-        <tr>
-          <td class="label">投放点编号</td>
-          <td>{{ form.dropPointNo || '-' }}</td>
-          <td class="label">运距</td>
-          <td>{{ form.transportDistance || '-' }}</td>
-        </tr>
-        <tr>
-          <td class="label">投放点名称</td>
-          <td>{{ form.dropPointName || '-' }}</td>
-          <td class="label">订单时间</td>
-          <td>{{ form.garOrderTime || '-' }}</td>
-        </tr>
-        <tr>
-          <td class="label">联系电话</td>
-          <td>{{ form.garOrderPhone || '-' }}</td>
-          <td class="label">车次</td>
-          <td v-if="form.dropCarNum!==0">{{ form.dropCarNum }}/{{ dropCarNum }}</td>
-          <td v-else>-</td>
-        </tr>
-        <tr>
-          <td class="label">投放地址</td>
-          <td colspan="3">{{ form.dropAddress || '-' }}</td>
-        </tr>
-
-        <!-- 运输端信息 -->
-        <tr>
-          <td colspan="4" class="section-header">
-            运输端信息
-          </td>
-        </tr>
-        <tr>
-          <td class="label">运输单位</td>
-          <td>{{ form.garOrderHandlerCompanyName || '-' }}</td>
-          <td class="label">运输时间</td>
-          <td>{{ form.garCreateTime || '-' }}</td>
-        </tr>
-        <tr>
-          <td class="label">车牌号</td>
-          <td>{{ form.garCarCode || '-' }}</td>
-          <td class="label">驾驶员</td>
-          <td>{{ form.garOrderHandlerName || '-' }}</td>
-        </tr>
-
-        <!-- 处置端信息 -->
-        <tr>
-          <td colspan="4" class="section-header">
-            处置端信息
-          </td>
-        </tr>
-        <tr>
-          <td class="label">处置场名称</td>
-          <td>{{ form.disposalSiteName || '-' }}</td>
-          <td class="label">接收时间</td>
-          <td>{{ form.garUpdateTime || '-' }}</td>
-        </tr>
-        <tr>
-          <td class="label">接收车牌</td>
-          <td>{{ form.garHandlerCarCode || '-' }}</td>
-          <td class="label">载重(吨)</td>
-          <td>{{ form.garCarryingWeight || '-' }}</td>
-        </tr>
-
-        <!-- 备注 -->
-        <tr>
-          <td class="label">备注</td>
-          <td colspan="3">{{ form.garRemark || '-' }}</td>
-        </tr>
-      </table>
-    </div>
-
-    <div class="actions">
-      <el-button type="primary" @click="handlePrint">打印</el-button>
-      <el-button type="primary" @click="exportToPDF">导出PDF</el-button>
-    </div>
-  </div>
-</template>
-
-<script>import { getAsk } from "@/api/ask/ask";
-import html2pdf from 'html2pdf.js'
-
-export default {
-  name: "OrderDetail",
-  data() {
-    return {
-      // 表单参数
-      form: {},
-      dropCarNum: 0
-    };
-  },
-  created() {
-    const orderId = this.$route.params.orderId || this.$route.query.orderId;
-    if (orderId) {
-      this.getOrderDetail(orderId);
-    } else {
-      this.$message.error("缺少订单ID参数");
-    }
-  },
-  methods: {
-    /** 获取订单详情 */
-    getOrderDetail(orderId) {
-      getAsk(orderId).then(response => {
-        this.form = response.data;
-      }).catch(error => {
-        this.$message.error("获取订单详情失败: " + error.message);
-      });
-    },
-
-    /** 导出为PDF */
-    exportToPDF() {
-      const element = document.querySelector('.order-detail-container');
-
-      const opt = {
-        margin:       10,
-        filename:     `装修垃圾收运处电子联单_${this.form.garOrderNumber}.pdf`,
-        image:        { type: 'jpeg', quality: 0.98 },
-        html2canvas:  { scale: 2 },
-        jsPDF:        { unit: 'mm', format: 'a4', orientation: 'portrait' }
-      };
-
-      html2pdf().set(opt).from(element).save();
-    },
-
-    /** 打印 */
-    handlePrint() {
-      window.print();
-    }
-  }
-};
-</script>
-
-<style lang="scss" scoped>.order-detail-container {
-  max-width: 1000px;
-  margin: 0 auto;
-  padding: 20px;
-  background: #fff;
-
-  .header {
-    text-align: center;
-    margin-bottom: 20px;
-
-    h1 {
-      font-size: 24px;
-      color: #333;
-      margin: 0;
-    }
-  }
-
-  .order-info {
-    .order-number {
-      font-size: 18px;
-      margin-bottom: 20px;
-
-      .highlight {
-        color: red;
-        font-weight: bold;
-      }
-    }
-
-    .detail-table {
-      width: 100%;
-      border-collapse: collapse;
-      font-size: 14px;
-      text-align: left;
-      margin-bottom: 20px;
-
-      .section-header {
-        background: #f5f7fa;
-        font-weight: 600;
-        padding: 10px;
-      }
-
-      td {
-        border: 1px solid #333;
-        padding: 10px;
-
-        &.label {
-          background-color: #f9f9f9;
-          font-weight: 500;
-          width: 20%;
-        }
-      }
-    }
-  }
-
-  .actions {
-    text-align: center;
-
-    .el-button {
-      margin: 0 10px;
-    }
-  }
-}
-
-@media print {
-  .actions {
-    display: none;
-  }
-}
-</style>