luobang 3 years ago
parent
commit
f36fb0a3f2

+ 0 - 1
src/main/java/com/steerinfo/dil/mapper/AmsContractTruckPriceMapper.java

@@ -59,6 +59,5 @@ public interface AmsContractTruckPriceMapper extends IBaseMapper<AmsContractTran
 
     List<Map<String, Object>> selectInwardPrice(Map<String, Object> mapvalue);
 
-    List<Map<String, Object>> selectInwardPrice1(Map<String, Object> mapvalue);
 
 }

+ 0 - 6
src/main/java/com/steerinfo/dil/service/impl/AmsContractTruckPriceServiceImpl.java

@@ -610,12 +610,6 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
 
     @Override
     public List<Map<String, Object>> selectInwardPrice(Map<String, Object> mapvalue) {
-        String isMineral = (String)mapvalue.get("isMineral");
-        if("矿石".equals(isMineral)){
-            return amsContractTruckPriceMapper.selectInwardPrice1(mapvalue);
-        }else{
             return amsContractTruckPriceMapper.selectInwardPrice(mapvalue);
-        }
-
     }
 }

+ 1 - 1
src/main/resources/application-dev.yml

@@ -15,7 +15,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:1localhost:8008}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.162:8018}
 

+ 1 - 1
src/main/resources/application-prod.yml

@@ -15,7 +15,7 @@ openfeign:
    ColumnDataFeign:
      url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
    TmsTruckFeign:
-      url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+      url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
    ImFeign:
       url: ${IMFEIGN_URL:172.16.33.166:8055}
 

+ 0 - 3
src/main/resources/com/steerinfo/dil/mapper/AmsContractTruckPriceMapper.xml

@@ -928,7 +928,4 @@
       )
       Order by "priceDate" desc
     </select>
-  <select id="selectInwardPrice1" resultType="java.util.LinkedHashMap" parameterType="java.util.Map">
-
-  </select>
 </mapper>