1. 派工单搜索相关修改

application/controllers/api/Galanz.php

@@ -94,7 +94,7 @@ class Galanz extends BaseController
         $this->saveLog('', 'searchOrder', $param);
 
         $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
-        $result = $sourceGalanzObj->SearchOrder('', $values['mobile']);
+        $result = $sourceGalanzObj->SearchOrder($values['name'], $values['custmobile'], $values['finishstatus'], $values['acceptstatus'], $values['callintype'], $values['starttime'], $values['endtime'], $values['isreminder']);
         $result = $sourceGalanzObj->HandelSearchOrderFields($result, 'call');
 
         $obj->ReturnMessage(true, '', $result);

application/controllers/task/Galanz.php

@@ -65,7 +65,7 @@ class Galanz extends BaseController
 
         $endTime = date("Y/m/d", strtotime($nowTime) + 86400);
 
-        $orders = $this->SourceGalanz->SearchOrder('', '', $startTime, $endTime);
+        $orders = $this->SourceGalanz->SearchOrder('', '', '', '', '', $startTime, $endTime);
 
         if (empty($orders)) {
             return false;

application/libraries/Receive/ReceiveGalanz.php

@@ -33,8 +33,28 @@ class ReceiveGalanz extends Receive
 
     public function CheckSearchOrderValues()
     {
-        $fileds = ['mobile'];
-        $this->CheckValues($fileds);
+//        $fileds = ['custmobile'];
+//        $this->CheckValues($fileds);
+
+        $dfields = [
+            'name',
+            'custmobile',
+            'finishstatus',
+            'acceptstatus',
+            'callintype',
+            'starttime',
+            'endtime',
+            'isreminder'
+        ];
+        $this->SetDefaultValues($dfields);
+
+        if ($this->values['starttime']) {
+            $this->values['starttime'] = date('Y/m/d', strtotime($this->values['starttime']));
+        }
+
+        if ($this->values['endtime']) {
+            $this->values['endtime'] = date('Y/m/d', strtotime($this->values['endtime']));
+        }
     }
 
     public function CheckSearchWorkOrderValues()

application/libraries/Source/SourceGalanz.php

@@ -182,13 +182,17 @@ class SourceGalanz extends Source
 
     /**
      * 派工单搜索
-     * @param string $new_name
-     * @param string $mobile
-     * @param string $startTime
-     * @param string $endTime
+     * @param string $name 受理单号: CALL2015052002491
+     * @param string $custtel 联系号码: 18611112222
+     * @param string $finishStatus 	是否完成: 0:否; 1:是
+     * @param string $isAccept 是否接受: 1:是 2:否; 3:未处理
+     * @param string $callintype 受理类型: 1:咨询; 2:报修; 3:投诉; 4:安装; 5:建议; 6:移机
+     * @param string $startTime 开始时间,格式:2016/08/05
+     * @param string $endTime 结束时间,格式:同上
+     * @param string $isreminder 是否催单: 0:否; 1:是
      * @return array
      */
-    public function SearchOrder($new_name = '', $mobile = '', $startTime = '', $endTime = '')
+    public function SearchOrder($name='', $custtel='', $finishStatus='', $isAccept='', $callintype='', $startTime='', $endTime='', $isreminder='')
     {
         $post = [
             '__EVENTTARGET' => 'ctl00$ContentQuery$btnQuery',
@@ -199,18 +203,18 @@ class SourceGalanz extends Source
             'ctl00$ContentQuery$hidMainId' => '',
             'ctl00$ContentQuery$hidAttrCode' => '',
             'ctl00$ContentQuery$hidMainIdName' => '',
-            'ctl00$ContentQuery$new_name' => $new_name,
+            'ctl00$ContentQuery$new_name' => $name,
             'ctl00$ContentQuery$new_custname' => '',
-            'ctl00$ContentQuery$ddlfinishstatus' => '',
+            'ctl00$ContentQuery$ddlfinishstatus' => $finishStatus,
             'ctl00$ContentQuery$startTime' => $startTime,
             'ctl00$ContentQuery$endTime' => $endTime,
-            'ctl00$ContentQuery$ddlIsAccept' => '',
-            'ctl00$ContentQuery$new_custtel' => $mobile,
+            'ctl00$ContentQuery$ddlIsAccept' => $isAccept,
+            'ctl00$ContentQuery$new_custtel' => $custtel,
             'ctl00$ContentQuery$new_address' => '',
-            'ctl00$ContentQuery$ddlcallintype' => '',
-            'ctl00$ContentQuery$new_isReminder' => '',
+            'ctl00$ContentQuery$ddlcallintype' => $callintype,
+            'ctl00$ContentQuery$new_isReminder' => $isreminder,
             'ctl00$ContentQuery$new_ServicePersonnel' => '',
-            'ctl00$ContentData$PagerToolBar1$ctl00' => 500,
+            'ctl00$ContentData$PagerToolBar1$ctl00' => 50,
             'ctl00$ContentData$PagerToolBar1$ctl05' => 1
         ];