|
|
@@ -5079,10 +5079,10 @@ class InvoiceController extends DooController {
|
|
|
'previous' => ''
|
|
|
);
|
|
|
|
|
|
- $sql = 'select group_concat(b.invoiceSerial) as invoiceSerial ,group_concat(b.iid) as invoiceId
|
|
|
- from CLD_invoiceReceivables as a left join CLD_invoice as b on
|
|
|
- find_in_set(b.iid,a.iidExtend) or a.iid=b.iid
|
|
|
- where ' . $con . ' group by a.irid ';
|
|
|
+// $sql = 'select group_concat(b.invoiceSerial) as invoiceSerial ,group_concat(b.iid) as invoiceId
|
|
|
+// from CLD_invoiceReceivables as a left join CLD_invoice as b on
|
|
|
+// find_in_set(b.iid,a.iidExtend) or a.iid=b.iid
|
|
|
+// where ' . $con . ' group by a.irid ';
|
|
|
|
|
|
$pageinfo =$this->get_page ( "CLD_invoiceReceivables as a", $con, $page, $page_size, "invoiceAggregateStaffReceivablesDetail", $get, "" );
|
|
|
|
|
|
@@ -5090,7 +5090,7 @@ class InvoiceController extends DooController {
|
|
|
|
|
|
|
|
|
$limit = $pageinfo ['lower'] . ',' . $page_size;
|
|
|
- $list = $invoiceReceivables->getInvoiceReceivablesByConditionPage ( $limit, $con, 'desc', 'printTime' );
|
|
|
+ $list = $invoiceReceivables->getInvoiceReceivablesByConditionPage ( $limit, $con, 'desc', 'a.printTime' );
|
|
|
foreach ( $list as $key => $value ) {
|
|
|
$list [$key] ['category'] = '';
|
|
|
if ($value ['receivablesCategory'] != 'PUBLIC') {
|
