Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug .

Browse Source
This commit is contained in:
tanghucheng
2022-07-07 12:35:58 +08:00
parent e2cb73a383
commit f18cbc5926
2 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/port/control.php
+27 -21
View File
@@ -30,36 +30,18 @@ class port extends control
/* Init config fieldList */
$fieldList = $this->port->initFieldList($model, $fields);
$queryCondition = $this->session->{$model . 'QueryCondition'};
$onlyCondition = $this->session->{$model . 'OnlyCondition'};
$modelDatas = array();
if($onlyCondition and $queryCondition)
{
$table = zget($this->config->objectTables, $model);;
if(isset($this->config->$model->port->table)) $table = $this->config->$model->port->table;
$modelDatas = $this->dao->select('*')->from($table)->alias('t1')
->where($queryCondition)
->beginIF($this->post->exportType == 'selected')->andWhere('t1.id')->in($this->cookie->checkedItem)->fi()
->fetchAll('id');
}
elseif($queryCondition)
{
$stmt = $this->dbh->query($queryCondition . ($this->post->exportType == 'selected' ? " AND t1.id IN({$this->cookie->checkedItem})" : '') . " ORDER BY " . strtr($orderBy, '_', ' '));
while($row = $stmt->fetch()) $modelDatas[$row->id] = $row;
}
$rows = $this->getRows($model);
$list = $this->setListValue($model, $fieldList);
if($list) foreach($list as $listName => $listValue) $this->post->set($listName, $listValue);
/* Get export rows and fields datas */
$exportDatas = $this->getExportDatas($fieldList, $modelDatas);
$exportDatas = $this->getExportDatas($fieldList, $rows);
$this->post->set('rows', $exportDatas['rows']);
$this->post->set('fields', $exportDatas['fields']);
$this->post->set('kind', $model);
$this->fetch('file', 'export2' . $_POST['fileType'], $POST);
$this->fetch('file', 'export2' . $_POST['fileType'], $_POST);
}
}
@@ -137,6 +119,30 @@ class port extends control
return $lists;
}
public function getRows($model)
{
$queryCondition = $this->session->{$model . 'QueryCondition'};
$onlyCondition = $this->session->{$model . 'OnlyCondition'};
$modelDatas = array();
if($onlyCondition and $queryCondition)
{
$table = zget($this->config->objectTables, $model);;
if(isset($this->config->$model->port->table)) $table = $this->config->$model->port->table;
$modelDatas = $this->dao->select('*')->from($table)->alias('t1')
->where($queryCondition)
->beginIF($this->post->exportType == 'selected')->andWhere('t1.id')->in($this->cookie->checkedItem)->fi()
->fetchAll('id');
}
elseif($queryCondition)
{
$stmt = $this->dbh->query($queryCondition . ($this->post->exportType == 'selected' ? " AND t1.id IN({$this->cookie->checkedItem})" : '') . " ORDER BY " . strtr($orderBy, '_', ' '));
while($row = $stmt->fetch()) $modelDatas[$row->id] = $row;
}
return $modelDatas;
}
/**
* Export Template.
*
module/port/model.php
+4 -3
View File
@@ -49,6 +49,7 @@ class portModel extends model
if(empty($fields)) return false;
$fieldList = array();
/* build module fieldList. */
foreach ($fields as $key => $field)
{
@@ -67,11 +68,10 @@ class portModel extends model
$modelFieldList = $this->initForeignKey($model, $field, $modelFieldList);
$modelFieldList['values'] = $this->initValues($model, $field, $modelFieldList);
$this->modelConfig->fieldList[$field] = $modelFieldList;
$fieldList[$field] = $modelFieldList;
}
return $this->modelConfig->fieldList;
return $fieldList;
}
/**
@@ -129,6 +129,7 @@ class portModel extends model
public function initValues($model, $field, $fieldValue = '')
{
$values = $fieldValue['values'];
if($values and (strpos($this->portConfig->sysDataFields, $values) !== false))
{
return $this->portConfig->sysDataList[$values];