|
|
@@ -535,10 +535,22 @@ class PushBaseDataToCalc extends BaseBusiness
|
|
|
|
|
|
$where = '1=1';
|
|
|
if ($table == 'AR_ORDER') {
|
|
|
- $where = 'IS_DELETE = 0 AND PERIOD_NUM=' . $this->_periodNum;
|
|
|
+ $periodObj = Period::instance();
|
|
|
+ $calcYear = $periodObj->getYear($this->_periodNum);
|
|
|
+ $calcMonth = $periodObj->getMonth($this->_periodNum);
|
|
|
+ $periodList = $periodObj->getYearMonthAllPeriod($calcYear, $calcMonth);
|
|
|
+ $periodList = implode("','", $periodList);
|
|
|
+
|
|
|
+ $where = "IS_DELETE = 0 AND PERIOD_NUM IN ('{$periodList}')";
|
|
|
}
|
|
|
if ($table == 'AR_ORDER_GOODS') {
|
|
|
- $orderSn = Order::find()->select('SN')->where('IS_DELETE = 0 AND PERIOD_NUM=' . $this->_periodNum)->column();
|
|
|
+ $periodObj = Period::instance();
|
|
|
+ $calcYear = $periodObj->getYear($this->_periodNum);
|
|
|
+ $calcMonth = $periodObj->getMonth($this->_periodNum);
|
|
|
+ $periodList = $periodObj->getYearMonthAllPeriod($calcYear, $calcMonth);
|
|
|
+ $periodList = implode("','", $periodList);
|
|
|
+
|
|
|
+ $orderSn = Order::find()->select('SN')->where("IS_DELETE = 0 AND PERIOD_NUM IN ('{$periodList}')")->column();
|
|
|
$where = 'ORDER_SN IN ("' . implode("','", $orderSn) . '")';
|
|
|
}
|
|
|
|