|
@@ -37,10 +37,11 @@ Class Cron
|
|
|
$end = $start+86400-1;
|
|
|
$config = Dever::db('work/info')->config['config_status'];
|
|
|
$dbranch = $v;
|
|
|
- $question = Dever::db('work/question')->state(array('branch_id'=>$dbranch['id']));
|
|
|
+ $question = Dever::db('work/question')->state(array('branch_id'=>$dbranch['group_id']));
|
|
|
$question = array_keys($question);
|
|
|
|
|
|
$data['info']['app'] = Dever::db('work/info')->getCount(array('question'=>$question,'end'=>$end));
|
|
|
+ echo Dever::sql();
|
|
|
$data['info']['xu'] = Dever::db('work/info')->getCount(array('group'=>$dbranch['group_id'],'end'=>$end,'status'=>2));
|
|
|
$admin = explode(',',$dbranch['group']);
|
|
|
if ($dbranch['coor']) {
|
|
@@ -55,7 +56,7 @@ Class Cron
|
|
|
}
|
|
|
$data['info']['yi'] = Dever::db('work/info')->getCount(array('fpeople'=>$people,'end'=>$end,'status'=>'3,4'));
|
|
|
|
|
|
- $data['question'] = Dever::db('work/question')->getAll(array('branch_id'=>$dbranch['id']));
|
|
|
+ $data['question'] = Dever::db('work/question')->getAll(array('branch_id'=>$dbranch['group_id']));
|
|
|
$question = implode(',',$question);
|
|
|
if ($question) {
|
|
|
$data['app'] = Dever::db('work/info')->fetchAll('select * from churen_work_info where (`group` in ('.$dbranch['group_id'].') or fpeople in ('.$people.') or question in ('.$question.')) and cdate>='.$start.' and cdate <='.$end.' and state = 1');
|