Commit a73e2dd7 authored by mlchun's avatar mlchun

1.订单表添加字段:坐标

parent 018b6ce3
...@@ -31,6 +31,9 @@ public class PensionOrderDTO implements Serializable { ...@@ -31,6 +31,9 @@ public class PensionOrderDTO implements Serializable {
@ApiModelProperty(value = "订单状态名称") @ApiModelProperty(value = "订单状态名称")
private String statusName; private String statusName;
@ApiModelProperty(value = "定位坐标")
private String location;
@ApiModelProperty(value = "详细地址") @ApiModelProperty(value = "详细地址")
private String address; private String address;
......
...@@ -35,6 +35,10 @@ public class PensionOrderEntity extends BaseEntity { ...@@ -35,6 +35,10 @@ public class PensionOrderEntity extends BaseEntity {
* 详细地址 * 详细地址
*/ */
private String address; private String address;
/**
* 定位坐标
*/
private String location;
/** /**
* 订单所属的服务id * 订单所属的服务id
*/ */
......
...@@ -27,7 +27,7 @@ public class SwaggerConfig { ...@@ -27,7 +27,7 @@ public class SwaggerConfig {
@Bean @Bean
public Docket createRestApi() { public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2) return new Docket(DocumentationType.SWAGGER_2)
.host("byyl.zjhmit.com") // .host("byyl.zjhmit.com")
.apiInfo(apiInfo()) .apiInfo(apiInfo())
.select() .select()
//加了ApiOperation注解的类,才生成接口文档 //加了ApiOperation注解的类,才生成接口文档
......
...@@ -37,6 +37,9 @@ public class PensionOrderDTO implements Serializable { ...@@ -37,6 +37,9 @@ public class PensionOrderDTO implements Serializable {
@ApiModelProperty(value = "详细地址") @ApiModelProperty(value = "详细地址")
private String address; private String address;
@ApiModelProperty(value = "定位坐标")
private String location;
@ApiModelProperty(value = "订单所属的服务id") @ApiModelProperty(value = "订单所属的服务id")
private Long serviceId; private Long serviceId;
......
...@@ -35,6 +35,10 @@ public class PensionOrderEntity extends BaseEntity { ...@@ -35,6 +35,10 @@ public class PensionOrderEntity extends BaseEntity {
* 详细地址 * 详细地址
*/ */
private String address; private String address;
/**
* 定位坐标
*/
private String location;
/** /**
* 订单所属的服务id * 订单所属的服务id
*/ */
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<select id="getOrderInfoByIdAndStatus" resultType="io.hmit.modules.serviceOrder.entity.PensionOrderEntity"> <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, 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.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.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 po.creator, po.creator_name, po.creator_tel, po.create_date
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<select id="getOrderPageByStatusOrUserId" resultType="io.hmit.modules.serviceOrder.dto.PensionOrderDTO"> <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, 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.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.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, po.creator, po.creator_name, po.creator_tel, po.create_date,
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<select id="getOrderInfoByIdAndUserIdOrStatus" resultType="io.hmit.modules.serviceOrder.dto.PensionOrderDTO"> <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, 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.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.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, po.creator, po.creator_name, po.creator_tel, po.create_date,
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
<select id="getTodayNoProceedOrderPage" resultType="io.hmit.modules.serviceOrder.dto.PensionOrderDTO"> <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, 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.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.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, po.creator, po.creator_name, po.creator_tel, po.create_date,
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
<select id="getElderTodayOrderPage" resultType="io.hmit.modules.serviceOrder.dto.PensionOrderDTO"> <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, 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.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.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, po.creator, po.creator_name, po.creator_tel, po.create_date,
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<select id="getElderAllOrderOrByStatusList" resultType="io.hmit.modules.serviceOrder.dto.PensionOrderDTO"> <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, 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.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.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, po.creator, po.creator_name, po.creator_tel, po.create_date,
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
<select id="getAllOrderByCommunityUserIdPage" resultType="io.hmit.modules.serviceOrder.dto.PensionOrderDTO"> <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, 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.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.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, po.creator, po.creator_name, po.creator_tel, po.create_date,
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
<select id="getElderAllOrderByCommunityUserIdPage" resultType="io.hmit.modules.serviceOrder.dto.PensionOrderDTO"> <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, 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.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.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, po.creator, po.creator_name, po.creator_tel, po.create_date,
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
<select id="getAllOrderByServiceId" resultType="io.hmit.modules.serviceOrder.dto.PensionOrderDTO"> <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, 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.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.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, po.creator, po.creator_name, po.creator_tel, po.create_date,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment