Browse Source

特批BUG修复

anderx 7 years ago
parent
commit
119e71d341

+ 7 - 1
src/main/java/com/goafanti/common/mapper/TOrderMapper.xml

@@ -1064,6 +1064,9 @@
 			a.technician_id = e.id left join department f on 
 			c.department_id = f.id
 		where a.order_type = 0 and a.delete_sign != 1
+		<if test="deleteStatus==1">
+		and a.delete_sign = 0
+		</if>
 		<if test="orderNo != null">
 			and a.order_no= #{orderNo,jdbcType=VARCHAR}
 		</if>
@@ -1138,7 +1141,10 @@
 			a.finance_id = d.id left join admin e on
 			a.technician_id = e.id left join department f on 
 			c.department_id = f.id
-		where a.order_type = 0
+		where a.order_type = 0 and a.delete_sign != 1
+		<if test="deleteStatus==1">
+		and a.delete_sign = 0
+		</if>
 		<if test="orderNo != null">
 			and a.order_no= #{orderNo,jdbcType=VARCHAR}
 		</if>

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -1317,6 +1317,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		if(bo.getOrderStatus() != null) params.put("orderStatus", bo.getOrderStatus());
 		if(StringUtils.isNotBlank(startDate)) params.put("startDate", startDate);
 		if(StringUtils.isNotBlank(endDate)) params.put("endDate", endDate);
+		params.put("deleteStatus", 1);
 		return  (Pagination<OrderListBo>)findPage("selectServiceOrderByPage","selectServiceOrderCount", 
 				params, pageNo, pageSize);
 	}