|
|
@@ -330,6 +330,9 @@ class ItemService extends Service
|
|
|
|
|
|
// 2. 获取主表状态映射
|
|
|
$stateMap = \App\Model\Item::State_Type;
|
|
|
+ $attrMap = \App\Model\Item::Item_Attribute;
|
|
|
+
|
|
|
+ $empMap = Employee::whereIn('id', array_unique(array_column($dataArray,'charge_id')))->get()->keyBy('id');
|
|
|
|
|
|
foreach ($dataArray as $main) {
|
|
|
$itemId = $main['id'];
|
|
|
@@ -337,7 +340,13 @@ class ItemService extends Service
|
|
|
|
|
|
// 3. 提取并格式化主表信息
|
|
|
$mainInfo = $main;
|
|
|
- $mainInfo['state_title'] = $stateMap[$main['state'] ?? ''] ?? '未知';
|
|
|
+ $mainInfo['state_title'] = $stateMap[$main['state'] ?? ''] ?? '';
|
|
|
+ $mainInfo['item_attribute_title'] = $attrMap[$main['item_attribute'] ?? ''] ?? '';
|
|
|
+
|
|
|
+ $tmpEmp = $empMap[$main['charge_id']] ?? null;
|
|
|
+ $mainInfo['charge_number'] = $tmpEmp ? $tmpEmp->number : '';
|
|
|
+ $mainInfo['charge_name'] = $tmpEmp ? $tmpEmp->title : '';
|
|
|
+
|
|
|
// 日期格式化
|
|
|
$mainInfo['start_time'] = !empty($main['start_time']) ? date('Y-m-d', $main['start_time']) : '';
|
|
|
$mainInfo['end_time'] = !empty($main['end_time']) ? date('Y-m-d', $main['end_time']) : '';
|
