Commit 37e4a8a1 by huluobin

update

parent 6b1dfec8
...@@ -85,9 +85,10 @@ public interface StoreDataMapper extends BaseMapper<StoreData> { ...@@ -85,9 +85,10 @@ public interface StoreDataMapper extends BaseMapper<StoreData> {
*/ */
Integer queryTotalAgainOrderNum(@Param("departmentId") Integer departmentId, @Param("month") String month); Integer queryTotalAgainOrderNum(@Param("departmentId") Integer departmentId, @Param("month") String month);
@Deprecated
BigDecimal queryMonthOrderServeAmount(@Param("serveType") Integer serveType, @Param("month") String month); BigDecimal queryMonthOrderServeAmount(@Param("serveType") Integer serveType, @Param("month") String month);
List<StoreTradeAmount> storeTradeAmount(@Param("month") String month, @Param("departmentId") Integer departmentId); List<StoreTradeAmount> storeTradeAmount(@Param("month") String month, @Param("departmentId") Integer departmentId);
List<StoreTechnicianAchieve> storeTechnicianAchieve(String month); List<StoreTechnicianAchieve> storeTechnicianAchieve(String month);
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
<result column="create_time" property="createTime"/> <result column="create_time" property="createTime"/>
<result column="status" property="status"/> <result column="status" property="status"/>
<result column="technician_id" property="technicianId"/> <result column="technician_id" property="technicianId"/>
<result column="departmentName" property="departmentName"/> <result column="departmentName" property="departmentName"/>
<result column="orderNo" property="orderNo"/> <result column="orderNo" property="orderNo"/>
<association property="storeTechnician" <association property="storeTechnician"
...@@ -59,12 +58,30 @@ ...@@ -59,12 +58,30 @@
<result column="label_name" property="name"></result> <result column="label_name" property="name"></result>
</resultMap> </resultMap>
<sql id="orderCommentSql"> <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>
<sql id="orderServeSql"> <sql id="orderServeSql">
orser.id orser_id, orser.order_id orser_order_id, orser.create_time orser_create_time, orser.id orser_id,
orser.produce_name orser_produce_name, orser.serve_change_price orser_serve_change_price, orser.serve_price orser_serve_price, orser.order_id orser_order_id,
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.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>
<sql id="serveSql"> <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 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 @@ ...@@ -87,4 +104,13 @@
where oc.technician_id = #{technicianId} where oc.technician_id = #{technicianId}
order by create_time desc order by create_time desc
</select> </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> </mapper>
...@@ -95,13 +95,13 @@ ...@@ -95,13 +95,13 @@
<select id="queryMonthPraisePercent" resultType="java.lang.Double"> <select id="queryMonthPraisePercent" resultType="java.lang.Double">
SELECT (SELECT count(id) SELECT (SELECT count(id)
from order_comment from order_comment
where technician_id = 127 where technician_id = #{id}
and level &gt;= 3 and level &gt;= 3
and finish_time &gt; #{month}) and finish_time &gt; #{month})
/ /
(SELECT count(id) (SELECT count(id)
from order_comment from order_comment
where technician_id = 127 where technician_id = #{id}
) )
</select> </select>
......
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