Просмотр исходного кода

营销员恢复时间查询为订单,财务更换成下单时间

anderx лет назад: 7
Родитель
Сommit
b5b33d91b0
1 измененных файлов с 6 добавлено и 6 удалено
  1. 6 6
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

+ 6 - 6
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -874,10 +874,10 @@
   	</if>
 )oo
   	<if test="ob == 1">
-  	order by oo.signTime desc
+  	order by oo.createTime desc
   	</if>
   	<if test="ob == 2">
-  	order by oo.liquidation_status,oo.signTime desc
+  	order by oo.liquidation_status,oo.createTime desc
   	</if>
 	<if test="page_sql != null">
 		${page_sql}
@@ -932,7 +932,7 @@
   	<if test='o.startTime != null and o.startTime != "" and o.endTime != null and o.endTime != ""'>
   	<bind name="a" value="o.startTime + ' 00:00:00'"/>
   	<bind name="b" value="o.endTime + ' 23:59:59'"/>
-  	and o.sign_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
+  	and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
   	</if>
 )oo
   </select>
@@ -1012,7 +1012,7 @@
   select  o.order_no as orderNo, o.sign_time as signTime, u.nickname as buyerName, o.order_status as orderStatus, 
   a.name as sellerName, o.salesman_id as sellerId, o.buyer_id as buyerId, o.liquidation_status as liquidationStatus , 
   ifnull(b.amount,0) as actuallyTotalAmount, o.contract_no as contractNo,
-  o.first_amount as signFirstPayment, o.total_amount as signTotalAmount,a.create_time as createTime,
+  o.first_amount as signFirstPayment, o.total_amount as signTotalAmount,o.create_time as createTime,
   0 as companyId, "湖南科德信息咨询有限公司" as companyName
   	 from t_order_new o 
   	 left join `user` u on o.buyer_id = u.id 
@@ -1169,7 +1169,7 @@
   	and dep.id = #{depId,jdbcType=VARCHAR}
   	</if>
   	<if test="starTime !=null and endTime !=null">
-  	and a.create_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+  	and a.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
   	order by 
   	<if test="specially == 4">
@@ -1247,7 +1247,7 @@
   	and a.order_no = #{orderNo,jdbcType=VARCHAR}
   	</if>
   	<if test="starTime !=null and endTime !=null">
-  	and a.create_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+  	and a.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
   </select>