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
0c8a2520
Commit
0c8a2520
authored
Jan 28, 2021
by
mlchun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加费用
parent
a9d02fa6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
+10
-3
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
+3
-3
No files found.
hmit-api/src/main/java/io/hmit/modules/serviceOrder/dto/PensionOrderDTO.java
View file @
0c8a2520
...
...
@@ -64,6 +64,9 @@ public class PensionOrderDTO implements Serializable {
@ApiModelProperty
(
value
=
"接单人电话"
)
private
String
orderRecipientPhone
;
@ApiModelProperty
(
value
=
"实际金额"
)
private
String
actPrice
;
@ApiModelProperty
(
value
=
"部门ID"
)
private
Long
deptId
;
...
...
hmit-api/src/main/java/io/hmit/modules/serviceOrder/entity/PensionOrderEntity.java
View file @
0c8a2520
...
...
@@ -75,6 +75,10 @@ public class PensionOrderEntity extends BaseEntity {
* 接单人电话
*/
private
String
orderRecipientPhone
;
/**
* 实际金额
*/
private
String
actPrice
;
/**
* 部门ID
*/
...
...
hmit-api/src/main/resources/mapper/serviceOrder/PensionOrderDao.xml
View file @
0c8a2520
...
...
@@ -36,7 +36,7 @@
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.order_recipient_id,
po.order_recipient_name, po.order_recipient_phone, po.dept_id, po.creator, po.creator_name,
po.creator_tel, po.create_date, po.update_date, ps.icon
po.creator_tel, po.create_date, po.update_date, p
o.act_price, p
s.icon
from pension_order po, pension_service ps
where po.service_id = ps.id
<if
test=
"status != null and status == 0"
>
...
...
@@ -60,7 +60,7 @@
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.order_recipient_id,
po.order_recipient_name, po.order_recipient_phone, po.dept_id, po.creator, po.creator_name,
po.creator_tel, po.create_date, po.update_date, ps.icon
po.creator_tel, po.create_date, po.update_date, p
o.act_price, p
s.icon
from pension_order po, pension_service ps
where po.service_id = ps.id and po.id = #{orderId}
<if
test=
"userId != null"
>
...
...
@@ -75,7 +75,7 @@
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.order_recipient_id,
po.order_recipient_name, po.order_recipient_phone, po.dept_id, po.creator, po.creator_name,
po.creator_tel, po.create_date, po.update_date, ps.icon
po.creator_tel, po.create_date, po.update_date, p
o.act_price, p
s.icon
from pension_order po, pension_service ps
where po.service_id = ps.id and TO_DAYS(appointment_time) = TO_DAYS(NOW()) and po.status = 0 and order_recipient_id IS NULL
</select>
...
...
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