修改油价管理 以及线路查询

pom.xml

@@ -111,7 +111,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>RMS_LINE_GATEPOST_CALCULATE</param>
+                        <param>RMS_OIL_PRICE</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -76,15 +76,14 @@ public class RmsLineController extends BaseRESTfulController {
                                         String con){
 
         if(con != null){
-            if(!"".equals(con)){
+            if(!"".equals(con) && !"null".equals(con)){
                 mapValue.put("index", con);
             }
         }
-        List<Map<String, Object>>  list = rmsLineMapper.getAllLineDesk(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsLineMapper.getAllLineDesk(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId,list,columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId,null,columnList);
         return success(data);
     }
 

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

@@ -93,13 +93,13 @@ public class RmsOilPriceController extends BaseRESTfulController {
     }
     /**
      *更新油价
-     * @param rmsOilPrice
+     * @param
      * @return
      */
 
-    @PostMapping(value = "/updateOilPrice", produces  = "application/json;charset=UTF-8")
-    public RESTfulResult updateOilPrice(@RequestBody RmsOilPrice rmsOilPrice){
-        int result = rmsOilPriceService.updateOilPrice(rmsOilPrice);
+    @PostMapping(value = "/updateOilPrice/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult updateOilPrice(@PathVariable("id") Integer id){
+        int result = rmsOilPriceService.updateOilPrice(id);
         return success(result);
     }
 
@@ -118,9 +118,13 @@ public class RmsOilPriceController extends BaseRESTfulController {
      */
     @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
-    @PostMapping(value = "/deleteOilPrice/{id}")//BigDecimal
+    @PostMapping(value = "/deleteOilPrice/{id}")
     public RESTfulResult deleteOilPrice(@PathVariable("id") BigDecimal id){
-        return success(rmsOilPriceService.deleteOilPrice(id));
+        int i = rmsOilPriceService. deleteOilPrice(id);
+        if(i <= 0){
+            return failed();
+        }
+        return success();
     }
 
     /**
@@ -134,7 +138,7 @@ public class RmsOilPriceController extends BaseRESTfulController {
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
     @PostMapping(value = "/getOilPriceById/{id}")
     public RESTfulResult getOilPriceById(@PathVariable("id") BigDecimal id){
-        List<Map<String,Object>> map= rmsOilPriceService.getOilPriceById(id);
+        Map<String,Object> map= rmsOilPriceService.getOilPriceById(id);
         return success(map);
     }
 

src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 
+import java.math.BigDecimal;
 import java.util.Map;
 
 /**
@@ -30,6 +31,6 @@ public interface AmsFeign {
     @ApiImplicitParams({
     })
     @PostMapping(value = "/api/v1/ams/amscontracttruckprices/batchUpdateTransportPriceByOilPrice1")
-    Map<String, Object> batchUpdateTransportPriceByOilPrice1();
+    Map<String, Object> batchUpdateTransportPriceByOilPrice1(Map<String, Object> map);
 
 }

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

@@ -19,7 +19,7 @@ public interface RmsOilPriceMapper extends IBaseMapper<RmsOilPrice, BigDecimal>
     BigDecimal selectOilPriceId();
 
     //根据Id寻找油价
-    List<Map<String, Object>> getOilPriceById(BigDecimal id);
+    Map<String, Object> getOilPriceById(BigDecimal id);
 
     //通过油品ID获取上一次油品价格
     Map<String, Object> getLastOilPrice(BigDecimal oilNameId);

src/main/java/com/steerinfo/dil/model/RmsOilPrice.java

@@ -16,10 +16,10 @@ public class RmsOilPrice implements IBasePO<BigDecimal> {
     private BigDecimal priceId;
 
     /**
-     * 油名(PRICE_OIL_NAME,VARCHAR,20)
+     * 油名ID(PRICE_OIL_TYPE_ID,DECIMAL,20)
      */
-    @ApiModelProperty(value="油名",required=false)
-    private BigDecimal priceOilName;
+    @ApiModelProperty(value="油名ID",required=false)
+    private BigDecimal priceOilTypeId;
 
     /**
      * 油价(PRICE_VALUE,DECIMAL,0)
@@ -101,12 +101,12 @@ public class RmsOilPrice implements IBasePO<BigDecimal> {
         this.priceId = priceId;
     }
 
-    public BigDecimal getPriceOilName() {
-        return priceOilName;
+    public BigDecimal getPriceOilTypeId() {
+        return priceOilTypeId;
     }
 
-    public void setPriceOilName(BigDecimal priceOilName) {
-        this.priceOilName = priceOilName;
+    public void setPriceOilTypeId(BigDecimal priceOilTypeId) {
+        this.priceOilTypeId = priceOilTypeId;
     }
 
     public BigDecimal getPriceValue() {
@@ -196,7 +196,7 @@ public class RmsOilPrice implements IBasePO<BigDecimal> {
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
         sb.append(", priceId=").append(priceId);
-        sb.append(", priceOilName=").append(priceOilName);
+        sb.append(", priceOilTypeId=").append(priceOilTypeId);
         sb.append(", priceValue=").append(priceValue);
         sb.append(", priceDate=").append(priceDate);
         sb.append(", insertUsername=").append(insertUsername);

src/main/java/com/steerinfo/dil/model/RmsOilType.java

@@ -10,15 +10,15 @@ import java.util.Date;
 @ApiModel(value="null")
 public class RmsOilType implements IBasePO<BigDecimal> {
     /**
-     * 油价类型ID(OIL_TYPE_ID,DECIMAL,38)
+     * 主键ID(OIL_TYPE_ID,DECIMAL,38)
      */
-    @ApiModelProperty(value="油价类型ID",required=true)
+    @ApiModelProperty(value="主键ID",required=true)
     private BigDecimal oilTypeId;
 
     /**
-     * 油价名称(OIL_TYPE_NAME,VARCHAR,20)
+     * 油品名称(OIL_TYPE_NAME,VARCHAR,20)
      */
-    @ApiModelProperty(value="油价名称",required=false)
+    @ApiModelProperty(value="油品名称",required=false)
     private String oilTypeName;
 
     /**

src/main/java/com/steerinfo/dil/service/IRmsOilPriceService.java

@@ -27,11 +27,11 @@ public interface IRmsOilPriceService{
 
     int insertOilPrice(Map<String,Object> map);
 
-    int updateOilPrice(RmsOilPrice rmsOilPrice);
+    int updateOilPrice(Integer id);
 
-    Object deleteOilPrice(BigDecimal id);
+    int deleteOilPrice(BigDecimal id);
 
-    List<Map<String, Object>> getOilPriceById(BigDecimal id);
+    Map<String, Object> getOilPriceById(BigDecimal id);
 
     //添加油品名称
     int addOilType(String oilTypeName);

src/main/java/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.java

@@ -1,12 +1,10 @@
 package com.steerinfo.dil.service.impl;
 
-import com.google.inject.internal.cglib.core.$Constants;
 import com.steerinfo.dil.mapper.RmsCapacityMapper;
 import com.steerinfo.dil.mapper.RmsCarrierMapper;
 import com.steerinfo.dil.model.RmsCapacity;
 import com.steerinfo.dil.service.IRmsCapacityService;
 import com.steerinfo.dil.util.DataChange;
-import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -50,7 +48,7 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
         //如果车辆已存在  那就是更改承运商
         Integer capacityId = rmsCapacityMapper.selectBycapacityNumber(capacityNumber);
         if(capacityId != null){
-            rmsCapacity.setCarrierId(new BigDecimal(capacityId));
+            rmsCapacity.setCapacityId(new BigDecimal(capacityId));
             rmsCapacity.setCarrierId(carrierIds);
             return rmsCapacityMapper.updateByPrimaryKeySelective(rmsCapacity);
         }

src/main/java/com/steerinfo/dil/service/impl/RmsOilPriceServiceImpl.java

@@ -15,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -54,35 +55,51 @@ public class RmsOilPriceServiceImpl implements IRmsOilPriceService {
     }
 
 
-
+    /**
+     * 启用油价
+     * @Author TXF
+     * @Date 2022/1/21 9:08
+     * @param id
+     * @return
+     **/
     @Override
-    //更新油价，还需要改改，排查bug第一优先级
-    public int updateOilPrice(RmsOilPrice rmsOilPrice) {
-        rmsOilPrice.setUpdateUsername("admin");
+    public int updateOilPrice(Integer id) {
+        RmsOilPrice rmsOilPrice = new RmsOilPrice();
+        Map<String, Object> mesMap = rmsOilPriceMapper.getOilPriceById(new BigDecimal(id));
+        if(DataChange.dataToBigDecimal(mesMap.get("priceStatus")).intValue() == 0){
+            return 0;
+        }
+        rmsOilPrice.setId(new BigDecimal(id));
         rmsOilPrice.setUpdateTime(new Date());
+        rmsOilPrice.setPriceStatus(new BigDecimal(0));
         //油价联动
-        amsFeign.batchUpdateTransportPriceByOilPrice1();
-        return  this.rmsOilPriceMapper.updateByPrimaryKeySelective(rmsOilPrice);
+        amsFeign.batchUpdateTransportPriceByOilPrice1(mesMap);
+        return rmsOilPriceMapper.updateByPrimaryKeySelective(rmsOilPrice);
     }
+
     //根据Id删除油价,该操作通过测试，排查第三优先级
     @Override
-    public Object deleteOilPrice(BigDecimal id) {
+    public int deleteOilPrice(BigDecimal id) {
+        //如果是已经启用的则不能删除
+        Map<String, Object> mesMap = rmsOilPriceMapper.getOilPriceById(id);
+        BigDecimal priceStatus = DataChange.dataToBigDecimal(mesMap.get("priceStatus"));
+        if(priceStatus.intValue() != 1){
+            return 0;
+        }
         RmsOilPrice rmsOilPrice = new RmsOilPrice();
         rmsOilPrice.setPriceId(id);
         rmsOilPrice.setDeleted(new BigDecimal(1));
-        return this.rmsOilPriceMapper.updateByPrimaryKeySelective(rmsOilPrice) ;
+        return rmsOilPriceMapper.updateByPrimaryKeySelective(rmsOilPrice) ;
     }
 
 
     //根据Id查询油价
     @Override
-    public List<Map<String, Object>> getOilPriceById(BigDecimal id) {
+    public Map<String, Object> getOilPriceById(BigDecimal id) {
         return this.rmsOilPriceMapper.getOilPriceById(id);
     }
 
 
-    //批量修改油价
-//        amsFeign.batchUpdateTransportPriceByOilPrice1();
 
     /**
      * 新增油价
@@ -99,16 +116,18 @@ public class RmsOilPriceServiceImpl implements IRmsOilPriceService {
 
         //获取油品ID、油价日期、油价
         BigDecimal oilNameId = DataChange.dataToBigDecimal(map.get("oilNameId"));
-        rmsOilPrice.setPriceOilName(oilNameId);
+        rmsOilPrice.setPriceOilTypeId(oilNameId);
         rmsOilPrice.setPriceDate(new Date((long) map.get("priceDate")));
         BigDecimal priceValue = DataChange.dataToBigDecimal(map.get("priceValue"));
         rmsOilPrice.setPriceValue(priceValue);
         //根据油品ID获取上一次油价价格计算油价浮动
         Map<String, Object> mesMap = rmsOilPriceMapper.getLastOilPrice(oilNameId);
+        BigDecimal n = null; //浮动比例
         if(mesMap != null){
             BigDecimal lastPrice = DataChange.dataToBigDecimal(mesMap.get("priceValue"));
             BigDecimal subtract = priceValue.subtract(lastPrice); //当前油价减去上一次油价
-            rmsOilPrice.setFloatingScale(subtract.divide(lastPrice, 4,BigDecimal.ROUND_HALF_UP)); //四舍五入
+            n = subtract.divide(lastPrice, 4,BigDecimal.ROUND_HALF_UP);
+            rmsOilPrice.setFloatingScale(n); //四舍五入
         }
         //如果新增的油价是启用的则关闭之前的已启用的
         Boolean priceStatus = (Boolean) map.get("priceStatus");
@@ -121,6 +140,11 @@ public class RmsOilPriceServiceImpl implements IRmsOilPriceService {
             }
             //设置启用状态
             rmsOilPrice.setPriceStatus(new BigDecimal(0));
+            //批量修改油价
+            Map<String, Object> updateMesMap = new HashMap<>();
+            updateMesMap.put("oilTypeId",oilNameId);
+            updateMesMap.put("newOilPrice", priceValue);
+            amsFeign.batchUpdateTransportPriceByOilPrice1(updateMesMap);
         }else {
             //否则设置停用状态
             rmsOilPrice.setPriceStatus(new BigDecimal(1));

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

@@ -199,7 +199,7 @@
       </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
     delete from RMS_CAPACITY
     where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
   </delete>
@@ -549,7 +549,7 @@
     </set>
     where CAPACITY_ID = #{capacityId,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 CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
   </select>

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

@@ -564,6 +564,8 @@
             THEN '采购'
           WHEN RL.LINE_TYPE = 4
             THEN '退货'
+          WHEN RL.LINE_TYPE = 5
+            THEN '零星'
           END) "lineType",
       (
         SELECT

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.steerinfo.dil.mapper.RmsOilPriceMapper">
   <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsOilPrice">
     <id column="PRICE_ID" jdbcType="DECIMAL" property="priceId" />
-    <result column="PRICE_OIL_NAME" jdbcType="VARCHAR" property="priceOilName" />
+    <result column="PRICE_OIL_TYPE_ID" jdbcType="DECIMAL" property="priceOilTypeId" />
     <result column="PRICE_VALUE" jdbcType="DECIMAL" property="priceValue" />
     <result column="PRICE_DATE" jdbcType="TIMESTAMP" property="priceDate" />
     <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
@@ -16,13 +16,13 @@
     <result column="FLOATING_SCALE" jdbcType="DECIMAL" property="floatingScale" />
   </resultMap>
   <sql id="columns">
-    PRICE_ID, PRICE_OIL_NAME, PRICE_VALUE, PRICE_DATE, INSERT_USERNAME, INSERT_TIME, 
+    PRICE_ID, PRICE_OIL_TYPE_ID, PRICE_VALUE, PRICE_DATE, INSERT_USERNAME, INSERT_TIME, 
     UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, PRICE_STATUS, FLOATING_SCALE
   </sql>
   <sql id="columns_alias">
-    t.PRICE_ID, t.PRICE_OIL_NAME, t.PRICE_VALUE, t.PRICE_DATE, t.INSERT_USERNAME, t.INSERT_TIME, 
-    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, t.PRICE_STATUS, 
-    t.FLOATING_SCALE
+    t.PRICE_ID, t.PRICE_OIL_TYPE_ID, t.PRICE_VALUE, t.PRICE_DATE, t.INSERT_USERNAME, 
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, 
+    t.PRICE_STATUS, t.FLOATING_SCALE
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM RMS_OIL_PRICE
@@ -35,8 +35,8 @@
       <if test="priceId != null">
         and PRICE_ID = #{priceId}
       </if>
-      <if test="priceOilName != null and priceOilName != ''">
-        and PRICE_OIL_NAME = #{priceOilName}
+      <if test="priceOilTypeId != null">
+        and PRICE_OIL_TYPE_ID = #{priceOilTypeId}
       </if>
       <if test="priceValue != null">
         and PRICE_VALUE = #{priceValue}
@@ -75,8 +75,8 @@
       <if test="priceId != null">
         and PRICE_ID = #{priceId}
       </if>
-      <if test="priceOilName != null and priceOilName != ''">
-        and PRICE_OIL_NAME LIKE '%${priceOilName}%'
+      <if test="priceOilTypeId != null">
+        and PRICE_OIL_TYPE_ID = #{priceOilTypeId}
       </if>
       <if test="priceValue != null">
         and PRICE_VALUE = #{priceValue}
@@ -117,8 +117,8 @@
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from RMS_OIL_PRICE
     where 1!=1
-    <if test="priceOilName != null and priceOilName != ''">
-      or PRICE_OIL_NAME = #{priceOilName}
+    <if test="priceOilTypeId != null">
+      or PRICE_OIL_TYPE_ID = #{priceOilTypeId}
     </if>
     <if test="priceValue != null">
       or PRICE_VALUE = #{priceValue}
@@ -152,12 +152,12 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.RmsOilPrice">
-    insert into RMS_OIL_PRICE (PRICE_ID, PRICE_OIL_NAME, PRICE_VALUE,
+    insert into RMS_OIL_PRICE (PRICE_ID, PRICE_OIL_TYPE_ID, PRICE_VALUE,
                                PRICE_DATE, INSERT_USERNAME, INSERT_TIME,
                                UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
                                DELETED, PRICE_STATUS, FLOATING_SCALE
     )
-    values (#{priceId,jdbcType=DECIMAL}, #{priceOilName,jdbcType=VARCHAR}, #{priceValue,jdbcType=DECIMAL},
+    values (#{priceId,jdbcType=DECIMAL}, #{priceOilTypeId,jdbcType=DECIMAL}, #{priceValue,jdbcType=DECIMAL},
             #{priceDate,jdbcType=TIMESTAMP}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
             #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
             #{deleted,jdbcType=DECIMAL}, #{priceStatus,jdbcType=DECIMAL}, #{floatingScale,jdbcType=DECIMAL}
@@ -169,8 +169,8 @@
       <if test="priceId != null">
         PRICE_ID,
       </if>
-      <if test="priceOilName != null">
-        PRICE_OIL_NAME,
+      <if test="priceOilTypeId != null">
+        PRICE_OIL_TYPE_ID,
       </if>
       <if test="priceValue != null">
         PRICE_VALUE,
@@ -207,8 +207,8 @@
       <if test="priceId != null">
         #{priceId,jdbcType=DECIMAL},
       </if>
-      <if test="priceOilName != null">
-        #{priceOilName,jdbcType=VARCHAR},
+      <if test="priceOilTypeId != null">
+        #{priceOilTypeId,jdbcType=DECIMAL},
       </if>
       <if test="priceValue != null">
         #{priceValue,jdbcType=DECIMAL},
@@ -244,7 +244,7 @@
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsOilPrice">
     update RMS_OIL_PRICE
-    set PRICE_OIL_NAME = #{priceOilName,jdbcType=VARCHAR},
+    set PRICE_OIL_TYPE_ID = #{priceOilTypeId,jdbcType=DECIMAL},
         PRICE_VALUE = #{priceValue,jdbcType=DECIMAL},
         PRICE_DATE = #{priceDate,jdbcType=TIMESTAMP},
         INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
@@ -260,8 +260,8 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsOilPrice">
     update RMS_OIL_PRICE
     <set>
-      <if test="priceOilName != null">
-        PRICE_OIL_NAME = #{priceOilName,jdbcType=VARCHAR},
+      <if test="priceOilTypeId != null">
+        PRICE_OIL_TYPE_ID = #{priceOilTypeId,jdbcType=DECIMAL},
       </if>
       <if test="priceValue != null">
         PRICE_VALUE = #{priceValue,jdbcType=DECIMAL},
@@ -311,7 +311,7 @@
   <insert id="batchInsert" parameterType="java.util.List">
     insert into RMS_OIL_PRICE
     (PRICE_ID,
-    PRICE_OIL_NAME, PRICE_VALUE, PRICE_DATE,
+    PRICE_OIL_TYPE_ID, PRICE_VALUE, PRICE_DATE,
     INSERT_USERNAME, INSERT_TIME,
     UPDATE_USERNAME, UPDATE_TIME,
     INSERT_UPDATE_REMARK, DELETED,
@@ -319,7 +319,7 @@
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.priceId,jdbcType=DECIMAL},
-    #{item.priceOilName,jdbcType=VARCHAR}, #{item.priceValue,jdbcType=DECIMAL}, #{item.priceDate,jdbcType=TIMESTAMP},
+    #{item.priceOilTypeId,jdbcType=DECIMAL}, #{item.priceValue,jdbcType=DECIMAL}, #{item.priceDate,jdbcType=TIMESTAMP},
     #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
     #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
     #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
@@ -333,9 +333,9 @@
     <foreach close="end" collection="list" index="index" item="item" open="case PRICE_ID" separator=" ">
       when #{item.priceId,jdbcType=DECIMAL} then #{item.priceId,jdbcType=DECIMAL}
     </foreach>
-    ,PRICE_OIL_NAME=
+    ,PRICE_OIL_TYPE_ID=
     <foreach close="end" collection="list" index="index" item="item" open="case PRICE_ID" separator=" ">
-      when #{item.priceId,jdbcType=DECIMAL} then #{item.priceOilName,jdbcType=VARCHAR}
+      when #{item.priceId,jdbcType=DECIMAL} then #{item.priceOilTypeId,jdbcType=DECIMAL}
     </foreach>
     ,PRICE_VALUE=
     <foreach close="end" collection="list" index="index" item="item" open="case PRICE_ID" separator=" ">
@@ -409,7 +409,7 @@
      end ) "priceStatus"
     FROM RMS_OIL_PRICE ROP
     left join RMS_OIL_TYPE ROT
-        on ROP.PRICE_OIL_NAME = ROT.OIL_TYPE_ID
+        on ROP.PRICE_OIL_TYPE_ID = ROT.OIL_TYPE_ID
     WHERE ROP.DELETED = 0
     ORDER BY ROP.INSERT_TIME DESC
     )
@@ -465,12 +465,14 @@
 
 
   <!--根据Id查询油价-->
-  <select id="getOilPriceById" resultType="java.util.LinkedHashMap" >
+  <select id="getOilPriceById" parameterType="map" resultType="java.util.LinkedHashMap" >
     SELECT
       ROP.PRICE_ID AS "priceId",
-      ROP.PRICE_OIL_NAME AS "priceOilName",
-      ROP.PRICE_VALUE AS "priceValue",
-      ROP.PRICE_DATE AS "priceDate"
+      ROP.PRICE_OIL_TYPE_ID AS "oilTypeId", --批量修改运输单价
+      ROP.PRICE_VALUE AS "newOilPrice", --批量修改运输单价
+      ROP.PRICE_DATE AS "priceDate",
+      ROP.PRICE_STATUS  "priceStatus",
+      ROP.FLOATING_SCALE    "floatingScale"
     FROM RMS_OIL_PRICE ROP
     WHERE ROP.PRICE_ID=#{id}
 
@@ -481,7 +483,7 @@
     select ROP.PRICE_VALUE "priceValue",
            ROP.PRICE_ID "priceId"
     from RMS_OIL_PRICE ROP
-    where ROP.PRICE_OIL_NAME = #{oilNameId}
+    where ROP.PRICE_OIL_TYPE_ID = #{oilNameId}
       and ROP.DELETED = 0
       and ROP.PRICE_STATUS = 0
   </select>