|
@@ -114,7 +114,8 @@ class My extends Core
|
|
|
}
|
|
|
$total += $v['daijiaofu'];
|
|
|
|
|
|
- if ($v['type'] == 1) {
|
|
|
+ # 这里之后再改
|
|
|
+ if ($v['type'] == 1 || $v['type'] == 3) {
|
|
|
$qiquan += $v['daijiaofu'];
|
|
|
} else {
|
|
|
$yuanshi += $v['daijiaofu'];
|
|
@@ -289,14 +290,16 @@ class My extends Core
|
|
|
}
|
|
|
|
|
|
$date = 0;
|
|
|
- $total = $qiquan = $yuanshi = 0;
|
|
|
+ $total = 0;
|
|
|
+ $qiquan = array();
|
|
|
if ($data) {
|
|
|
foreach ($data as $k => $v) {
|
|
|
if ($v['daijiaofu_date'] > $date) {
|
|
|
$date = $v['daijiaofu_date'];
|
|
|
}
|
|
|
$total += $v['daijiaofu'];
|
|
|
- if ($v['type'] == 1) {
|
|
|
+ # 这里之后再改,影响较大,合同表需要重构
|
|
|
+ if ($v['type'] == 1 || $v['type'] == 3) {
|
|
|
$qiquan += $v['daijiaofu'];
|
|
|
} else {
|
|
|
$yuanshi += $v['daijiaofu'];
|