cqp hace 4 meses
padre
commit
94800462e4
Se han modificado 2 ficheros con 4 adiciones y 4 borrados
  1. 2 2
      app/Service/CustomerService.php
  2. 2 2
      app/Service/ImportService.php

+ 2 - 2
app/Service/CustomerService.php

@@ -795,7 +795,7 @@ class CustomerService extends Service
         if(! in_array($data['model_type'],Customer::$model_type)) return [false,'客户模板类型错误'];
         if(empty($data['title'])) return [false,'客户名称不能为空'];
         if(empty($data['enter_time'])) return [false, '录入系统日期不能为空'];
-        $data['enter_time'] = $this->changeDateToDate($data['enter_time']);
+        $data['enter_time'] = $this->changeDateToDateMin($data['enter_time']);
 
         //所属部门 以及  顶级部门
         if(empty($data['depart_id'])) {
@@ -967,7 +967,7 @@ class CustomerService extends Service
             $data['data'][$key]['customer_state_title'] = $basic_map[$value['customer_state']] ?? '';
             $data['data'][$key]['depart_title'] = $depart_title[$value['depart_id']] ?? '';
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
-            $data['data'][$key]['enter_time'] = $value['enter_time'] ? date('Y-m-d',$value['enter_time']) : '';
+            $data['data'][$key]['enter_time'] = $value['enter_time'] ? date('Y-m-d H:i:s',$value['enter_time']) : '';
             $data['data'][$key]['fp_time'] = $value['fp_time'] ? date('Y-m-d H:i:s',$value['fp_time']) : '';
             $data['data'][$key]['crt_name'] = $emp[$value['crt_id']] ?? '';
             $customer_tmp = $customer_info_map[$value['id']] ?? [];

+ 2 - 2
app/Service/ImportService.php

@@ -287,7 +287,7 @@ class ImportService extends Service
 
         //第一次表格数据校验 非空  已经过滤数据
         $array_clean = $contact_info = [];
-        $now = strtotime(date("Y-m-d",time()));
+        $now = time();
         foreach ($array as $key => $value){
             $rowData = array_filter($value);
             if (empty($rowData)) {
@@ -306,7 +306,7 @@ class ImportService extends Service
                 if(! empty($value[15])){
                     $dateTimeObject = Date::excelToDateTimeObject($value[15]);
                     // 现在你可以格式化这个日期了
-                    $formattedDate = $dateTimeObject->format('Y-m-d');
+                    $formattedDate = $dateTimeObject->format('Y-m-d H:i:s');
 
                     if(! strtotime($formattedDate)){
                         return [false, '录入日期请填写正确的日期'];