Merge branch 'dev'

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

@@ -178,6 +178,39 @@ public class UniversalController extends BaseRESTfulController {
     }
 
 
+
+
+    @ApiOperation(value="查询运力类型")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(248)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getCapacityType")
+    public RESTfulResult getCapacityType(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     String carrierSsoId,
+                                                     String index
+    ){
+        if(mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", index);
+        }
+        //不分页筛选数据
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> capacity = universalMapper.getCapacityType(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, capacity);
+        return success(pageList);
+    }
+
+
+
     @ApiOperation(value="通过订单ID查询订单下所有物资")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -139,4 +139,5 @@ public interface UniversalMapper {
 
     Map<String, Object> getRmsCarrierByCarrierSsoId(String carrierSsoId);
 
+    List<Map<String, Object>> getCapacityType(Map<String, Object> mapValue);
 }

src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:localhost:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
@@ -22,7 +22,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
@@ -30,9 +30,9 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8016}
+    url: ${OMSFEIGN_URL:localhost:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.166:8014}
+    url: ${RMSFEIGN_HRL:localhost:8014}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
 server:

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

@@ -147,7 +147,6 @@
 
     <!--  获取所有的运力信息 -->
     <select id="getAllCapacityByCarrierLike" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
-
         SELECT *
         FROM (
                  SELECT
@@ -161,7 +160,7 @@
                      ON RCC.CAPACITY_ID = RC.CAPACITY_ID
                           JOIN RMS_CARRIER RCA
                                 ON RCA.CARRIER_ID = RCC.CARRIER_ID
-                 WHERE RC.CAPACITY_TYPE_ID = 1 AND RC.CAPACITY_SSO_ID is not NULL
+                 WHERE  RC.CAPACITY_SSO_ID is not NULL
             <if test="carrierId != null" >
                 and RCC.CARRIER_ID = #{carrierId}
             </if>
@@ -747,6 +746,12 @@
         select r_carrier.CARRIER_NAME "carrierName", r_carrier.CARRIER_ID "carrierId"
         from RMS_CARRIER r_carrier
         where r_carrier.CARRIER_SSO_ID = #{carrierSsoId}
+    </select>
 
+    <select id="getCapacityType" resultType="java.util.Map" parameterType="java.util.Map">
+        select RCT.CAPACITY_TYPE_ID "capacityTypeId",
+               RCT.CAPACITY_TYPE_NAME "capacityTypeName"
+        from RMS_CAPACITY_TYPE RCT
+        where instr( RCT.CAPACITY_TYPE_NAME, #{index}) > 0
     </select>
 </mapper>