Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
pension
Project
Project
Details
Activity
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
mengmeng
pension
Commits
a73e2dd7
Commit
a73e2dd7
authored
Mar 11, 2021
by
mlchun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.订单表添加字段:坐标
parent
018b6ce3
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
24 additions
and
10 deletions
+24
-10
PensionOrderDTO.java
...ava/io/hmit/modules/serviceOrder/dto/PensionOrderDTO.java
+3
-0
PensionOrderEntity.java
.../hmit/modules/serviceOrder/entity/PensionOrderEntity.java
+4
-0
SwaggerConfig.java
hmit-api/src/main/java/io/hmit/config/SwaggerConfig.java
+1
-1
PensionOrderDTO.java
...ava/io/hmit/modules/serviceOrder/dto/PensionOrderDTO.java
+3
-0
PensionOrderEntity.java
.../hmit/modules/serviceOrder/entity/PensionOrderEntity.java
+4
-0
PensionOrderDao.xml
...rc/main/resources/mapper/serviceOrder/PensionOrderDao.xml
+9
-9
No files found.
hmit-admin/src/main/java/io/hmit/modules/serviceOrder/dto/PensionOrderDTO.java
View file @
a73e2dd7
...
...
@@ -31,6 +31,9 @@ public class PensionOrderDTO implements Serializable {
@ApiModelProperty
(
value
=
"订单状态名称"
)
private
String
statusName
;
@ApiModelProperty
(
value
=
"定位坐标"
)
private
String
location
;
@ApiModelProperty
(
value
=
"详细地址"
)
private
String
address
;
...
...
hmit-admin/src/main/java/io/hmit/modules/serviceOrder/entity/PensionOrderEntity.java
View file @
a73e2dd7
...
...
@@ -35,6 +35,10 @@ public class PensionOrderEntity extends BaseEntity {
* 详细地址
*/
private
String
address
;
/**
* 定位坐标
*/
private
String
location
;
/**
* 订单所属的服务id
*/
...
...
hmit-api/src/main/java/io/hmit/config/SwaggerConfig.java
View file @
a73e2dd7
...
...
@@ -27,7 +27,7 @@ public class SwaggerConfig {
@Bean
public
Docket
createRestApi
()
{
return
new
Docket
(
DocumentationType
.
SWAGGER_2
)
.
host
(
"byyl.zjhmit.com"
)
//
.host("byyl.zjhmit.com")
.
apiInfo
(
apiInfo
())
.
select
()
//加了ApiOperation注解的类,才生成接口文档
...
...
hmit-api/src/main/java/io/hmit/modules/serviceOrder/dto/PensionOrderDTO.java
View file @
a73e2dd7
...
...
@@ -37,6 +37,9 @@ public class PensionOrderDTO implements Serializable {
@ApiModelProperty
(
value
=
"详细地址"
)
private
String
address
;
@ApiModelProperty
(
value
=
"定位坐标"
)
private
String
location
;
@ApiModelProperty
(
value
=
"订单所属的服务id"
)
private
Long
serviceId
;
...
...
hmit-api/src/main/java/io/hmit/modules/serviceOrder/entity/PensionOrderEntity.java
View file @
a73e2dd7
...
...
@@ -35,6 +35,10 @@ public class PensionOrderEntity extends BaseEntity {
* 详细地址
*/
private
String
address
;
/**
* 定位坐标
*/
private
String
location
;
/**
* 订单所属的服务id
*/
...
...
hmit-api/src/main/resources/mapper/serviceOrder/PensionOrderDao.xml
View file @
a73e2dd7
...
...
@@ -33,7 +33,7 @@
<select
id=
"getOrderInfoByIdAndStatus"
resultType=
"io.hmit.modules.serviceOrder.entity.PensionOrderEntity"
>
SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
po.location,
po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
po.creator, po.creator_name, po.creator_tel, po.create_date
...
...
@@ -43,7 +43,7 @@
<select
id=
"getOrderPageByStatusOrUserId"
resultType=
"io.hmit.modules.serviceOrder.dto.PensionOrderDTO"
>
SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
po.location,
po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
po.creator, po.creator_name, po.creator_tel, po.create_date,
...
...
@@ -69,7 +69,7 @@
<select
id=
"getOrderInfoByIdAndUserIdOrStatus"
resultType=
"io.hmit.modules.serviceOrder.dto.PensionOrderDTO"
>
SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
po.location,
po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
po.creator, po.creator_name, po.creator_tel, po.create_date,
...
...
@@ -86,7 +86,7 @@
<select
id=
"getTodayNoProceedOrderPage"
resultType=
"io.hmit.modules.serviceOrder.dto.PensionOrderDTO"
>
SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
po.location,
po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
po.creator, po.creator_name, po.creator_tel, po.create_date,
...
...
@@ -97,7 +97,7 @@
<select
id=
"getElderTodayOrderPage"
resultType=
"io.hmit.modules.serviceOrder.dto.PensionOrderDTO"
>
SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
po.location,
po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
po.creator, po.creator_name, po.creator_tel, po.create_date,
...
...
@@ -108,7 +108,7 @@
<select
id=
"getElderAllOrderOrByStatusList"
resultType=
"io.hmit.modules.serviceOrder.dto.PensionOrderDTO"
>
SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
po.location,
po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
po.creator, po.creator_name, po.creator_tel, po.create_date,
...
...
@@ -122,7 +122,7 @@
<select
id=
"getAllOrderByCommunityUserIdPage"
resultType=
"io.hmit.modules.serviceOrder.dto.PensionOrderDTO"
>
SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
po.location,
po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
po.creator, po.creator_name, po.creator_tel, po.create_date,
...
...
@@ -133,7 +133,7 @@
<select
id=
"getElderAllOrderByCommunityUserIdPage"
resultType=
"io.hmit.modules.serviceOrder.dto.PensionOrderDTO"
>
SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
po.location,
po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
po.creator, po.creator_name, po.creator_tel, po.create_date,
...
...
@@ -145,7 +145,7 @@
<select
id=
"getAllOrderByServiceId"
resultType=
"io.hmit.modules.serviceOrder.dto.PensionOrderDTO"
>
SELECT po.id, po.order_num, po.status, po.status_name, po.address, po.service_id, po.service_name,
po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
po.appointment_person, po.appointment_phone, po.appointment_time, po.remark,
po.location,
po.order_recipient_id, po.order_recipient_name, po.order_recipient_time, po.order_recipient_phone,
po.act_price, po.community_name, po.community_id, po.dept_id, po.cancel_reason,
po.creator, po.creator_name, po.creator_tel, po.create_date,
...
...
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