diff --git a/app-ht/config/params.php b/app-ht/config/params.php index 2827848..6dbc89f 100644 --- a/app-ht/config/params.php +++ b/app-ht/config/params.php @@ -1,4 +1,4 @@ 'v0.0.1 build 5', + 'VERSION' => 'v0.0.1 build 6', ]; \ No newline at end of file diff --git a/app-ht/modules/order/views/repair-order/exportDa.php b/app-ht/modules/order/views/repair-order/exportDa.php index 74efd0a..cfe4ef6 100644 --- a/app-ht/modules/order/views/repair-order/exportDa.php +++ b/app-ht/modules/order/views/repair-order/exportDa.php @@ -38,7 +38,9 @@ use domain\order\RepairOrderRate; 交车状态 维修厂名 维修厂电话 - 顾客星评 + 质量评价 + 时效评价 + 服务评价 顾客评论 @@ -81,13 +83,29 @@ use domain\order\RepairOrderRate; + + + + params['breadcrumbs'][] = $this->title; "; + if ($order['quality_star']) { + echo "质量:".RepairOrderRate::starLabel($order['quality_star'])."
"; } else { - echo "车主暂未评价"; + echo "质量:无"."
"; + } + if ($order['effect_star']) { + echo "时效:".RepairOrderRate::starLabel($order['effect_star'])."
"; + } else { + echo "时效:无"."
"; + } + if ($order['service_star']) { + echo "服务:".RepairOrderRate::starLabel($order['service_star'])."
"; + } else { + echo "服务:无"."
"; } if ($order['comment']) { echo '内容:'.$order['comment']; diff --git a/domain/order/RepairOrderRepository.php b/domain/order/RepairOrderRepository.php index 587e5e1..84c6d45 100644 --- a/domain/order/RepairOrderRepository.php +++ b/domain/order/RepairOrderRepository.php @@ -120,7 +120,7 @@ class RepairOrderRepository $orderFind = RepairOrderModel::find(); $orderFind->alias('ord'); - $orderFind->select(["ord.*", "u.mobile as maintainer_mobile", "u.name as maintainer", 'r.star_count', 'r.comment']); + $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']); $orderFind->leftJoin($uT. ' u', 'u.id = ord.user_id'); $orderFind->leftJoin($rateT.' r', "r.repair_order_id = ord.id"); $orderFind->where($map); -- libgit2 0.21.0