Переглянути джерело

我的订单-科技服务订单新增订单编号查询

anderx 7 роки тому
батько
коміт
74ebb107ef

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

@@ -1064,6 +1064,9 @@
 			a.technician_id = e.id left join department_management f on 
 			c.department_id = f.id
 		where a.order_type = 0
+		<if test="orderNo != null">
+			and a.order_no= #{orderNo,jdbcType=VARCHAR}
+		</if>
 		<if test="salesmanId != null">
 			and a.salesman_id = #{salesmanId,jdbcType=VARCHAR}
 		</if>
@@ -1136,6 +1139,9 @@
 			a.technician_id = e.id left join department_management f on 
 			c.department_id = f.id
 		where a.order_type = 0
+		<if test="orderNo != null">
+			and a.order_no= #{orderNo,jdbcType=VARCHAR}
+		</if>
 		<if test="salesmanId != null">
 			and a.salesman_id = #{salesmanId,jdbcType=VARCHAR}
 		</if>

+ 1 - 1
src/main/java/com/goafanti/order/controller/AdminOrderApiController.java

@@ -19,7 +19,7 @@ import com.goafanti.order.enums.CommodityType;
 import com.goafanti.order.service.OrderService;
 
 @RestController
-@RequestMapping(value = "/api/admin/order")
+@RequestMapping(value = "/open/api/admin/order")
 public class AdminOrderApiController extends CertifyApiController {
 	@Resource
 	private OrderService orderServiceImpl;

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

@@ -869,6 +869,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(StringUtils.isNotBlank(bo.getOrderNo())) params.put("orderNo", bo.getOrderNo());
 		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");