核对记录

application/index/controller/Cost.php

@@ -300,26 +300,16 @@ class Cost extends Basic
 
             $m_setting = new FSettingLog();
             $setting_data = $m_setting->findByAll('type,operator_name', ['setting_date'=>$data['count_time']]);
-            //审核类型， 1考勤审核  2社保审核  3手续费审核  4办公室房租+当月办公门店审核 5费用参数审核
-            $string = '';
-            foreach($setting_data as $k=>$v) {
-                switch($v['type']) {
-                    case 1 :
-                        $string = '考勤核对人：';break;
-                    case 2 :
-                        $string = '社保核对人：';break;
-                    case 3 :
-                        $string = '手续费核对人';break;
-                    case 4 :
-                        $string = '办公室房租+当月办公门店核对人';break;
-                    case 5 :
-                        $string = '费用参数核对人';break;
-                }
-
-                $string_array[] = $string.$v['operator_name'];
+            $type_name = ['考勤核对人', '社保核对人','手续费核对人','办公室房租+当月办公门店核对人','费用参数核对人'];
+            foreach ($setting_data as $k => $v) {
+                $list[$v['type']][] = [
+                    'operator_name'=>$v['operator_name'],
+                    'type'=>$v['type'],
+                    'type_name'=>$type_name[$v['type']]
+                ];
             }
-            if (isset($string_array)) {
-                $data['setting_log'] = $string_array;
+            if (isset($list)) {
+                $data['setting_log'] = $list;
             }
         }
 

application/index/controller/CostParameter.php

@@ -449,6 +449,35 @@ class CostParameter extends Basic
         return $this->response($code, $msg);
     }
 
+    /**
+     * 核对记录
+     * @return \think\Response
+     */
+    public function getCostParameter()
+    {
+        $code = 101;
+        if (empty($this->params['setting_date'])) {
+            return $this->response($code, '参数错误');
+        }
+        $list = [];
+        $setting_date = date('Y-m-d', strtotime($this->params['setting_date']));
+        $m_log = new FSettingLog();
+
+        $where['setting_date'] = $setting_date;
+        $where['is_del'] = 0;
+        $setting_data = $m_log->findByAll('type,operator_name', $where);
+
+        $type_name = ['考勤核对人', '社保核对人','手续费核对人','办公室房租+当月办公门店核对人','费用参数核对人'];
+        foreach ($setting_data as $k => $v) {
+            $list[$v['type']][] = [
+                'operator_name'=>$v['operator_name'],
+                'type'=>$v['type'],
+                'type_name'=>$type_name[$v['type']]
+            ];
+        }
+        return $this->response(200, '', $list);
+    }
+
     /**
      * 批量修改是否参与活动
      * @return \think\Response

application/route.php

@@ -556,6 +556,7 @@ Route::group('index', [
     'getStoreCostParameterList'   => [ 'index/CostParameter/getStoreCostParameterList', [ 'method' => 'POST|GET' ] ],
     'editCostParameter'           => [ 'index/CostParameter/editCostParameter', [ 'method' => 'POST|GET' ] ],
     'checkCostParameter'          => [ 'index/CostParameter/checkCostParameter', [ 'method' => 'POST' ] ],//核对参数
+    'getCostParameter'            => [ 'index/CostParameter/getCostParameter', [ 'method' => 'GET' ] ],//核对记录
     'getCompanyCostParameterList' => [ 'index/CostParameter/getCompanyCostParameterList', [ 'method' => 'POST|GET' ] ],
     'editCompanyData'             => [ 'index/CostParameter/editCompanyData', [ 'method' => 'POST|GET' ] ],
     'editDiscounts'               => [ 'index/CostParameter/editDiscounts', [ 'method' => 'POST|GET' ] ],