OTHER_COMPANY_PROJECTS / gk_auto

Download as
Browse Code »

Commit e64fc187a2992242209b51646dc876ce9e2f6d81

Authored by xu
1 parent dabe0cf4
Exists in master

app-ht(v0.0.1 build 6) 

1. F 修复导出订单的服务，时效，星评等信息
Showing 4 changed files with 36 additions and 8 deletions   Show diff stats
app-ht/config/params.php
  Diff comments   View file @e64fc18
1 <?php 1 <?php
2 return [ 2 return [
3 - 'VERSION' => 'v0.0.1 build 5', 3 + 'VERSION' => 'v0.0.1 build 6',
4 ]; 4 ];
5 \ No newline at end of file 5 \ No newline at end of file
app-ht/modules/order/views/repair-order/exportDa.php
  Diff comments   View file @e64fc18
@@ -38,7 +38,9 @@ use domain\order\RepairOrderRate; @@ -38,7 +38,9 @@ use domain\order\RepairOrderRate;
38 <th style="width:90px">交车状态</th> 38 <th style="width:90px">交车状态</th>
39 <th style="width:120px">维修厂名</th> 39 <th style="width:120px">维修厂名</th>
40 <th style="width:90px">维修厂电话</th> 40 <th style="width:90px">维修厂电话</th>
41 - <th style="width:60px">顾客星评</th> 41 + <th style="width:60px">质量评价</th>
  42 + <th style="width:60px">时效评价</th>
  43 + <th style="width:60px">服务评价</th>
42 <th style="width:80px">顾客评论</th> 44 <th style="width:80px">顾客评论</th>
43 </tr> 45 </tr>
44 </thead> 46 </thead>
@@ -81,13 +83,29 @@ use domain\order\RepairOrderRate; @@ -81,13 +83,29 @@ use domain\order\RepairOrderRate;
81 <td><?= $order['maintainer']?></td> 83 <td><?= $order['maintainer']?></td>
82 <td><?= $order['maintainer_mobile']?></td> 84 <td><?= $order['maintainer_mobile']?></td>
83 <td><?php 85 <td><?php
84 - if ($order['star_count']) {  
85 - echo RepairOrderRate::starLabel($order['star_count']); 86 + if ($order['quality_star']) {
  87 + echo RepairOrderRate::starLabel($order['quality_star']);
86 } else { 88 } else {
87 echo "-"; 89 echo "-";
88 } 90 }
89 ?> 91 ?>
90 </td> 92 </td>
  93 + <td><?php
  94 + if ($order['effect_star']) {
  95 + echo RepairOrderRate::starLabel($order['effect_star']);
  96 + } else {
  97 + echo "-";
  98 + }
  99 + ?>
  100 + </td>
  101 + <td><?php
  102 + if ($order['service_star']) {
  103 + echo RepairOrderRate::starLabel($order['service_star']);
  104 + } else {
  105 + echo "-";
  106 + }
  107 + ?>
  108 + </td>
91 <td> 109 <td>
92 <?php 110 <?php
93 if ($order['comment']) { 111 if ($order['comment']) {
app-ht/modules/order/views/repair-order/index.php
  Diff comments   View file @e64fc18
@@ -104,10 +104,20 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -104,10 +104,20 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
104 <td><?= $order['maintainer']?></td> 104 <td><?= $order['maintainer']?></td>
105 <td><?= $order['maintainer_mobile']?></td> 105 <td><?= $order['maintainer_mobile']?></td>
106 <td><?php 106 <td><?php
107 - if ($order['star_count']) {  
108 - echo "综合：".RepairOrderRate::starLabel($order['star_count'])."<br>"; 107 + if ($order['quality_star']) {
  108 + echo "质量：".RepairOrderRate::starLabel($order['quality_star'])."<br>";
109 } else { 109 } else {
110 - echo "车主暂未评价"; 110 + echo "质量：无"."<br>";
  111 + }
  112 + if ($order['effect_star']) {
  113 + echo "时效：".RepairOrderRate::starLabel($order['effect_star'])."<br>";
  114 + } else {
  115 + echo "时效：无"."<br>";
  116 + }
  117 + if ($order['service_star']) {
  118 + echo "服务：".RepairOrderRate::starLabel($order['service_star'])."<br>";
  119 + } else {
  120 + echo "服务：无"."<br>";
111 } 121 }
112 if ($order['comment']) { 122 if ($order['comment']) {
113 echo '内容：'.$order['comment']; 123 echo '内容：'.$order['comment'];
domain/order/RepairOrderRepository.php
  Diff comments   View file @e64fc18
@@ -120,7 +120,7 @@ class RepairOrderRepository @@ -120,7 +120,7 @@ class RepairOrderRepository
120 $orderFind = RepairOrderModel::find(); 120 $orderFind = RepairOrderModel::find();
121 121
122 $orderFind->alias('ord'); 122 $orderFind->alias('ord');
123 - $orderFind->select(["ord.*", "u.mobile as maintainer_mobile", "u.name as maintainer", 'r.star_count', 'r.comment']); 123 + $orderFind->select(["ord.*", "u.mobile as maintainer_mobile", "u.name as maintainer", 'r.star_count','r.quality_star','r.effect_star','r.service_star', 'r.comment']);
124 $orderFind->leftJoin($uT. ' u', 'u.id = ord.user_id'); 124 $orderFind->leftJoin($uT. ' u', 'u.id = ord.user_id');
125 $orderFind->leftJoin($rateT.' r', "r.repair_order_id = ord.id"); 125 $orderFind->leftJoin($rateT.' r', "r.repair_order_id = ord.id");
126 $orderFind->where($map); 126 $orderFind->where($map);