Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-RMS-API into dev

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

@@ -79,7 +79,8 @@ public class RmsCapacityController extends BaseRESTfulController {
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Short")
     @PostMapping(value = "/deleteCapacity/{id}")
     public RESTfulResult deleteCapacity(@PathVariable("id") BigDecimal id){
-        return success(rmsCapacityService.deleteCapacity(id));
+        int s = rmsCapacityService.deleteCapacity(id);
+        return success(s);
     }
 
     /**

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

@@ -32,4 +32,7 @@ public interface RmsCapacityMapper extends IBaseMapper<RmsCapacity, BigDecimal>
 
    //根据ssoId查询承运商名称
     Map<String, Object> getCarrierNameBySSOId(String carrierSSOId);
+
+    //根据运力id查找ssoId
+    String ssoIdBycapacityId(BigDecimal id);
 }

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

@@ -253,7 +253,7 @@
     </set>
     where BID_AREA_ID = #{bidAreaId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
     <include refid="select" />
     where BID_AREA_ID = #{bidAreaId,jdbcType=DECIMAL}
   </select>

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

@@ -845,4 +845,10 @@
        from RMS_CARRIER RC
       where RC.CARRIER_SSO_ID=#{carrierSSOId}
   </select>
+
+  <select id="ssoIdBycapacityId" parameterType="java.math.BigDecimal" resultType="java.lang.String">
+    select RC.CAPACITY_SSO_ID "capacitySsoId"
+    from RMS_CAPACITY RC
+    where  RC.CAPACITY_ID=#{id}
+  </select>
 </mapper>

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

@@ -889,7 +889,7 @@
     </set>
     where CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
     <include refid="select" />
     where CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
   </select>

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

@@ -470,7 +470,7 @@
     </set>
     where CONSIGNEE_ID = #{consigneeId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
     <include refid="select" />
     where CONSIGNEE_ID = #{consigneeId,jdbcType=DECIMAL}
   </select>

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

@@ -252,7 +252,7 @@
     </set>
     where MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
     <include refid="select" />
     where MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL}
   </select>

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

@@ -296,7 +296,7 @@
     </set>
     where PRICE_ID = #{priceId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
     <include refid="select" />
     where PRICE_ID = #{priceId,jdbcType=DECIMAL}
   </select>

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

@@ -423,7 +423,7 @@
     </set>
     where PERSONNEL_ID = #{personnelId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
     <include refid="select" />
     where PERSONNEL_ID = #{personnelId,jdbcType=DECIMAL}
   </select>

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

@@ -725,7 +725,7 @@
     </set>
     where SUPPLIER_ID = #{supplierId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
     <include refid="select" />
     where SUPPLIER_ID = #{supplierId,jdbcType=DECIMAL}
   </select>