diff --git a/application/admin/controllers/ReviewController.php b/application/admin/controllers/ReviewController.php index 656861bb..a3e998bf 100644 --- a/application/admin/controllers/ReviewController.php +++ b/application/admin/controllers/ReviewController.php @@ -309,7 +309,7 @@ class Admin_ReviewController extends Zend_Controller_Action $mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); $mail->addTo($expinfo['email']); $mail->setSubject($mailtp->getSubject()); - $filecontent=file_get_contents("http://" . $_SERVER['HTTP_HOST'].'/data/doc/uuid/'.$uuid); + $filecontent=file_get_contents("http://" . $_SERVER['HTTP_HOST'].'/admin/review/doc/uuid/'.$uuid); $mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, $md['title'].'.doc'); if($mail->send()) { @@ -769,7 +769,7 @@ class Admin_ReviewController extends Zend_Controller_Action }//expertsAction 专家库 /* - * 转换元数据为WORD DOC格式 + * 转换元数据为WORD DOC格式,并附加评审意见表和评审说明 */ public function docAction() { @@ -779,8 +779,24 @@ class Admin_ReviewController extends Zend_Controller_Action $uuid=$this->_request->getParam('uuid'); if (!empty($uuid)) { - $sql="select x.data,m.title,m.description,g.id from xml x left join metadata m on m.id=x.id left join geonetworkmetadata g on g.uuid=m.uuid where m.uuid=".$this->db->quote($uuid); - $row=$this->db->fetchRow($sql); + $sql="select x.data,m.title,m.description,g.id,m.projection from xml x left join metadata m on m.id=x.id left join geonetworkmetadata g on g.uuid=m.uuid where m.uuid=".$this->db->quote($uuid); + $row=$this->db->fetchRow($sql); + $sql="select r.* from reference r left join mdref m on m.refid=r.id where m.uuid=?"; + $sql=$this->db->quoteInto($sql,$uuid); + $ref=$this->db->fetchAll($sql); + $reference='