From bb1ca45defbf8693248b06b593f49c855f8f2a42 Mon Sep 17 00:00:00 2001 From: wlx Date: Mon, 23 Jun 2014 03:23:26 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/module/Order/Order.php | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/application/module/Order/Order.php b/application/module/Order/Order.php index a4a740f7..c709f0ca 100644 --- a/application/module/Order/Order.php +++ b/application/module/Order/Order.php @@ -312,17 +312,7 @@ class Order public function pdfPrint($formData,$userid = 0,$save = false,$returnpdf = false) { $sql="SELECT m.title||'('||m.filesize::text||'MB)' as title FROM dataorder d - RIGHT JOIN normalmetadata m ON d.uuid=m.uuid - WHERE d.status=2 AND d.userid=?"; - - $list = $this->db->fetchAll($sql,array($userid)); - - foreach($list as $i=>$row){ - @$formData['heihelist'].=($i+1).". ".$row['title'].";"; - } - - $sql="SELECT m.title||'('||m.filesize::text||'MB)' as title FROM dataorder d - RIGHT JOIN normalmetadata m ON d.uuid=m.uuid WHERE d.uuid not in (select uuid from normalmetadata) AND d.status=2 AND d.userid=?"; + RIGHT JOIN normalmetadata m ON d.uuid=m.uuid WHERE d.status=2 AND d.userid=?"; $list = $this->db->fetchAll($sql,array($userid)); foreach($list as $i=>$row){ @@ -333,12 +323,10 @@ class Order $pdf->template = $this->config->offline->template; - $pdf->heihetemplate = $this->config->offline->heihetemplate; $formData['project'].='['.$formData['project_title'].' | '.$formData['project_type'].' | '.$formData['project_id'].' | ' . $formData['project_leader'] . ']'; $pdf->data = $formData; if (isset($formData['westdclist'])) $pdf->drawWestdc(); - if (isset($formData['heihelist'])) $pdf->drawHeihe(); $pdf->addRef($this->pdfData); $pdf->addSelection($this->pdfData);