|
|
@@ -408,8 +408,9 @@
|
|
|
|
|
|
<select id="OrderUseServiceList" resultMap="userService">
|
|
|
select a.order_no orderNo,a.contract_no contractNo,b.dep_name depName ,a.buyer_id uid,a.create_time ,b.buyer_name userName,c.new_time ,
|
|
|
- date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as orderTimes, date_format(c.new_time,'%Y-%m-%d %H:%i:%S') as newTimes,c.add_group_chat,
|
|
|
- c.add_group_chat_time ,
|
|
|
+ date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as orderTimes, date_format(c.new_time,'%Y-%m-%d %H:%i:%S') as newTimes
|
|
|
+ ,b.add_group_chat,
|
|
|
+ b.add_group_chat_time ,
|
|
|
date_format(c.renewal_time,'%Y-%m-%d') as renewalTimes, date_format(a.sign_time,'%Y-%m-%d') as signTimes,a.delete_sign deleteSign ,
|
|
|
d.name adminName,c.add_wechat addWechat,c.wechat ,c.renewal ,c.renewal_time ,c.sign_project signProject ,c.remarks,
|
|
|
c.tech_satisfaction techSatisfaction, c.business_satisfaction businessSatisfaction
|
|
|
@@ -442,10 +443,10 @@
|
|
|
and a.create_time BETWEEN #{startSignTimes} and #{endSignTimes}
|
|
|
</if>
|
|
|
<if test="addGroupChat != null">
|
|
|
- and c.add_group_chat = #{addGroupChat}
|
|
|
+ and b.add_group_chat = #{addGroupChat}
|
|
|
</if>
|
|
|
<if test="addGroupChatTimeStart != null">
|
|
|
- and c.add_group_chat_time BETWEEN #{addGroupChatTimeStart} and #{addGroupChatTimeEnd}
|
|
|
+ and b.add_group_chat_time BETWEEN #{addGroupChatTimeStart} and #{addGroupChatTimeEnd}
|
|
|
</if>
|
|
|
order by c.new_time,a.create_time
|
|
|
<if test="page_sql != null">
|
|
|
@@ -484,10 +485,10 @@
|
|
|
and a.create_time BETWEEN #{startSignTimes} and #{endSignTimes}
|
|
|
</if>
|
|
|
<if test="addGroupChat != null">
|
|
|
- and c.add_group_chat = #{addGroupChat}
|
|
|
+ and b.add_group_chat = #{addGroupChat}
|
|
|
</if>
|
|
|
<if test="addGroupChatTimeStart != null">
|
|
|
- and c.add_group_chat_time BETWEEN #{addGroupChatTimeStart} and #{addGroupChatTimeEnd}
|
|
|
+ and b.add_group_chat_time BETWEEN #{addGroupChatTimeStart} and #{addGroupChatTimeEnd}
|
|
|
</if>
|
|
|
</select>
|
|
|
|