Your Name преди 3 години
родител
ревизия
a380ffa1d5
променени са 6 файла, в които са добавени 73 реда и са изтрити 28 реда
  1. 3 1
      learn/active/database/info_off.php
  2. 22 0
      learn/active/lib/Excel.php
  3. 2 2
      tool/work/assets/pc/html/email.html
  4. 14 0
      tool/work/database/appoint.php
  5. 2 0
      tool/work/database/info.php
  6. 30 25
      tool/work/lib/Cron.php

+ 3 - 1
learn/active/database/info_off.php

@@ -1,5 +1,6 @@
 <?php
-
+$button = array();
+$button['导入核销人员'] = array('fast', '', 'import&project=upload&call=active/lib/excel.info_off');
 return array
 (
     # 表名
@@ -114,6 +115,7 @@ return array
     	//'insert' => false,
         'delete' => false,
         // 'edit' => false,
+        'button' => $button,
         
     ),
 

+ 22 - 0
learn/active/lib/Excel.php

@@ -133,4 +133,26 @@ Class Excel {
             }
         }
     }
+    public function info_off($file)
+    {
+        $file = Dever::local($file);
+        $data = Dever::excelImport($file,0);
+        if ($data) {
+            $res = array();
+            foreach ($data as $k => $v) {
+                if ($k >= 2) {
+                    $where['name'] = $v['A'];
+                    $where['mobile'] = $v['B'];
+                    if ($where['mobile']) {
+                        $where['pass'] = substr($where['mobile'],-6);
+                    }
+                    $info = Dever::db('active/info_off')->find(array('mobile'=>$where['mobile']));
+                    
+                    if (!$info){
+                        Dever::db('active/info_off')->insert($where);
+                    }
+                }
+            }
+        }
+    }
 }

+ 2 - 2
tool/work/assets/pc/html/email.html

@@ -145,10 +145,10 @@ th{
                 <p><{$info['yi']}></p>
                 <h3>已处理</h3>
             </li>
-            <li style="list-style:none;">
+           <!--  <li style="list-style:none;">
                 <p><{$info['wei']}></p>
                 <h3>未完成</h3>
-            </li>
+            </li> -->
         </ul>
     </div>
     <div class="after">

+ 14 - 0
tool/work/database/appoint.php

@@ -184,5 +184,19 @@ return array
             // 'order' => array('id' => 'desc'),
             'col' => '*',
         ),
+        'getYAll' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'group' => array('yes','in'),
+                'start' => array('yes-cdate','>='),
+                'end' =>array('yes-cdate','<='),
+                'state' => 1,
+            ),
+            'type' => 'all',
+            // 'order' => array('id' => 'desc'),
+            'col' => '*|info_id',
+        ),
     ),
 );

+ 2 - 0
tool/work/database/info.php

@@ -456,6 +456,8 @@ return array
             (
                 'group' => 'yes',
                 'state' => 1,
+                'id' => array('yes','in'),
+                'question' => array('yes','in'),
                 'start' => array('yes-cdate','>='),
                 'end' => array('yes-cdate','<='),
                 'status'=> array('yes','in'),

+ 30 - 25
tool/work/lib/Cron.php

@@ -10,38 +10,43 @@ Class Cron
         $data = Dever::db('work/branch')->state(array('type'=>1));
         foreach ($data as $k => $v) {
         	$group_id = explode(',',$v['group']);
-        	$admin[] = Dever::db('manage/admin')->find($group_id[1]);
-        }
-        $content = $this->email_api();
-        foreach($admin as $key => $val){
-            $this->send($val['email'], $val['username'], $title, $content);
+        	$admin = Dever::db('manage/admin')->find($group_id[1]);
+            $content = $this->email_api($v);
+             $this->send($admin['email'], $admin['username'], $title, $content);
         }
+        // $content = $this->email_api();
+        // foreach($admin as $key => $val){
+        //     $this->send($val['email'], $val['username'], $title, $content);
+        // }
     }
 	#发送邮件
-    public function email_api()
+    public function email_api($v)
     {
     	$start=mktime(0,0,0,date('m'),date('d'),date('Y'))-86400;
         $end = $start+86400-1;
         $config = Dever::db('work/info')->config['config_status'];
-        $data['branch'] = Dever::db('work/branch')->state(array('type'=>1));
-        if ($data['branch']) {
-        	foreach($data['branch'] as $k => $v) {
-        		$data['info']['app'] = Dever::db('work/appoint')->getEmail(array('group'=>$v['group'],'start'=>$start,'end'=>$end));
-        		$data['info']['xu'] = Dever::db('work/info')->getCount(array('group'=>$v['group'],'start'=>$start,'end'=>$end,'status'=>1));
-        		$data['info']['yi'] = Dever::db('work/info')->getCount(array('group'=>$v['group'],'start'=>$start,'end'=>$end,'status'=>3));
-        		$data['info']['wei'] = Dever::db('work/info')->getCount(array('group'=>$v['group'],'start'=>$start,'end'=>$end,'status'=>'1,2,4'));
-        		$data['app'] = Dever::db('work/info')->getAll(array('group'=>$v['group'],'start'=>$start,'end'=>$end));
-        		foreach ($data['app'] as $k1 => $v1) {
-        			$data['app'][$k1]['cdate'] = date('Y-m-d H:i:s',$v1['cdate']);
-        			$data['app'][$k1]['zhipai'] = date('Y-m-d H:i:s',$v1['zdate']);
-        			$data['app'][$k1]['chu'] = date('Y-m-d H:i:s',$v1['chdate']);
-        			$cate = Dever::db('work/q_cate')->find($v1['cate_id']);
-        			$data['app'][$k1]['cate_name'] = $cate['name'];
-        			$priority = Dever::db('work/priority')->find($v1['priority_id']);
-        			$data['app'][$k1]['priority_name'] = $priority['name'];
-        			$data['app'][$k1]['status']= Dever::status($config,$v1['status']);
-        		}
-        	}
+        $data['branch'] = $v;
+        $question = Dever::db('work/question')->state(array('branch_id'=>$data['branch']['group_id']));
+        $question = array_keys($question);
+        $data['info']['app'] = Dever::db('work/info')->getCount(array('question'=>$question,'end'=>$end));
+        $data['info']['xu'] = Dever::db('work/info')->getCount(array('group'=>$data['branch']['group_id'],'end'=>$end,'status'=>2));
+        $app = Dever::db('work/appoint')->getYAll(array('group'=>$data['branch']['group_id']));
+        $app = array_keys($app);
+        $data['info']['yi'] = Dever::db('work/info')->getCount(array('id'=>$app,'end'=>$end,'status'=>'3,4'));
+
+        // $data['info']['wei'] = Dever::db('work/info')->getCount(array('group'=>$data['branch']['group_id'],'start'=>$start,'end'=>$end,'status'=>4));
+
+        $data['question'] = Dever::db('work/question')->getAll(array('branch_id'=>$data['branch']['group_id']));
+        $data['app'] = Dever::db('work/info')->getAll(array('group'=>$data['branch']['group_id'],'start'=>$start,'end'=>$end));
+        foreach ($data['app'] as $k1 => $v1) {
+            $data['app'][$k1]['cdate'] = date('Y-m-d H:i:s',$v1['cdate']);
+            $data['app'][$k1]['zhipai'] = date('Y-m-d H:i:s',$v1['zdate']);
+            $data['app'][$k1]['chu'] = date('Y-m-d H:i:s',$v1['chdate']);
+            $cate = Dever::db('work/q_cate')->find($v1['cate_id']);
+            $data['app'][$k1]['cate_name'] = $cate['name'];
+            $priority = Dever::db('work/priority')->find($v1['priority_id']);
+            $data['app'][$k1]['priority_name'] = $priority['name'];
+            $data['app'][$k1]['status']= Dever::status($config,$v1['status']);
         }
         return Dever::render('email', $data);
     }