|
@@ -142,6 +142,14 @@ class ExpendController extends BaseController
|
|
|
$currentEndTime = $currentEndDate . ' 23:59:59';
|
|
$currentEndTime = $currentEndDate . ' 23:59:59';
|
|
|
$where['addTime'] = ['between', [$currentStartTime, $currentEndTime]];
|
|
$where['addTime'] = ['between', [$currentStartTime, $currentEndTime]];
|
|
|
$list = ExpendClass::getExpendList($where);
|
|
$list = ExpendClass::getExpendList($where);
|
|
|
|
|
+ $map = dict::getDict('expendTypeMap');
|
|
|
|
|
+ if (!empty($list)) {
|
|
|
|
|
+ foreach ($list as $key => $val) {
|
|
|
|
|
+ $type = $val['type'] ?? 0;
|
|
|
|
|
+ $name = $map[$type] ?? '未命名';
|
|
|
|
|
+ $list[$key]['typeName'] = $name;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
util::success($list);
|
|
util::success($list);
|
|
|
}
|
|
}
|
|
|
|
|
|