Explorar o código

修改边输边查快捷搜索

txf %!s(int64=3) %!d(string=hai) anos
pai
achega
75764d3c0f

+ 3 - 19
src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -208,30 +208,14 @@ public class UniversalController extends BaseRESTfulController {
     @ApiModelProperty(value = "边输边查发货单位")
     @PostMapping("/getSupplierMesByLike")
     public RESTfulResult getSupplierMesByLike(@RequestParam("index") String index) {
-        if(index != null){
-            if(index.length() == 0){
-                index = null;
-            }else {
-//                index += "%";
-                index = "%"+index+"%";
-            }
-        }
-        List<Map<String, Object>> list = universalMapper.getSupplierMesByLike(index);
+        List<Map<String, Object>> list = universalMapper.getSupplierMesByLike(index == null ? "" : index);
         return success(list);
     }
 
     @ApiModelProperty(value = "边输边查收货单位")
     @PostMapping("/getConsigneeByLike")
     public RESTfulResult getConsigneeByLike(@RequestParam("index") String index) {
-        if(index != null){
-            if(index.length() == 0){
-                index = null;
-            }else {
-//                index += "%";
-                index = "%"+index+"%";
-            }
-        }
-        List<Map<String, Object>> list = universalMapper.getConsigneeByLike(index);
+        List<Map<String, Object>> list = universalMapper.getConsigneeByLike(index == null ? "" : index);
         return success(list);
     }
 
@@ -363,7 +347,7 @@ public class UniversalController extends BaseRESTfulController {
     @ApiModelProperty(value = "边输边查承运商")
     @PostMapping("/getCarrierMesByLike")
     public RESTfulResult getCarrierMesByLike(@RequestParam("index") String index) {
-        List<Map<String, Object>> list = universalMapper.getCarrierMesByLike(index == null?"":index);
+        List<Map<String, Object>> list = universalMapper.getCarrierMesByLike(index == null ? "" : index);
         return success(list);
     }
 

+ 2 - 2
src/main/resources/bootstrap.yml

@@ -38,7 +38,7 @@ openfeign:
     TmsTrainFeign:
       url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
     TmsTruckFeign:
-      url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+      url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
     TmsshipFeign:
       url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
     WMSHFeign:
@@ -46,7 +46,7 @@ openfeign:
     WMSFeign:
       url: ${WMSFEIGN_URL:172.16.33.166:8093}
     OMSFeign:
-      url: ${OMSFEIGN_URL:localhost:8095}
+      url: ${OMSFEIGN_URL:172.16.33.166:8095}
     RmsFeign:
       url: ${RMSFEIGN_URL:172.16.33.166:8060}
   #测试环境

+ 6 - 22
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -425,19 +425,11 @@
 <!--  边输边查发货单位  -->
     <select id="getSupplierMesByLike" parameterType="string" resultType="java.util.Map">
         select
-        RS.SUPPLIER_ID "supplierId",
-        RS.SUPPLIER_NAME "value",
-        RS.SUPPLIER_NAME "supplierName"
+            RS.SUPPLIER_ID "supplierId",
+            RS.SUPPLIER_NAME "value",
+            RS.SUPPLIER_NAME "supplierName"
         from RMS_SUPPLIER RS
-        <where>
-            <if test="index != null">
-                RS.SUPPLIER_NAME  like #{index}
-                and rownum &lt; 10
-            </if>
-            <if test="index == null">
-                rownum &lt; 10
-            </if>
-        </where>
+        where instr(RS.SUPPLIER_NAME, #{index}) > 0 and rownum &lt; 10
         order by "value"
     </select>
     <!--  边输边查收货单位 -->
@@ -446,16 +438,8 @@
         RC.CONSIGNEE_ID "consigneeId",
         RC.CONSIGNEE_COMPANY_NAME "value",
         RC.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
-            from   RMS_CONSIGNEE   RC
-        <where>
-            <if test="index != null">
-                RC.CONSIGNEE_COMPANY_NAME  like #{index}
-                and rownum &lt; 10
-            </if>
-            <if test="index == null">
-                rownum &lt; 10
-            </if>
-        </where>
+        from   RMS_CONSIGNEE   RC
+        where instr(RC.CONSIGNEE_COMPANY_NAME, #{index}) > 0 and rownum &lt; 10
         order by "value"
     </select>