|
@@ -24,7 +24,7 @@ class Counts extends Base {
|
|
|
$institution_id = $admin['institution_id'];
|
|
|
$request = Request::instance();
|
|
|
$params = $request->param();
|
|
|
- $where = array();
|
|
|
+ $where = ['film_type'=>2];
|
|
|
foreach ($params as $k=>$v) {
|
|
|
switch($k){
|
|
|
case 'upload1':
|
|
@@ -106,30 +106,30 @@ class Counts extends Base {
|
|
|
$institution_id = $admin['institution_id'];
|
|
|
$request = Request::instance();
|
|
|
$params = $request->param();
|
|
|
- $where = array();
|
|
|
+ $where = ['film_type'=>2];
|
|
|
foreach ($params as $k=>$v) {
|
|
|
switch($k){
|
|
|
- case 'upload1':
|
|
|
- if($params['upload1'] == null){
|
|
|
+ case 'upload_datetime1':
|
|
|
+ if($params['upload_datetime1'] == null){
|
|
|
continue;
|
|
|
}
|
|
|
$where[] = ' s.createdAt > \''.$params['upload1'].'\' ';
|
|
|
break;
|
|
|
- case 'upload2':
|
|
|
- if($params['upload2'] == null){
|
|
|
+ case 'upload_datetime2':
|
|
|
+ if($params['upload_datetime2'] == null){
|
|
|
continue;
|
|
|
}
|
|
|
$where[] = ' s.createdAt < \''.$params['upload2'].'\' ';
|
|
|
break;
|
|
|
- case 'exam1':
|
|
|
- if($params['exam1'] == null){
|
|
|
+ case 'exam_datetime1':
|
|
|
+ if($params['exam_datetime1'] == null){
|
|
|
continue;
|
|
|
}
|
|
|
$exam1 = str_replace('-', '', $params['exam1']);
|
|
|
$where[] = ' s.studydate > \''.$exam1.'\' ';
|
|
|
break;
|
|
|
- case 'exam2':
|
|
|
- if($params['exam2'] == null){
|
|
|
+ case 'exam_datetime2':
|
|
|
+ if($params['exam_datetime2'] == null){
|
|
|
continue;
|
|
|
}
|
|
|
$exam2 = str_replace('-', '', $params['exam2']);
|