Browse Source

科技服务订单新增特批与特批状态筛选

anderx 7 years ago
parent
commit
8d156b2c1c

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

@@ -1091,9 +1091,12 @@
 		<if test="orderChannel != null">
 			and a.order_channel = #{orderChannel,jdbcType=INTEGER}
 		</if>
-		<if test="approval != null">
+		<if test="approval != null and approval !=4">
 			and a.approval = #{approval,jdbcType=INTEGER}
 		</if>
+		<if test="approval ==4">
+			and a.approval != 0
+		</if>
 		<if test="buyerName != null and buyerName != ''">
 			and b.nickname like concat('%', #{buyerName},'%')
 		</if>

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

@@ -865,6 +865,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	private Map<String,Object> disposeParams(OrderListBo bo,String startDate,String endDate){
 		Map<String,Object> params = new HashMap<>();
 		if(StringUtils.isNotBlank(bo.getBuyerName())) params.put("buyerName", bo.getBuyerName());
+		if(null!=bo.getApproval()) params.put("approval", bo.getApproval());
 		if(StringUtils.isNotBlank(bo.getSalesmanName())) params.put("salesmanName", bo.getSalesmanName());
 		if(StringUtils.isNotBlank(startDate)) params.put("startDate", startDate +" 00:00:00");
 		if(StringUtils.isNotBlank(endDate)) params.put("endDate", endDate + "23:59:59");