Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
weixiuhui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
蒋林
weixiuhui
Commits
8b4603af
Commit
8b4603af
authored
Sep 23, 2016
by
蒋林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. 搜索派工单接口
2. 搜索系列接口返回值处理
parent
11ec6a8b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
189 additions
and
22 deletions
+189
-22
Galanz.php
application/controllers/api/Galanz.php
+42
-21
ReceiveGalanz.php
application/libraries/Receive/ReceiveGalanz.php
+6
-0
SourceGalanz.php
application/libraries/Source/SourceGalanz.php
+141
-1
No files found.
application/controllers/api/Galanz.php
View file @
8b4603af
...
@@ -81,6 +81,25 @@ class Galanz extends BaseController
...
@@ -81,6 +81,25 @@ class Galanz extends BaseController
$obj
->
ReturnMessage
(
true
,
''
,
$order
);
$obj
->
ReturnMessage
(
true
,
''
,
$order
);
}
}
//搜索派工单
public
function
searchOrder
()
{
$param
=
$this
->
input
->
post
();
//验证参数
$obj
=
$this
->
receiveGalanzObj
();
$obj
->
SetValues
(
$param
);
$obj
->
CheckSearchOrderValues
();
$values
=
$obj
->
GetValues
();
$this
->
saveLog
(
''
,
'searchOrder'
,
$param
);
$sourceGalanzObj
=
$this
->
sourceGalanzObj
(
$values
[
'account'
],
$values
[
'pwd'
]);
$result
=
$sourceGalanzObj
->
SearchOrder
(
''
,
$values
[
'mobile'
]);
$result
=
$sourceGalanzObj
->
HandelSearchOrderFields
(
$result
,
'call'
);
$obj
->
ReturnMessage
(
true
,
''
,
$result
);
}
//搜索维修单
//搜索维修单
public
function
searchWorkOrder
()
public
function
searchWorkOrder
()
{
{
...
@@ -91,22 +110,23 @@ class Galanz extends BaseController
...
@@ -91,22 +110,23 @@ class Galanz extends BaseController
$obj
->
SetValues
(
$param
);
$obj
->
SetValues
(
$param
);
$obj
->
CheckSearchWorkOrderValues
();
$obj
->
CheckSearchWorkOrderValues
();
$values
=
$obj
->
GetValues
();
$values
=
$obj
->
GetValues
();
$this
->
saveLog
(
$values
[
'mobile'
],
'
queryUserProfile
Order'
,
$param
);
$this
->
saveLog
(
$values
[
'mobile'
],
'
searchWork
Order'
,
$param
);
$sourceGalanzObj
=
$this
->
sourceGalanzObj
(
$values
[
'account'
],
$values
[
'pwd'
]);
$sourceGalanzObj
=
$this
->
sourceGalanzObj
(
$values
[
'account'
],
$values
[
'pwd'
]);
$result
=
$sourceGalanzObj
->
SearchWorkOrder
(
''
,
$values
[
'mobile'
]);
$result
=
$sourceGalanzObj
->
SearchWorkOrder
(
''
,
$values
[
'mobile'
]);
$result
=
$sourceGalanzObj
->
HandelSearchOrderFields
(
$result
,
'work'
);
$list
=
[];
//
$list = [];
if
(
$result
)
{
//
if ($result) {
foreach
(
$result
as
$k
=>
$v
)
{
//
foreach ($result as $k => $v) {
$temp
=
$sourceGalanzObj
->
WorkOrderDetail
(
$v
[
0
]);
//
$temp = $sourceGalanzObj->WorkOrderDetail($v[0]);
$temp
=
$this
->
diffOrder
(
$temp
,
'__VIEWSTATE,machine,fault,parts'
);
//
$temp = $this->diffOrder($temp, '__VIEWSTATE,machine,fault,parts');
//
$list
[]
=
$temp
;
//
$list[] = $temp;
}
//
}
}
//
}
$obj
->
ReturnMessage
(
true
,
''
,
$
lis
t
);
$obj
->
ReturnMessage
(
true
,
''
,
$
resul
t
);
}
}
public
function
searchUserProfieOrder
()
public
function
searchUserProfieOrder
()
...
@@ -122,18 +142,19 @@ class Galanz extends BaseController
...
@@ -122,18 +142,19 @@ class Galanz extends BaseController
$sourceGalanzObj
=
$this
->
sourceGalanzObj
(
$values
[
'account'
],
$values
[
'pwd'
]);
$sourceGalanzObj
=
$this
->
sourceGalanzObj
(
$values
[
'account'
],
$values
[
'pwd'
]);
$result
=
$sourceGalanzObj
->
SearchUserProfieOrder
(
$values
[
'mobile'
]);
$result
=
$sourceGalanzObj
->
SearchUserProfieOrder
(
$values
[
'mobile'
]);
$result
=
$sourceGalanzObj
->
HandelSearchOrderFields
(
$result
,
'userprofile'
);
$list
=
[];
//
$list = [];
if
(
$result
)
{
//
if ($result) {
foreach
(
$result
as
$k
=>
$v
)
{
//
foreach ($result as $k => $v) {
$temp
=
$sourceGalanzObj
->
UserProfileOrderDetail
(
$v
[
0
]);
//
$temp = $sourceGalanzObj->UserProfileOrderDetail($v[0]);
$temp
=
$this
->
diffOrder
(
$temp
,
'__VIEWSTATE,products'
);
//
$temp = $this->diffOrder($temp, '__VIEWSTATE,products');
//
$list
[]
=
$temp
;
//
$list[] = $temp;
}
//
}
}
//
}
$obj
->
ReturnMessage
(
true
,
''
,
$
lis
t
);
$obj
->
ReturnMessage
(
true
,
''
,
$
resul
t
);
}
}
//保存订单
//保存订单
...
...
application/libraries/Receive/ReceiveGalanz.php
View file @
8b4603af
...
@@ -31,6 +31,12 @@ class ReceiveGalanz extends Receive
...
@@ -31,6 +31,12 @@ class ReceiveGalanz extends Receive
$this
->
CheckValues
(
$fileds
);
$this
->
CheckValues
(
$fileds
);
}
}
public
function
CheckSearchOrderValues
()
{
$fileds
=
[
'mobile'
];
$this
->
CheckValues
(
$fileds
);
}
public
function
CheckSearchWorkOrderValues
()
public
function
CheckSearchWorkOrderValues
()
{
{
$fileds
=
[
'mobile'
];
$fileds
=
[
'mobile'
];
...
...
application/libraries/Source/SourceGalanz.php
View file @
8b4603af
...
@@ -312,6 +312,146 @@ class SourceGalanz extends Source
...
@@ -312,6 +312,146 @@ class SourceGalanz extends Source
return
$orders
;
return
$orders
;
}
}
/**
* 处理订单搜索返回信息
* @param $list
* @param string $type
* @return array
*/
public
function
HandelSearchOrderFields
(
$list
,
$type
=
'call'
)
{
if
(
empty
(
$list
))
{
return
$list
;
}
$fileds
=
[];
$typeName
=
''
;
switch
(
$type
)
{
case
'call'
:
$typeName
=
'派工单'
;
$fileds
=
[
'new_id'
,
'new_name'
,
'new_reminder'
,
'new_callintype'
,
'new_finishstatus'
,
'new_acceptstatus'
,
'new_sentstatus'
,
'new_custname'
,
'new_custmobile'
,
'new_custtel'
,
'new_cityidName'
,
'new_countyidname'
,
'new_townidName'
,
'new_address'
,
'new_producttype'
,
'new_productqty'
,
'new_installdate'
,
'new_installsiteidname'
,
'new_dispatchingsiteidname'
,
'new_ServicePersonnel'
,
'new_custdescription'
,
'new_callintime'
,
'new_siteaccepttime'
,
'new_sitecontacttime'
,
'new_siteappointmenttime'
,
'new_actualvisittime'
,
'new_finishtime'
,
'new_unfinishreason'
,
'new_remarks'
,
'new_sitedealremarks'
,
];
break
;
case
'work'
:
$typeName
=
'维修单'
;
$fileds
=
[
'new_id'
,
'new_number'
,
'new_name'
,
'new_productgroupidName'
,
'new_custname'
,
'new_custmobile'
,
'new_custtel'
,
'new_insidemachinetype'
,
'new_insidemachinenumber'
,
'new_outsidemachinetype'
,
'new_outsidemachinenumber'
,
'hidnew_modelnumber'
,
'txtproducenumber'
,
'new_errormoduleidName'
,
'new_errordesc'
,
'new_errorgroupidName'
,
'new_causedesc'
,
'new_srv_errorsolutionidName'
,
'new_solutiondesc'
,
'new_provinceidName'
,
'new_cityidName'
,
'new_address'
,
'new_isguaranty'
,
'new_ischangepart'
,
'new_returnfactory'
,
'new_baseamount'
,
'new_mileamount'
,
'new_repairapply'
,
'new_approvalstatus'
,
'new_investstatus'
,
'new_time'
,
'new_finishtime'
,
'new_sendtime'
,
];
break
;
case
'userprofile'
:
$typeName
=
'安装单'
;
$fileds
=
[
'new_id'
,
'new_name'
,
'new_number'
,
'new_contactname'
,
'new_mobile'
,
'new_telephone'
,
'new_insidemachinetype'
,
'new_insidemachinenumber'
,
'new_outsidemachinetype'
,
'new_outsidemachinenumber'
,
'producenumber'
,
'productname'
,
'new_province_idName'
,
'new_city_idName'
,
'new_county_idName'
,
'new_town_idName'
,
'new_accountaddr'
,
'new_broughtdate'
,
'new_installdate'
,
'new_isuseful'
,
'new_sendtime'
,
'new_inputtime'
,
'zhuangtai_name'
,
'new_investstatus'
,
'ddlisreplacesettle'
,
'isamount'
,
'ifamount'
,
'new_installer'
,
'new_settletime'
,
];
break
;
}
$result
=
[];
$filedsLen
=
count
(
$fileds
);
foreach
(
$list
as
$k
=>
$v
)
{
$tempLen
=
count
(
$v
);
if
(
$filedsLen
==
$tempLen
)
{
$result
[]
=
array_combine
(
$fileds
,
$v
);
}
else
{
return_msg
(
false
,
"
{
$typeName
}
表格有更改"
);
}
}
return
$result
;
}
/**
/**
* 处理搜索订单业务
* 处理搜索订单业务
* @param $url
* @param $url
...
@@ -2328,7 +2468,7 @@ class SourceGalanz extends Source
...
@@ -2328,7 +2468,7 @@ class SourceGalanz extends Source
*/
*/
private
function
TableTdPreg
(
$tr
)
private
function
TableTdPreg
(
$tr
)
{
{
preg_match_all
(
'/<td[^>]*>[\s\S]
+
?<\/td>/'
,
$tr
,
$td
);
preg_match_all
(
'/<td[^>]*>[\s\S]
*
?<\/td>/'
,
$tr
,
$td
);
foreach
(
$td
[
0
]
as
$kk
=>
$vv
)
{
foreach
(
$td
[
0
]
as
$kk
=>
$vv
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment