Merge remote-tracking branch 'origin/master'

src/main/java/com/steerinfo/dil/controller/AmsSaleOrderController.java

@@ -491,7 +491,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             mapValue.put("con",con);
         }
         if (saler != null && !"".equals(saler) && !"null".equals(saler)){
-            mapValue.put("saler",saler);
+            mapValue.put("saler","%" + saler + "%");
         }
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum,pageSize);
@@ -555,7 +555,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             mapValue.put("con",con);
         }
         if (saler != null && !"".equals(saler) && !"null".equals(saler)) {
-            mapValue.put("saler",saler);
+            mapValue.put("saler","%" + saler + "%");
         }
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum,pageSize);
@@ -593,7 +593,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             mapValue.put("consigneeSsoId",consigneeSsoId);
         }
         if (saler != null && !"".equals(saler) && !"null".equals(saler)) {
-            mapValue.put("saler",saler);
+            mapValue.put("saler","%" + saler + "%");
         }
         mapValue.put("saleType",saleType);
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据

src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

@@ -1549,8 +1549,8 @@
     <if test="consigneeSsoId != null" >
       and r_consignee.CONSIGNEE_SSO_ID = #{consigneeSsoId}
     </if>
-    <if test="saler != null" >
-      and  R_SALER.SALER_NAME = #{saler}
+    <if test="saler != null " >
+        and  R_SALER.INSERT_UPDATE_REMARK like  #{saler}
     </if>
     <if test="oneDate != null">
       and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= a_s_order.UPDATE_TIME
@@ -1678,7 +1678,7 @@
       and r_consignee.CONSIGNEE_SSO_ID = #{consigneeSsoId}
     </if>
     <if test="saler != null" >
-      and  R_SALER.SALER_NAME = #{saler}
+      and  R_SALER.INSERT_UPDATE_REMARK like  #{saler}
     </if>
         )
     <where>
@@ -1981,7 +1981,7 @@
       and a_s_order.SALE_TYPE is null
     </if>
     <if test="saler != null" >
-      and  R_SALER.SALER_NAME = #{saler}
+      and  R_SALER.INSERT_UPDATE_REMARK like  #{saler}
     </if>
     <if test="consigneeSsoId != null">
       and r_consignee.CONSIGNEE_SSO_ID = #{consigneeSsoId}