|
|
@@ -829,6 +829,8 @@ class ViolationProduct extends Controller
|
|
|
$sheet->setCellValue('R2', '城市*');
|
|
|
$sheet->setCellValue('S2', '溯源责任人');
|
|
|
$sheet->setCellValue('T2', '检索采集日期(Y-m-d)*');
|
|
|
+ $sheet->setCellValue('U2', '发货省份');
|
|
|
+ $sheet->setCellValue('V2', '发货城市');
|
|
|
// 生成 Excel 文件
|
|
|
$writer = new Xlsx($spreadsheet);
|
|
|
|
|
|
@@ -951,6 +953,52 @@ class ViolationProduct extends Controller
|
|
|
if (!isset($province_id_data[$province_name])) return json_send(['code' => 'error', 'msg' => "第{$key_num}行省份信息不完整", 'data' => $item]);
|
|
|
$city_name = $item[17];
|
|
|
if (!isset($city_id_data[$city_name])) return json_send(['code' => 'error', 'msg' => "第{$key_num}行城市信息不完整", 'data' => $item]);
|
|
|
+
|
|
|
+ $shipment_province_name = isset($item[20]) ? $item[20] : '';
|
|
|
+ //特殊地区1级移除市
|
|
|
+ if ($shipment_province_name && in_array($province_name, ['北京市', '天津市', '上海市', '重庆市'])) {
|
|
|
+ //移除市这个字符
|
|
|
+ $shipment_province_name = trim(str_replace('市', '', $shipment_province_name));
|
|
|
+ } else if ($shipment_province_name && in_array($shipment_province_name, ['北京', '天津', '上海', '重庆'])) {
|
|
|
+ } else if ($shipment_province_name && in_array($shipment_province_name, ['内蒙古', '广西', '西藏', '新疆', '宁夏'])) {
|
|
|
+ switch ($shipment_province_name) {
|
|
|
+ case '内蒙古':
|
|
|
+ $shipment_province_name = '内蒙古自治区';
|
|
|
+ break;
|
|
|
+ case '广西':
|
|
|
+ $shipment_province_name = '广西壮族自治区';
|
|
|
+ break;
|
|
|
+ case '西藏':
|
|
|
+ $shipment_province_name = '西藏自治区';
|
|
|
+ break;
|
|
|
+ case '新疆':
|
|
|
+ $shipment_province_name = '新疆维吾尔自治区';
|
|
|
+ break;
|
|
|
+ case '宁夏':
|
|
|
+ $shipment_province_name = '宁夏回族自治区';
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ } else if ($shipment_province_name && in_array($shipment_province_name, ['内蒙古自治区', '广西壮族自治区', '西藏自治区', '新疆维吾尔自治区', '宁夏回族自治区'])) {
|
|
|
+ } else if (strpos($shipment_province_name, '省') === false) {
|
|
|
+ //是否存在市省,如果不存在则补全
|
|
|
+ if (strpos($shipment_province_name, '省') === false) {
|
|
|
+ $shipment_province_name = $shipment_province_name . '省';
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $shipment_province_id ='0';
|
|
|
+ if (!isset($province_id_data[$shipment_province_name])){
|
|
|
+ $shipment_province_name = '';
|
|
|
+ }else{
|
|
|
+ $shipment_province_id = $province_id_data[$shipment_province_name]['id'];
|
|
|
+ }
|
|
|
+ $shipment_city_id = '0';
|
|
|
+ $shipment_city_name = isset($item[21]) ? $item[21] : '';
|
|
|
+ if (!isset($city_id_data[$shipment_city_name])){
|
|
|
+ $shipment_city_name = '';
|
|
|
+ }else{
|
|
|
+ $shipment_city_id = $city_id_data[$shipment_city_name]['id'];
|
|
|
+ }
|
|
|
+
|
|
|
// 权限判断
|
|
|
if ($is_admin != 1 && $company_id != 0) {
|
|
|
$insert_product_data['company_id'] = $company_id;
|
|
|
@@ -984,6 +1032,10 @@ class ViolationProduct extends Controller
|
|
|
$insert_product_data['insert_time'] = time();
|
|
|
$insert_product_data['source_id'] = 0; // 原始数据ID
|
|
|
$insert_product_data['scrape_date'] = $item[19]; // 检索采集日期
|
|
|
+ $insert_product_data['shipment_province_id'] = $shipment_province_id; // 发货省份id
|
|
|
+ $insert_product_data['shipment_province_name'] = $shipment_province_name; // 发货省份
|
|
|
+ $insert_product_data['shipment_city_id'] = $shipment_city_id; // 发货城市id
|
|
|
+ $insert_product_data['shipment_city_name'] = $shipment_city_name; // 发货城市
|
|
|
//插入数据
|
|
|
$ViolationProductModel->addViolationProduct($insert_product_data, true);
|
|
|
}
|