|
@@ -3293,6 +3293,8 @@ class ReceiptController extends DooController {
|
|
|
$receipt->verify = $verify;
|
|
|
$receipt->date = date ( "Y-m-d" );
|
|
|
|
|
|
+ $receipt->new_summary = 1;
|
|
|
+
|
|
|
$receipt->executeCopy = $executeDetail ['staff'];
|
|
|
$receipt->receiptOrder = "#P" . date ( "Ymd" ) . mt_rand ( 1000, 9999 );
|
|
|
|
|
@@ -5888,6 +5890,8 @@ class ReceiptController extends DooController {
|
|
|
$receiptList [$key] ['executeCopy'] = $executeCopy;
|
|
|
// print_r($verifyList);
|
|
|
$receiptList [$key] ['verifyList'] = $verifyList;
|
|
|
+// print_r($verifyList);
|
|
|
+
|
|
|
$receiptList [$key] ['staffDetail'] = $staff->getOne ( array (
|
|
|
'where' => 'sid=' . $value ['staff'],
|
|
|
'asArray' => true
|
|
@@ -5965,6 +5969,9 @@ class ReceiptController extends DooController {
|
|
|
|
|
|
$data ['enclosurHtml'] = $enclosurHtml;
|
|
|
$receiptList [0] ['rlList'] = $rlList;
|
|
|
+
|
|
|
+// print_r($rlList);
|
|
|
+
|
|
|
$data ['receiptList'] = $receiptList;
|
|
|
$data ['receiptList'][0]['itinerary']=str_replace('\n','<br/>',$receiptList[0]['itinerary']);
|
|
|
// print_r($receiptList);
|
|
@@ -8039,6 +8046,7 @@ class ReceiptController extends DooController {
|
|
|
}
|
|
|
|
|
|
function hisImplement() {
|
|
|
+// include Doo::conf ()->BASE_PATH . 'diagnostic/debug.php';
|
|
|
$item = isset ( $this->params ['item'] ) ? $this->params ['item'] : "";
|
|
|
if (empty ( $item ))
|
|
|
$item = $this->get_args ( 'item' ) ? $this->get_args ( 'item' ) : "expenses";
|
|
@@ -8344,7 +8352,7 @@ class ReceiptController extends DooController {
|
|
|
) );
|
|
|
$receiptList [$key] ['staffDetail'] = $staffDetail;
|
|
|
$receiptList [$key] ['button'] = $button;
|
|
|
-
|
|
|
+ $receiptList [$key] ['paymentABS']="";
|
|
|
if ($value['Rtype']==1){
|
|
|
$receiptList [$key] ['relust'] = $value['sum']-$value['loanSum'];
|
|
|
$receiptList [$key] ['relustABS'] = sprintf("%.2f",abs($receiptList [$key] ['relust']));
|
|
@@ -8413,7 +8421,8 @@ class ReceiptController extends DooController {
|
|
|
$value ['bankName'],
|
|
|
$value ['remittanceBankType'],
|
|
|
$value ['coupletNumber'],
|
|
|
- $value ['sum']
|
|
|
+ $value ['sum'] ,
|
|
|
+ $receiptList [$key] ['paymentABS']
|
|
|
);
|
|
|
array_push ( $remittanceList, $remittanceDetail );
|
|
|
$staffBatchNumber ++;
|
|
@@ -8489,7 +8498,8 @@ class ReceiptController extends DooController {
|
|
|
'员工账户开户行',
|
|
|
'转账类型',
|
|
|
'联行号',
|
|
|
- '金额'
|
|
|
+ '金额',
|
|
|
+ '结算(培训班)'
|
|
|
);
|
|
|
$data = json_decode ( $remittanceInfo, true );
|
|
|
if (empty ( $data ))
|
|
@@ -13806,135 +13816,273 @@ class ReceiptController extends DooController {
|
|
|
die ( 'illegal request' );
|
|
|
}
|
|
|
|
|
|
- include './protected/config/wasteBook.conf.php';
|
|
|
Doo::loadModel ( 'wasteBook' );
|
|
|
$wasteBook = new wasteBook ();
|
|
|
- $data ['store']=$waste;
|
|
|
$inComeStatistics = $wasteBook->getWasteBookStatisticsByIncome ();
|
|
|
- //print_r($waste);
|
|
|
- //1-收入支出流水金额合计
|
|
|
- $waste = $this->getWasteBookStatistics ( $waste, $inComeStatistics );
|
|
|
- //echo $waste['bank']['CGBDeposit'].'</br>';
|
|
|
- //2020-07-20 -理财相关-面板数据
|
|
|
- Doo::loadClass ( 'wasteBook.finances.func' );
|
|
|
- $financesStatistics=$wasteBook->getFinancesStatistics();
|
|
|
- //print_r($waste);
|
|
|
- // 展示使用
|
|
|
- // 收入
|
|
|
- //print_r($inComeStatistics);
|
|
|
- $wasteStatistics['CGBDeposit']=0;
|
|
|
- $wasteStatistics['ICBCDeposit']=0;
|
|
|
- $wasteStatistics['HUADeposit']=0;
|
|
|
- $wasteStatistics['PersonalDeposit']=0;
|
|
|
- foreach ($inComeStatistics['incomeStatistics'] as $value ){
|
|
|
- if($value['accountBank']=='CGBDeposit'){
|
|
|
- $wasteStatistics['CGBDeposit']+=$value['accountPrice'];
|
|
|
- }
|
|
|
- if($value['accountBank']=='ICBCDeposit'){
|
|
|
- $wasteStatistics['ICBCDeposit']+=$value['accountPrice'];
|
|
|
- }
|
|
|
- if($value['accountBank']=='HUADeposit'){
|
|
|
- $wasteStatistics['HUADeposit']+=$value['accountPrice'];
|
|
|
- }
|
|
|
- if($value['accountBank']=='PersonalDeposit'){
|
|
|
- $wasteStatistics['PersonalDeposit']+=$value['accountPrice'];
|
|
|
- }
|
|
|
- }
|
|
|
- $data ['wasteStatistics']=$wasteStatistics;
|
|
|
- //支出
|
|
|
- $wasteStatistics['CGBDeposit']=0;
|
|
|
- $wasteStatistics['ICBCDeposit']=0;
|
|
|
- $wasteStatistics['HUADeposit']=0;
|
|
|
- $wasteStatistics['PersonalDeposit']=0;
|
|
|
- foreach ($inComeStatistics['expenditureStatistics'] as $value ){
|
|
|
- if($value['accountBank']=='CGBDeposit'){
|
|
|
- $wasteStatistics['CGBDeposit']+=$value['accountPrice'];
|
|
|
- }
|
|
|
- if($value['accountBank']=='ICBCDeposit'){
|
|
|
- $wasteStatistics['ICBCDeposit']+=$value['accountPrice'];
|
|
|
- }
|
|
|
- if($value['accountBank']=='HUADeposit'){
|
|
|
- $wasteStatistics['HUADeposit']+=$value['accountPrice'];
|
|
|
- }
|
|
|
- if($value['accountBank']=='PersonalDeposit'){
|
|
|
- $wasteStatistics['PersonalDeposit']+=$value['accountPrice'];
|
|
|
+
|
|
|
+ include './protected/config/wasteBook.conf.php';
|
|
|
+
|
|
|
+ $wasteBook = new wasteBook ();
|
|
|
+ $list=$wasteBook->GetAll();
|
|
|
+ $total=0;
|
|
|
+ $noInPrice=array(
|
|
|
+ "LC_HQ"=>0,
|
|
|
+ "LC_GD"=>0,
|
|
|
+ //工行理财固定
|
|
|
+ "GH_LC_GD"=>0,
|
|
|
+ "CK"=>0,
|
|
|
+ "HQ1"=>0,
|
|
|
+ );
|
|
|
+ //理财活期
|
|
|
+ $GD_LC_HQ=0;$GH_LC_HQ=0;
|
|
|
+ //理财固定
|
|
|
+ $GD_LC_GD=0;$GR_LC_GD=0;
|
|
|
+ //存款
|
|
|
+ $GF_CK=0;$GH_CK=0;$GR_CK=0;$ZH_CK=0;
|
|
|
+
|
|
|
+ foreach ($list as $key=>$value){
|
|
|
+// 存款 旧理财部分 dailyType=0 accountType=9,10
|
|
|
+ if($value['dailyType']==0){
|
|
|
+ //旧理财部分 -活期
|
|
|
+ if($value['accountType']==10){
|
|
|
+ //广发理财
|
|
|
+ if($value['accountBank']=="CGBDeposit"){
|
|
|
+ $GD_LC_HQ+=$value["accountPrice"];
|
|
|
+ //工行理财
|
|
|
+ }elseif($value['accountBank']=="ICBCDeposit"){
|
|
|
+ $GH_LC_HQ+=$value["accountPrice"];
|
|
|
+ }else{
|
|
|
+ //未统计到金额
|
|
|
+ $noInPrice['LC_HQ']+=$value["accountPrice"];
|
|
|
+ }
|
|
|
+ //旧理财部分 -固定
|
|
|
+ }elseif($value['accountType']==9){
|
|
|
+ //广发理财
|
|
|
+ if($value['accountBank']=="CGBDeposit"){
|
|
|
+ $GD_LC_HQ+=$value["accountPrice"];
|
|
|
+ //个人理财--- 原是工行理财固定-不统计入内
|
|
|
+ }elseif($value['accountBank']=="ICBCDeposit"){
|
|
|
+// $GR_LC_GD+=$value["accountPrice"];
|
|
|
+ $noInPrice['GH_LC_GD']+=$value["accountPrice"];
|
|
|
+ }else{
|
|
|
+ //未统计到金额
|
|
|
+ $noInPrice['LC_GD']+=$value["accountPrice"];
|
|
|
+ }
|
|
|
+ //存款
|
|
|
+ }else{
|
|
|
+ //广发存款
|
|
|
+ if($value['accountBank']=="CGBDeposit"){
|
|
|
+ $GF_CK+=$value["accountPrice"];
|
|
|
+ //工行存款
|
|
|
+ }elseif($value['accountBank']=="ICBCDeposit"){
|
|
|
+ $GH_CK+=$value["accountPrice"];
|
|
|
+ //个人存款
|
|
|
+ }elseif($value['accountBank']=="PersonalDeposit"){
|
|
|
+ $GR_CK+=$value["accountPrice"];
|
|
|
+ //(广发)纵横知道--原华润银行
|
|
|
+ }elseif($value['accountBank']=="HUADeposit"){
|
|
|
+ $ZH_CK+=$value["accountPrice"];
|
|
|
+ }else{
|
|
|
+ $noInPrice['CK']+=$value["accountPrice"];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+// 理财部分 其中 公司账户为存款部分
|
|
|
+ //理财账号
|
|
|
+ if($value['operatingBankType']==1){
|
|
|
+ //广发理财活期
|
|
|
+ if ($value['depositMethod'] == '活期' && $value['accountBank'] == 'CGBDeposit') {
|
|
|
+ $GD_LC_HQ += $value['accountPrice'];
|
|
|
+ //工行理财活期
|
|
|
+ }elseif ($value['depositMethod'] == '活期' && $value['accountBank'] == 'ICBCDeposit') {
|
|
|
+ $GH_LC_HQ += $value['accountPrice'];
|
|
|
+ //个人理财固定(广发)
|
|
|
+ }elseif ($value['depositMethod'] == '固定' && $value['accountBank'] == 'CGBPersonalDeposit') {
|
|
|
+ $GR_LC_GD += $value['accountPrice'];
|
|
|
+ //广发理财-固定
|
|
|
+ }elseif ($value['depositMethod'] == '固定' && $value['accountBank'] == 'CGBDeposit') {
|
|
|
+ $GD_LC_GD += $value['accountPrice'];
|
|
|
+ }else{
|
|
|
+ $noInPrice['HQ1']+=$value["accountPrice"];
|
|
|
+ }
|
|
|
+ //公司账号
|
|
|
+ }elseif($value['operatingBankType']==2){
|
|
|
+ //(纵横广发)广发存款
|
|
|
+ if ( $value['accountBank'] == 'CGBDeposit') {
|
|
|
+ $GF_CK += $value['accountPrice'];
|
|
|
+ }elseif ( $value['accountBank'] == 'ICBCDeposit') {
|
|
|
+ //工行存款
|
|
|
+ $GH_CK += $value['accountPrice'];
|
|
|
+ }elseif ( $value['accountBank'] == 'PersonalDeposit') {
|
|
|
+ //个人存款
|
|
|
+ $GR_CK += $value['accountPrice'];
|
|
|
+ }else{
|
|
|
+ $noInPrice['HQ2']+=$value["accountPrice"];
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ $noInPrice['HQ3']+=$value["accountPrice"];
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- $data ['wastePay']=$wasteStatistics;
|
|
|
- //理财公司账号部分
|
|
|
- $wasteStatistics['CGBDeposit']=0;
|
|
|
- $wasteStatistics['ICBCDeposit']=0;
|
|
|
- $wasteStatistics['HUADeposit']=0;
|
|
|
- $wasteStatistics['PersonalDeposit']=0;
|
|
|
- foreach ($financesStatistics['companyAccount'] as $value ){
|
|
|
|
|
|
- //(纵横广发)广发存款
|
|
|
- if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'CGBDeposit') {
|
|
|
- $wasteStatistics['CGBDeposit']+=$value['accountPrice'];
|
|
|
- }
|
|
|
- //工行存款
|
|
|
- if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'ICBCDeposit') {
|
|
|
- $wasteStatistics['ICBCDeposit']+=$value['accountPrice'];
|
|
|
- }
|
|
|
- //个人存款
|
|
|
- if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'PersonalDeposit') {
|
|
|
- $wasteStatistics['PersonalDeposit']+=$value['accountPrice'];
|
|
|
- }
|
|
|
}
|
|
|
- $data ['wasteCompanyAccount']=$wasteStatistics;
|
|
|
|
|
|
+ $data['GF_CK']=bcadd($GF_CK,$waste['bank']['CGBDeposit'],2);
|
|
|
+ $data['ZH_CK']=bcadd($ZH_CK,$waste['bank']['HUADeposit'],2);
|
|
|
+ $data['CK_TO']=bcadd($data['GF_CK'],$data['ZH_CK'],2);
|
|
|
|
|
|
+ $data['GD_LC_HQ']=bcadd($GD_LC_HQ,$waste['financial']['current']['CGBDeposit'],2);
|
|
|
+ $data['GH_LC_HQ']=bcadd($GH_LC_HQ,$waste['financial']['current']['ICBCDeposit'],2);
|
|
|
|
|
|
+ $data['GH_CK']=bcadd($GH_CK,$waste['bank']['ICBCDeposit'],2);
|
|
|
+ $data['GR_CK']=bcadd($GR_CK,$waste['bank']['PersonalDeposit'],2);
|
|
|
|
|
|
-
|
|
|
- //理财部分的金额计算
|
|
|
- $waste =_getFinancesWBS ( $waste, $financesStatistics );
|
|
|
- //echo $waste['bank']['CGBDeposit'].'</br>';;
|
|
|
- //存款面板数据--日常收支改变后的金额汇总
|
|
|
- $bankSavingsStatistics=$wasteBook->getBankSavingsStatistics();
|
|
|
- $waste =_getBankSavingsWBS ( $waste, $bankSavingsStatistics );
|
|
|
+ $data['HQ_TO']=bcadd($data['GD_LC_HQ']+$data['GH_LC_HQ'],$data['GH_CK']+$data['GR_CK'],2);
|
|
|
|
|
|
- //展示调试BUG-使用
|
|
|
- //print_r($bankSavingsStatistics);
|
|
|
- $wasteStatistics['CGBDeposit']=0;
|
|
|
- $wasteStatistics['ICBCDeposit']=0;
|
|
|
- $wasteStatistics['PersonalDeposit']=0;
|
|
|
- foreach ($bankSavingsStatistics as $value ){
|
|
|
- //(纵横广发)广发存款
|
|
|
- if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'CGBDeposit') {
|
|
|
- $wasteStatistics['CGBDeposit']+=$value['accountPrice'];
|
|
|
- }
|
|
|
- //工行存款
|
|
|
- if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'ICBCDeposit') {
|
|
|
- $wasteStatistics['ICBCDeposit']+=$value['accountPrice'];
|
|
|
- }
|
|
|
- //个人存款
|
|
|
- if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'PersonalDeposit') {
|
|
|
- $wasteStatistics['PersonalDeposit']+=$value['accountPrice'];
|
|
|
- }
|
|
|
- }
|
|
|
- $data ['wasteNewPay']=$wasteStatistics;
|
|
|
+ $data['GD_LC_GD']=bcadd($GD_LC_GD,$waste['financial']['fixed']['CGBDeposit'],2);
|
|
|
+ $data['GR_LC_GD']=bcadd($GR_LC_GD,$waste['financial']['fixed']['ICBCDeposit'],2);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ $data['total']=bcadd($data['CK_TO']+$data['HQ_TO'],$data['GD_LC_GD']+$data['GR_LC_GD'],2);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+// echo $waste;
|
|
|
+// $data['total']=bcadd($total,$waste,2);
|
|
|
+
|
|
|
+// include './protected/config/wasteBook.conf.php';
|
|
|
+// Doo::loadModel ( 'wasteBook' );
|
|
|
+// $wasteBook = new wasteBook ();
|
|
|
+// $data ['store']=$waste;
|
|
|
+// $inComeStatistics = $wasteBook->getWasteBookStatisticsByIncome ();
|
|
|
+// //print_r($waste);
|
|
|
+// //1-收入支出流水金额合计
|
|
|
+// $waste = $this->getWasteBookStatistics ( $waste, $inComeStatistics );
|
|
|
+// //echo $waste['bank']['CGBDeposit'].'</br>';
|
|
|
+// //2020-07-20 -理财相关-面板数据
|
|
|
+// Doo::loadClass ( 'wasteBook.finances.func' );
|
|
|
+// $financesStatistics=$wasteBook->getFinancesStatistics();
|
|
|
+// //print_r($waste);
|
|
|
+// // 展示使用
|
|
|
+// // 收入
|
|
|
+// //print_r($inComeStatistics);
|
|
|
+// $wasteStatistics['CGBDeposit']=0;
|
|
|
+// $wasteStatistics['ICBCDeposit']=0;
|
|
|
+// $wasteStatistics['HUADeposit']=0;
|
|
|
+// $wasteStatistics['PersonalDeposit']=0;
|
|
|
+// foreach ($inComeStatistics['incomeStatistics'] as $value ){
|
|
|
+// if($value['accountBank']=='CGBDeposit'){
|
|
|
+// $wasteStatistics['CGBDeposit']+=$value['accountPrice'];
|
|
|
+// }
|
|
|
+// if($value['accountBank']=='ICBCDeposit'){
|
|
|
+// $wasteStatistics['ICBCDeposit']+=$value['accountPrice'];
|
|
|
+// }
|
|
|
+// if($value['accountBank']=='HUADeposit'){
|
|
|
+// $wasteStatistics['HUADeposit']+=$value['accountPrice'];
|
|
|
+// }
|
|
|
+// if($value['accountBank']=='PersonalDeposit'){
|
|
|
+// $wasteStatistics['PersonalDeposit']+=$value['accountPrice'];
|
|
|
+// }
|
|
|
+// }
|
|
|
+// $data ['wasteStatistics']=$wasteStatistics;
|
|
|
+// //支出
|
|
|
+// $wasteStatistics['CGBDeposit']=0;
|
|
|
+// $wasteStatistics['ICBCDeposit']=0;
|
|
|
+// $wasteStatistics['HUADeposit']=0;
|
|
|
+// $wasteStatistics['PersonalDeposit']=0;
|
|
|
+// foreach ($inComeStatistics['expenditureStatistics'] as $value ){
|
|
|
+// if($value['accountBank']=='CGBDeposit'){
|
|
|
+// $wasteStatistics['CGBDeposit']+=$value['accountPrice'];
|
|
|
+// }
|
|
|
+// if($value['accountBank']=='ICBCDeposit'){
|
|
|
+// $wasteStatistics['ICBCDeposit']+=$value['accountPrice'];
|
|
|
+// }
|
|
|
+// if($value['accountBank']=='HUADeposit'){
|
|
|
+// $wasteStatistics['HUADeposit']+=$value['accountPrice'];
|
|
|
+// }
|
|
|
+// if($value['accountBank']=='PersonalDeposit'){
|
|
|
+// $wasteStatistics['PersonalDeposit']+=$value['accountPrice'];
|
|
|
+// }
|
|
|
+// }
|
|
|
+// $data ['wastePay']=$wasteStatistics;
|
|
|
+// //理财公司账号部分
|
|
|
+// $wasteStatistics['CGBDeposit']=0;
|
|
|
+// $wasteStatistics['ICBCDeposit']=0;
|
|
|
+// $wasteStatistics['HUADeposit']=0;
|
|
|
+// $wasteStatistics['PersonalDeposit']=0;
|
|
|
+// foreach ($financesStatistics['companyAccount'] as $value ){
|
|
|
+
|
|
|
+// //(纵横广发)广发存款
|
|
|
+// if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'CGBDeposit') {
|
|
|
+// $wasteStatistics['CGBDeposit']+=$value['accountPrice'];
|
|
|
+// }
|
|
|
+// //工行存款
|
|
|
+// if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'ICBCDeposit') {
|
|
|
+// $wasteStatistics['ICBCDeposit']+=$value['accountPrice'];
|
|
|
+// }
|
|
|
+// //个人存款
|
|
|
+// if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'PersonalDeposit') {
|
|
|
+// $wasteStatistics['PersonalDeposit']+=$value['accountPrice'];
|
|
|
+// }
|
|
|
+// }
|
|
|
+// $data ['wasteCompanyAccount']=$wasteStatistics;
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+// //理财部分的金额计算
|
|
|
+// $waste =_getFinancesWBS ( $waste, $financesStatistics );
|
|
|
+// //echo $waste['bank']['CGBDeposit'].'</br>';;
|
|
|
+// //存款面板数据--日常收支改变后的金额汇总
|
|
|
+// $bankSavingsStatistics=$wasteBook->getBankSavingsStatistics();
|
|
|
+// $waste =_getBankSavingsWBS ( $waste, $bankSavingsStatistics );
|
|
|
+
|
|
|
+// //展示调试BUG-使用
|
|
|
+// //print_r($bankSavingsStatistics);
|
|
|
+// $wasteStatistics['CGBDeposit']=0;
|
|
|
+// $wasteStatistics['ICBCDeposit']=0;
|
|
|
+// $wasteStatistics['PersonalDeposit']=0;
|
|
|
+// foreach ($bankSavingsStatistics as $value ){
|
|
|
+// //(纵横广发)广发存款
|
|
|
+// if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'CGBDeposit') {
|
|
|
+// $wasteStatistics['CGBDeposit']+=$value['accountPrice'];
|
|
|
+// }
|
|
|
+// //工行存款
|
|
|
+// if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'ICBCDeposit') {
|
|
|
+// $wasteStatistics['ICBCDeposit']+=$value['accountPrice'];
|
|
|
+// }
|
|
|
+// //个人存款
|
|
|
+// if ($value['operatingBankType'] == 2 && $value['accountBank'] == 'PersonalDeposit') {
|
|
|
+// $wasteStatistics['PersonalDeposit']+=$value['accountPrice'];
|
|
|
+// }
|
|
|
+// }
|
|
|
+// $data ['wasteNewPay']=$wasteStatistics;
|
|
|
|
|
|
|
|
|
//echo $waste['bank']['CGBDeposit'].'</br>';;
|
|
|
|
|
|
//
|
|
|
- $total = $waste ['bank'] ['CGBDeposit'] + $waste ['bank'] ['ICBCDeposit']+ $waste ['bank'] ['HUADeposit'] + $waste ['bank'] ['PersonalDeposit'] + $waste ['financial'] ['current'] ['CGBDeposit'] + $waste ['financial'] ['current'] ['ICBCDeposit'] + $waste ['financial'] ['fixed'] ['CGBDeposit'] + $waste ['financial'] ['fixed'] ['ICBCDeposit'];
|
|
|
- $CGBDeposit_total =$waste ['bank'] ['CGBDeposit']+$waste ['bank'] ['HUADeposit'];
|
|
|
+// $total = $waste ['bank'] ['CGBDeposit'] + $waste ['bank'] ['ICBCDeposit']+ $waste ['bank'] ['HUADeposit'] + $waste ['bank'] ['PersonalDeposit'] + $waste ['financial'] ['current'] ['CGBDeposit'] + $waste ['financial'] ['current'] ['ICBCDeposit'] + $waste ['financial'] ['fixed'] ['CGBDeposit'] + $waste ['financial'] ['fixed'] ['ICBCDeposit'];
|
|
|
+// $CGBDeposit_total =$waste ['bank'] ['CGBDeposit']+$waste ['bank'] ['HUADeposit'];
|
|
|
|
|
|
//$waste ['bank'] ['ICBCDeposit']=sprintf("%.2f", round($waste ['bank'] ['ICBCDeposit'], 2));
|
|
|
|
|
|
// print_r($waste);
|
|
|
|
|
|
|
|
|
- $data ['total'] = number_format($total,2);
|
|
|
- $data ['CGBDeposit_total'] = number_format($CGBDeposit_total,2);
|
|
|
- $cashBalance=$CGBDeposit_total+$waste ['bank'] ['ICBCDeposit']+$waste ['bank'] ['PersonalDeposit']+$waste ['financial'] ['current'] ['CGBDeposit']+$waste ['financial'] ['current'] ['ICBCDeposit'];
|
|
|
- $data['cashBalance']= number_format($cashBalance,2);
|
|
|
+// $data ['total'] = number_format($total,2);
|
|
|
+// $data ['CGBDeposit_total'] = number_format($CGBDeposit_total,2);
|
|
|
+// $cashBalance=$CGBDeposit_total+$waste ['bank'] ['ICBCDeposit']+$waste ['bank'] ['PersonalDeposit']+$waste ['financial'] ['current'] ['CGBDeposit']+$waste ['financial'] ['current'] ['ICBCDeposit'];
|
|
|
+// $data['cashBalance']= number_format($cashBalance,2);
|
|
|
|
|
|
- $waste ['bank'] ['CGBDeposit']=sprintf("%.2f", round($waste ['bank'] ['CGBDeposit'], 2));
|
|
|
+// $waste ['bank'] ['CGBDeposit']=sprintf("%.2f", round($waste ['bank'] ['CGBDeposit'], 2));
|
|
|
|
|
|
- $data ['waste'] = $waste;
|
|
|
+// $data ['waste'] = $waste;
|
|
|
|
|
|
|
|
|
|
|
@@ -14121,9 +14269,13 @@ class ReceiptController extends DooController {
|
|
|
}
|
|
|
if (! empty ( $D1 ) && ! empty ( $D2 ))
|
|
|
$con = ' and inputDate BETWEEN "' . $D1 . '" AND "' . $D2 . '" ';
|
|
|
- elseif (! empty ( $D1 ) && empty ( $D2 ))
|
|
|
- $con = ' and inputDate = "' . $D1 . '"';
|
|
|
- else{
|
|
|
+ elseif (! empty ( $D1 ) && empty ( $D2 )){
|
|
|
+
|
|
|
+ $startYear=$D1.":00.00.00";
|
|
|
+ $endYear=$D1.":23.59.59";
|
|
|
+
|
|
|
+ $con = ' and inputDate >= "'.$startYear.'" and inputDate <= "'.$endYear.'"';
|
|
|
+ }else{
|
|
|
$con = ' and DATE_FORMAT(inputDate,"%Y")= "'.$year.'" ';
|
|
|
}
|
|
|
|