订单

src/main/java/com/minpay/shouhuo/orderaction/ShOrderManageAction.java

@@ -50,7 +50,6 @@ public class ShOrderManageAction implements IMINAction {
 	 * @param limit
 	 * @param equipmentId	机器编号
 	 * @param equipmentName	机器名称
-	 * @param freightwayId	货道编号
 	 * @param payMode		支付方式
 	 * @param dates			日期（区间）
 	 * @param state			状态
@@ -65,7 +64,6 @@ public class ShOrderManageAction implements IMINAction {
 			@MINParam(key = "limit", defaultValue = "3") int limit,
 			@MINParam(key = "equipmentId") String equipmentId,
 			@MINParam(key = "equipmentName") String equipmentName,
-			@MINParam(key = "freightwayId") String freightwayId,
 			@MINParam(key = "payMode") String payMode,
 			@MINParam(key = "dates") String dates,
 			@MINParam(key = "state") String state,
@@ -75,12 +73,10 @@ public class ShOrderManageAction implements IMINAction {
 		MINActionResult res = new MINActionResult();
 		MINRowBounds rows = new MINRowBounds(page, limit);
 		User user = session.getUser();
-
 		// 创建查询条件
 		Map<String, String> p = new HashMap<String, String>();
 		p.put("equipmentId",equipmentId);
 		p.put("equipmentName",equipmentName);
-		p.put("freightwayId",freightwayId);
 		p.put("payMode",payMode);
 		p.put("playerId",user.getUserId());
 		p.put("state",state);

src/main/resources/com/minpay/db/table/own/mapper/ShOrderMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.minpay.db.table.own.mapper.ShOrderMapper">
 	<select id="queryOrder" resultType="hashmap" parameterType="java.lang.String">
-		select
+		SELECT
 		VOI_ID		"id",
 		VOI_CHANNEL	"channel",
 		VOI_PERSON_ID		"personId",
@@ -24,19 +24,11 @@
 		VOI_MODIFY_TIME		"modifyTime",
 		VOI_BRANCHID		"branchid",
 		VOI_PAY_MODE	    "payMode",
-		VOI_PRODUCT_NAME	"productName",
-		VOI_PRODUCT_ID		"productId",
-		VOI_EQUREL_ID		"equrelId",
-		VOI_PICKUP_NO		"pickupNo",
-		VOI_PICKUP_STT		"pickupStt",
-		VOI_PICKUP_TIME		"pickupTime",
 		b.VCI_NAME  		"personName",
-		c.VEQ_NAME    		"equipmentName",
-		d.PRT_MASTER_MAP	"productImg"
+		c.VEQ_NAME    		"equipmentName"
 		FROM
-		vm_order_inf a LEFT JOIN vm_person_inf b on a.VOI_PERSON_ID = b.VCI_ID
-		LEFT JOIN  vm_equipment_inf c on a.VOI_EQUIPMENT_ID = c.VEQ_ID
-		LEFT JOIN  vm_product_inf d on a.VOI_PRODUCT_ID = d.PRT_ID
+		vm_order_inf a LEFT JOIN vm_person_inf b ON a.VOI_PERSON_ID = b.VCI_ID
+		LEFT JOIN  vm_equipment_inf c ON a.VOI_EQUIPMENT_ID = c.VEQ_ID
 		WHERE 1=1
 		<if test="dates!=null and dates != ''">
 			and substr(a.VOI_CREATE_TIME,1,8) between substr((#{dates,jdbcType=VARCHAR}),1,8)
@@ -45,12 +37,7 @@
 		<if test="equipmentId != null and equipmentId != ''">
 			and a.VOI_EQUIPMENT_ID = #{equipmentId,jdbcType=VARCHAR}
 		</if>
-		<if test="equipmentName != null and equipmentName != ''">
-			and c.VEQ_NAME like CONCAT('%', #{equipmentName,jdbcType=VARCHAR}, '%')
-		</if>
-		<if test="freightwayId != null and freightwayId != ''">
-			and a.VOI_EQUREL_ID = #{freightwayId,jdbcType=VARCHAR}
-		</if>
+
 		<if test="payMode != null and payMode != ''">
 			and a.VOI_PAY_MODE = #{payMode,jdbcType=VARCHAR}
 		</if>