Browse Source

Merge branch 'develop' of zhengxifeng/zc100 into master

zhengxifeng 6 months ago
parent
commit
59b8cff41e
3 changed files with 4 additions and 1 deletions
  1. 1
    1
      application/api/controller/Diyajax.php
  2. 3
    0
      application/api/model/v1/Zc.php
  3. BIN
      public/006.xlsx

+ 1
- 1
application/api/controller/Diyajax.php View File

@@ -581,7 +581,7 @@ TRUNCATE TABLE ey_zcwd_position;
581 581
 TRUNCATE TABLE ey_zcdj_position;
582 582
      */
583 583
     public function exportData(){
584
-        $fileTmpPath = './public/003.xlsx';
584
+        $fileTmpPath = './public/006.xlsx';
585 585
         $expType = PHPExcel_IOFactory::identify($fileTmpPath);
586 586
         $objReader = PHPExcel_IOFactory::createReader($expType);
587 587
         $objPHPExcel = $objReader->load($fileTmpPath);

+ 3
- 0
application/api/model/v1/Zc.php View File

@@ -394,6 +394,9 @@ class Zc extends Base{
394 394
             $xxlx = 1;
395 395
         }else if($xxlx_str == '非全日制'){
396 396
             $xxlx = 2;
397
+        }else{
398
+            //为空
399
+            $xxlx = 0;
397 400
         }
398 401
 
399 402
         //毕业年限

BIN
public/006.xlsx View File


Loading…
Cancel
Save