未提交财务日报的门店

application/api_broker/controller/CollectHouse.php

@@ -127,10 +127,7 @@ class CollectHouse extends Basic
         $get_params['agents_id']    = $params["agents_id"];
         $get_params['CollectUser.status']       = 1;
 
-        if (isset($params['site_name']) && $params['site_name']) {
-            //城市筛选
-            $get_params['Houses.city'] = $params['site_name'];
-        }
+
 
         $res        = $this->aCollectHouse->getCollectList($pageNo,$pageSize,$field,$get_params);
         $res_total  = $this->aCollectHouse->getCollectListTotal($field,$get_params);

application/index/controller/ImageDepot.php

@@ -180,10 +180,8 @@ class ImageDepot extends Basic
 
     public function ceshi()
     {
-
-
-        $header = $this->request->header();
-        dump($header["x-forwarded-for"]);
+        header('Content-Type:text/json;charset=utf-8');
+        echo json_encode(['name'=>'xiaom','name'=>'xiaom2']);
     }
 
 

application/model/AStore.php

@@ -481,4 +481,18 @@ class AStore extends BaseModel
         // big_log($this->getLastSql());
         return $result;
     }
+
+    public function getDailyUncommittedId($time)
+    {
+        $sql = "SELECT
+                * 
+            FROM
+                ( ( SELECT id AS store_id FROM a_store ) UNION ALL ( SELECT store_id FROM o_daily WHERE daily_date = '{$time}' ) ) c 
+            GROUP BY
+                store_id 
+            HAVING
+                count( store_id ) = 1 ";
+        $result = Db::table($this->table)->query($sql);
+        return $result;
+    }
 }
\ No newline at end of file

application/model/ODailyUncommittedModel.php

@@ -84,7 +84,6 @@ class ODailyUncommittedModel extends Model
         $result = $this->db_ ->where($where)->update($params);
         //dump($this->getLastSql());
         return $result;
-
     }
 
 }

application/task/controller/DailyUncommittedTask.php

@@ -3,6 +3,7 @@
 namespace app\task\controller;
 
 use app\api_broker\service\PushMessageService;
+use app\model\AStore;
 use app\model\ODailyUncommittedModel;
 
 
@@ -30,31 +31,20 @@ class DailyUncommittedTask
     {
         $time = date("Y-m-d");
         $s_push_msg = new PushMessageService();
+        $m_store    = new AStore();
 
         //未提交日报门店集合
-        $sql = "SELECT
-                `a`.`id`,
-                `a`.`district_id`,
-                b.id AS agent_id,
-                `b`.`name` 
-            FROM
-                `a_store` `a`
-                LEFT JOIN `a_agents` `b` ON `a`.`id` = b.store_id 
-                AND ( b.LEVEL = 20 OR b.LEVEL = 40 ) 
-            WHERE
-                `a`.`status` = 0 
-                AND `a`.`id` IN (
-            SELECT
-                * 
-            FROM
-                ( ( SELECT id AS store_id FROM a_store ) UNION ALL ( SELECT store_id FROM o_daily WHERE daily_date = '{$time}' ) ) c 
-            GROUP BY
-                store_id 
-            HAVING
-                count( store_id ) = 1 
-                )";
-        $store_result = $this->m_daily_uncommitted->query($sql);
+        $id_str = $this->getDailyUncommittedId($time);
+        if(!$id_str){
+            return '无数据';
+        }
+        $params_select=[];
+        $params_select['a.id'] = array('in',$id_str);
+        $store_result = $m_store->selectDailyUncommitted('a.id,a.district_id,b.id as agent_id,b.name', $params_select);
 
+        if(!$store_result){
+            return '无数据';
+        }
         foreach ($store_result as $k => $v) {
             if(!$v['agent_id']){
                 continue;
@@ -85,6 +75,19 @@ class DailyUncommittedTask
         return "成功";
     }
 
+    public function getDailyUncommittedId($time)
+    {
+        $m_store    = new AStore();
+        $res = $m_store->getDailyUncommittedId($time);
+        $id_str = "";
+        if (count($res) > 0) {
+            foreach ($res as $k => $v) {
+                $id_str .= $v["store_id"]. ",";
+            }
+            $id_str = rtrim($id_str, ",");
+        }
+        return $id_str;
+    }
 
     /**
      * 新增