Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gogirl-miniapp-backend
Overview
Overview
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
huluobin
gogirl-miniapp-backend
Commits
37e4a8a1
Commit
37e4a8a1
authored
Mar 23, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
6b1dfec8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
8 deletions
+35
-8
StoreDataMapper.java
...rl/infrastructure/mapper/store/store/StoreDataMapper.java
+2
-1
OrderCommentMapper.xml
src/main/resources/mapper/order/OrderCommentMapper.xml
+31
-5
CareerMapper.xml
src/main/resources/mapper/store/CareerMapper.xml
+2
-2
No files found.
src/main/java/com/gogirl/infrastructure/mapper/store/store/StoreDataMapper.java
View file @
37e4a8a1
...
...
@@ -85,9 +85,10 @@ public interface StoreDataMapper extends BaseMapper<StoreData> {
*/
Integer
queryTotalAgainOrderNum
(
@Param
(
"departmentId"
)
Integer
departmentId
,
@Param
(
"month"
)
String
month
);
@Deprecated
BigDecimal
queryMonthOrderServeAmount
(
@Param
(
"serveType"
)
Integer
serveType
,
@Param
(
"month"
)
String
month
);
List
<
StoreTradeAmount
>
storeTradeAmount
(
@Param
(
"month"
)
String
month
,
@Param
(
"departmentId"
)
Integer
departmentId
);
List
<
StoreTechnicianAchieve
>
storeTechnicianAchieve
(
String
month
);
...
...
src/main/resources/mapper/order/OrderCommentMapper.xml
View file @
37e4a8a1
...
...
@@ -16,7 +16,6 @@
<result
column=
"create_time"
property=
"createTime"
/>
<result
column=
"status"
property=
"status"
/>
<result
column=
"technician_id"
property=
"technicianId"
/>
<result
column=
"departmentName"
property=
"departmentName"
/>
<result
column=
"orderNo"
property=
"orderNo"
/>
<association
property=
"storeTechnician"
...
...
@@ -59,12 +58,30 @@
<result
column=
"label_name"
property=
"name"
></result>
</resultMap>
<sql
id=
"orderCommentSql"
>
oc.id, oc.order_id, oc.order_serve_id, oc.user_id, oc.level, oc.remark, oc.picture_path, oc.label_sticker, oc.finish_time, oc.create_time, oc.status, oc.technician_id
oc.id,
oc.order_id,
oc.order_serve_id,
oc.user_id,
oc.level,
oc.remark,
oc.picture_path,
oc.label_sticker,
oc.finish_time,
oc.create_time,
oc.status,
oc.technician_id
</sql>
<sql
id=
"orderServeSql"
>
orser.id orser_id, orser.order_id orser_order_id, orser.create_time orser_create_time,
orser.produce_name orser_produce_name, orser.serve_change_price orser_serve_change_price, orser.serve_price orser_serve_price,
orser.end_time orser_end_time, orser.start_time orser_start_time, orser.execution_status orser_execution_status,orser.comment_score orser_comment_score
orser.id orser_id,
orser.order_id orser_order_id,
orser.create_time orser_create_time,
orser.produce_name orser_produce_name,
orser.serve_change_price orser_serve_change_price,
orser.serve_price orser_serve_price,
orser.end_time orser_end_time,
orser.start_time orser_start_time,
orser.execution_status orser_execution_status,
orser.comment_score orser_comment_score
</sql>
<sql
id=
"serveSql"
>
ser.id ser_id, ser.name ser_name,ser.type ser_type, ser.label ser_label, ser.shop_sort ser_shop_sort, ser.price ser_price, ser.picture_path ser_picture_path, ser.status ser_status, ser.remark ser_remark, ser.details ser_details, ser.service_duration ser_service_duration
...
...
@@ -87,4 +104,13 @@
where oc.technician_id = #{technicianId}
order by create_time desc
</select>
<!--result map子查询-->
<select
id=
"queryListOrderCommentLabel"
resultType=
"com.gogirl.domain.order.serve.OrderCommentLabel"
>
select t2.*
from order_comment t1
left join order_comment_label t2 on find_in_set(t2.id, t1.label_sticker)
where t1.id = #{id}
</select>
</mapper>
src/main/resources/mapper/store/CareerMapper.xml
View file @
37e4a8a1
...
...
@@ -95,13 +95,13 @@
<select
id=
"queryMonthPraisePercent"
resultType=
"java.lang.Double"
>
SELECT (SELECT count(id)
from order_comment
where technician_id =
127
where technician_id =
#{id}
and level
>
= 3
and finish_time
>
#{month})
/
(SELECT count(id)
from order_comment
where technician_id =
127
where technician_id =
#{id}
)
</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