Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
50d4be8a
Commit
50d4be8a
authored
Nov 20, 2020
by
hezhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
123
parent
118361d8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
2 deletions
+9
-2
VehiclePublishReceive.java
...m/xxfc/platform/vehicle/entity/VehiclePublishReceive.java
+5
-0
VehiclePublishReceiveDTO.java
...c/platform/vehicle/pojo/dto/VehiclePublishReceiveDTO.java
+1
-1
VehiclePublishReceiveBiz.java
...m/xxfc/platform/vehicle/biz/VehiclePublishReceiveBiz.java
+1
-0
AppVehiclePublishReceiveController.java
...form/vehicle/rest/AppVehiclePublishReceiveController.java
+2
-1
No files found.
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehiclePublishReceive.java
View file @
50d4be8a
...
@@ -75,6 +75,11 @@ public class VehiclePublishReceive implements Serializable {
...
@@ -75,6 +75,11 @@ public class VehiclePublishReceive implements Serializable {
private
Integer
publishGoodsId
;
private
Integer
publishGoodsId
;
@Column
(
name
=
"receive_user_id"
)
@ApiModelProperty
(
value
=
"接单人id"
)
private
Integer
receiveUserId
;
@Column
(
name
=
"receive_company_id"
)
@Column
(
name
=
"receive_company_id"
)
@ApiModelProperty
(
value
=
"接单公司id"
)
@ApiModelProperty
(
value
=
"接单公司id"
)
private
Integer
receiveCompanyId
;
private
Integer
receiveCompanyId
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/dto/VehiclePublishReceiveDTO.java
View file @
50d4be8a
...
@@ -37,7 +37,7 @@ public class VehiclePublishReceiveDTO{
...
@@ -37,7 +37,7 @@ public class VehiclePublishReceiveDTO{
@ApiModelProperty
(
"接单用户Id"
)
@ApiModelProperty
(
"接单用户Id"
)
private
Integer
userId
;
private
Long
userId
;
List
<
Integer
>
ids
;
List
<
Integer
>
ids
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePublishReceiveBiz.java
View file @
50d4be8a
...
@@ -108,6 +108,7 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
...
@@ -108,6 +108,7 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
vehiclePublishReceive
.
setBrandId
(
brandId
);
vehiclePublishReceive
.
setBrandId
(
brandId
);
vehiclePublishReceive
.
setCategoryId
(
categoryId
);
vehiclePublishReceive
.
setCategoryId
(
categoryId
);
vehiclePublishReceive
.
setExtensionList
(
extensionList
);
vehiclePublishReceive
.
setExtensionList
(
extensionList
);
vehiclePublishReceive
.
setReceiveUserId
(
publishReceiveDTO
.
getUserId
());
insertSelective
(
vehiclePublishReceive
);
insertSelective
(
vehiclePublishReceive
);
id
=
vehiclePublishReceive
.
getId
();
id
=
vehiclePublishReceive
.
getId
();
}
else
{
}
else
{
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/AppVehiclePublishReceiveController.java
View file @
50d4be8a
...
@@ -26,13 +26,14 @@ public class AppVehiclePublishReceiveController extends BaseController<VehiclePu
...
@@ -26,13 +26,14 @@ public class AppVehiclePublishReceiveController extends BaseController<VehiclePu
@PostMapping
(
"meet"
)
@PostMapping
(
"meet"
)
@ApiModelProperty
(
"接单"
)
@ApiModelProperty
(
"接单"
)
public
ObjectRestResponse
meet
(
@RequestBody
VehiclePublishReceiveDTO
publishReceiveDTO
)
{
public
ObjectRestResponse
meet
(
@RequestBody
VehiclePublishReceiveDTO
publishReceiveDTO
)
throws
Exception
{
if
(
publishReceiveDTO
.
getCompanyId
()
==
null
||
publishReceiveDTO
.
getCompanyId
()
==
0
){
if
(
publishReceiveDTO
.
getCompanyId
()
==
null
||
publishReceiveDTO
.
getCompanyId
()
==
0
){
List
<
Integer
>
companyIds
=
getBusinessUserCompanyIds
();
List
<
Integer
>
companyIds
=
getBusinessUserCompanyIds
();
if
(
companyIds
!=
null
&&
companyIds
.
size
()
>
0
){
if
(
companyIds
!=
null
&&
companyIds
.
size
()
>
0
){
publishReceiveDTO
.
setCompanyId
(
companyIds
.
get
(
0
));
publishReceiveDTO
.
setCompanyId
(
companyIds
.
get
(
0
));
}
}
}
}
publishReceiveDTO
.
setUserId
(
Long
.
parseLong
(
getUserId
()));
return
ObjectRestResponse
.
succ
(
baseBiz
.
receive
(
publishReceiveDTO
));
return
ObjectRestResponse
.
succ
(
baseBiz
.
receive
(
publishReceiveDTO
));
}
}
...
...
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