提交 a56d331c authored 作者: chengye's avatar chengye

抄表单详情添加电表倍率,以及计算用电量

上级 bcf06b73
...@@ -222,7 +222,7 @@ class Useage extends Base ...@@ -222,7 +222,7 @@ class Useage extends Base
$useage = (new \app\em\model\Useage)->alias('u') $useage = (new \app\em\model\Useage)->alias('u')
->field('u.*') ->field('u.*')
->field('emr.pricing_type,em.rate') ->field('emr.pricing_type')
->leftJoin(['em'],'em.id=u.em_id') ->leftJoin(['em'],'em.id=u.em_id')
->leftJoin(['em_rule'=>'emr'],'emr.em_id=em.id') ->leftJoin(['em_rule'=>'emr'],'emr.em_id=em.id')
->where('u.useage_id','=',$uid) ->where('u.useage_id','=',$uid)
......
...@@ -112,7 +112,7 @@ class Em extends Base ...@@ -112,7 +112,7 @@ class Em extends Base
//获取电表信息与station信息 //获取电表信息与station信息
public function getBaseInfo($em_id){ public function getBaseInfo($em_id){
$data = self::field('em.id,em.em_numb,em.em_type_id') $data = self::field('em.id,em.em_numb,em.em_type_id,em.rate')
->field('s.station_sp_code,s.station_name') ->field('s.station_sp_code,s.station_name')
->field('et.name as typeName') ->field('et.name as typeName')
->leftJoin(['station_info'=>'s'],'s.station_id=em.station_id') ->leftJoin(['station_info'=>'s'],'s.station_id=em.station_id')
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论