|
|
@@ -5,6 +5,7 @@ namespace app\api\dao\butt;
|
|
|
use app\api\actions\ZskkCache;
|
|
|
use app\api\dao\ZskkDefaultDao;
|
|
|
use app\api\model\hr\HrModel;
|
|
|
+use app\api\model\institution\InstitutionModel;
|
|
|
use app\api\model\monitor\MonitorexamModel;
|
|
|
use app\api\model\monitor\MonitorreportModel;
|
|
|
use app\api\model\report\ReportModel;
|
|
|
@@ -22,12 +23,14 @@ class ButtDao extends ZskkDefaultDao {
|
|
|
protected $report = null;
|
|
|
protected $hrModel = null;
|
|
|
protected $monitorreportModel = null;
|
|
|
- public function __construct(ReportModel $reportModel,HrModel $hrModel,MonitorreportModel $monitorreportModel)
|
|
|
+ protected $institutionModel = null;
|
|
|
+ public function __construct(ReportModel $reportModel,HrModel $hrModel,MonitorreportModel $monitorreportModel,InstitutionModel $institutionModel)
|
|
|
{
|
|
|
parent::__construct();
|
|
|
$this->report = $reportModel;
|
|
|
$this->hrModel = $hrModel;
|
|
|
$this->monitorreportModel = $monitorreportModel;
|
|
|
+ $this->institutionModel = $institutionModel;
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -134,6 +137,11 @@ class ButtDao extends ZskkDefaultDao {
|
|
|
return $info;
|
|
|
}
|
|
|
|
|
|
+ public function getInstitution($where)
|
|
|
+ {
|
|
|
+ return $this->institutionModel->where($where)->find();
|
|
|
+ }
|
|
|
+
|
|
|
public function getHistorySend($exam,$study)
|
|
|
{
|
|
|
$info = $this->report->getHistorySend($exam,$study);
|