1

application/index/controller/CostDetail.php

@@ -80,7 +80,7 @@ class CostDetail extends Basic
         $conditions=$this->buildConditions($params);
 
         $field = 'a.id,a.cost_id,b.setting_date,a.create_time,b.operator_name,
-                  a.type,a.fee_item,a.purpose,a.store_id,a.assume_fee';
+                  a.type,a.fee_item,a.purpose,a.store_id,a.assume_fee,a.apply_for_id';
 
         $list = $this->storeCostExt->getStoreCostExtExcel($field, $conditions);
         if(!$list)
@@ -89,7 +89,7 @@ class CostDetail extends Basic
         $excel_data = [];
         foreach ($list as $k => $v) {
             $excel_data_['id'] = $v['id'];
-            $excel_data_['cost_id'] = $v['cost_id'];
+            $excel_data_['apply_for_id'] = $v['apply_for_id'];
             $excel_data_['setting_date'] = $v['setting_date'];
             $excel_data_['create_time'] = $v['create_time'];
             $excel_data_['operator_name'] = $v['operator_name'];

application/index/controller/CostParameter.php

@@ -66,7 +66,9 @@ class CostParameter extends Basic
         if (!empty($params['store_id'])) {
             $conditions["a.id"] = $params["store_id"];
         }
+        $conditions["c.setting_date"] = $params['setting_date'];
 
+        big_log($conditions);
         $field = 'a.id,a.store_name,b.office_name,d.name,d.phone,c.is_discounts,
         c.transfer_charge,c.social_security_fee,c.attendance_num,c.official_receipts,
         c.last_official_receipts,c.deduct';

application/model/AStore.php

@@ -388,7 +388,6 @@ class AStore extends BaseModel
             ->where($params)
             ->limit($pageSize)
             ->page($pageNo)
-            ->group('c.store_id')
             ->select();
         return $result;
     }
@@ -402,7 +401,6 @@ class AStore extends BaseModel
             ->join('f_office b', 'a.office_id = b.id', 'left')
             ->join('f_store_data c', 'a.id = c.store_id', 'left')
             ->where($params)
-            ->group('c.store_id')
             ->count();
         return $result;
     }