1

application/index/controller/Amercement.php

@@ -91,4 +91,23 @@ class Amercement extends Basic
 
     }
 
+    public function getAmercementInfo(){
+        $params = $this->params;
+
+        // $params = array(
+        //     "id" => 1,
+        // );
+        $checkResult = $this->validate($params, "AmercementValidate.getAmercementInfo");
+        if (true !== $checkResult) {
+            return $this->response("101", $checkResult);
+        }
+        $result = $this->s_amercement->getAmercementInfo($params['id']);//int(1)
+        if ($result) {
+            return $this->response("200", "成功",$result);
+        } else {
+            return $this->response("101", "失败");
+        }
+
+    }
+
 }
\ No newline at end of file

application/index/service/AmercementService.php

@@ -239,6 +239,34 @@ class AmercementService
         return $img_data ? $img_data : null;
     }
 
+    public function getAmercementInfo($id)
+    {
+        $conditions =[];
+        $conditions["id"] = $id;
+
+        $field = "id,status,type,money,submit_agent_id,agent_id,remarks,create_time";
+        $result = $this->m_amercement->getAmercementInfo($conditions, $field);
+        $redis_cache = new RedisCacheService();
+        $result['type_name'] = $this->getTypeName($result['type']);
+        $agent_data = $redis_cache->getRedisCache(2, $result['submit_agent_id']);
+        $result['submit_agent_name']     = $agent_data['name'];
+        $result['submit_agent_phone']    = $agent_data['phone'];
+
+        if($result['status'] == 0){//待支付
+            $forfeit_penalty = 100;
+            $result['forfeit_penalty'] = $forfeit_penalty;//滞纳金
+            $result['money_sum'] = $forfeit_penalty + $result['money'];//罚款总金额
+        }elseif($result['status'] == 1){//已支付
+            $forfeit_penalty = 100;
+            $result['forfeit_penalty'] = $forfeit_penalty;
+            $result['money_sum'] = $forfeit_penalty + $result['money'];
+            $result['pay_time'] = '';
+        }
+        $result['img'] = $this->getAmercementImage($result['id']);
+
+        return $result;
+    }
+
 
     /**
      * 后台罚款账单表
@@ -268,6 +296,13 @@ class AmercementService
     }
 
 
+    /**
+     * 后台罚款账单表 导出excel
+     * @param $params
+     * @param $page_no
+     * @param $page_size
+     * @return string
+     */
     public function getAmercementListExcel($params,$page_no, $page_size)
     {
         $conditions=$this->buildConditions($params);
@@ -284,6 +319,7 @@ class AmercementService
             $result[$key]['agent_name']     = $agent_data['name'];
         }
         $export = new ExportExcelUntil();
+        $e_data_new = [];
         foreach ($result as $key => $v) {
             $e_data_old['1'] = $v['id'];
             $e_data_old['2'] = $v['type_name'];

application/index/validate/AmercementValidate.php

@@ -10,13 +10,14 @@ class AmercementValidate extends Validate {
 
 
     protected $rule = [
-        'type'     => 'require|number|in:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17',
-        'money'    => 'require|number|gt:0',
-        'agent_id' => 'require|number|gt:0',
-        'remarks'  => 'require',
-        'img'      => 'require',
-        'status'     => 'require|number|in:0,1,2',
-        'amercement_type'     => 'require|number|in:0,1',
+        'type'            => 'require|number|in:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17',
+        'money'           => 'require|number|gt:0',
+        'agent_id'        => 'require|number|gt:0',
+        'remarks'         => 'require',
+        'img'             => 'require',
+        'status'          => 'require|number|in:0,1,2',
+        'amercement_type' => 'require|number|in:0,1',
+        'id'              => 'require|number|gt:0',
     ];
 
 
@@ -45,10 +46,15 @@ class AmercementValidate extends Validate {
         'amercement_type.number'  => 'amercement_type只能为数字',
         'amercement_type.in'      => 'amercement_type范围错误',
 
+        'id.require' => 'id为必填字段',
+        'id.number'  => 'id只能为数字',
+        'id.gt'      => 'id必须大于0',
+
     ];
 
     protected $scene = [
-        'addAmercement'              => [ 'type', 'money', 'agent_id', 'remarks', 'img' ],
+        'addAmercement'     => [ 'type', 'money', 'agent_id', 'remarks', 'img' ],
+        'getAmercementInfo' => [ 'id' ],
     ];
 
 }
\ No newline at end of file

application/model/OAmercementModel.php

@@ -25,6 +25,16 @@ class OAmercementModel extends Model
         return $this->db_->insertGetId($data);
     }
 
+    public function getAmercementInfo($params, $field)
+    {
+        $result = $this->db_
+            ->field($field)
+            ->where($params)
+            ->order('id desc')
+            ->find();
+        return $result;
+    }
+
     public function getAmercementList($params, $field, $page_no, $page_size)
     {
         $result = $this->db_

application/route.php

@@ -587,6 +587,8 @@ Route::group('index', [
 
     'addAmercement' => ['index/Amercement/addAmercement', ['method' => 'GET|POST']],
     'getAmercementListPc' => ['index/Amercement/getAmercementListPc', ['method' => 'GET|POST']],
+    'getAmercementListExcel' => ['index/Amercement/getAmercementListExcel', ['method' => 'GET|POST']],
+    'getAmercementInfo' => ['index/Amercement/getAmercementInfo', ['method' => 'GET|POST']],
 
 ]);