|
|
@@ -395,6 +395,7 @@
|
|
|
<result column="techSatisfaction" property="techSatisfaction" />
|
|
|
<result column="businessSatisfaction" property="businessSatisfaction" />
|
|
|
<result column="add_group_chat" property="addGroupChat" />
|
|
|
+ <result column="add_group_chat_time" property="addGroupChatTime" />
|
|
|
<association column="orderNo" javaType="java.util.ArrayList" property="list" select="getTask" />
|
|
|
</resultMap>
|
|
|
|
|
|
@@ -408,6 +409,7 @@
|
|
|
<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(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,6 +444,9 @@
|
|
|
<if test="addGroupChat != null">
|
|
|
and c.add_group_chat = #{addGroupChat}
|
|
|
</if>
|
|
|
+ <if test="addGroupChatTimeStart != null">
|
|
|
+ and c.add_group_chat_time BETWEEN #{addGroupChatTimeStart} and #{addGroupChatTimeEnd}
|
|
|
+ </if>
|
|
|
order by c.new_time,a.create_time
|
|
|
<if test="page_sql != null">
|
|
|
${page_sql}
|
|
|
@@ -481,6 +486,9 @@
|
|
|
<if test="addGroupChat != null">
|
|
|
and c.add_group_chat = #{addGroupChat}
|
|
|
</if>
|
|
|
+ <if test="addGroupChatTimeStart != null">
|
|
|
+ and c.add_group_chat_time BETWEEN #{addGroupChatTimeStart} and #{addGroupChatTimeEnd}
|
|
|
+ </if>
|
|
|
</select>
|
|
|
|
|
|
</mapper>
|