修改

pom.xml

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

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

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 @Mapper
@@ -22,7 +23,7 @@ public interface RmsOilPriceMapper extends IBaseMapper<RmsOilPrice, BigDecimal>
     Map<String, Object> getOilPriceById(BigDecimal id);
 
     //通过油品ID获取上一次油品价格
-    Map<String, Object> getLastOilPrice(BigDecimal oilNameId);
+    Map<String, Object> getLastOilPrice(@Param("oilNameId") BigDecimal oilNameId,@Param("transportationType") BigDecimal transportationType);
 
     //关闭油价
     int closeLastOilPrice(Map<String, Object> map);

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

@@ -3,7 +3,6 @@ package com.steerinfo.dil.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -81,6 +80,12 @@ public class RmsOilPrice implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="浮动比例",required=false)
     private BigDecimal floatingScale;
 
+    /**
+     * 运输类型(TRANSPORT_TYPE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="运输类型",required=false)
+    private BigDecimal transportType;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -189,6 +194,14 @@ public class RmsOilPrice implements IBasePO<BigDecimal> {
         this.floatingScale = floatingScale;
     }
 
+    public BigDecimal getTransportType() {
+        return transportType;
+    }
+
+    public void setTransportType(BigDecimal transportType) {
+        this.transportType = transportType;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -207,6 +220,7 @@ public class RmsOilPrice implements IBasePO<BigDecimal> {
         sb.append(", deleted=").append(deleted);
         sb.append(", priceStatus=").append(priceStatus);
         sb.append(", floatingScale=").append(floatingScale);
+        sb.append(", transportType=").append(transportType);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -128,12 +128,14 @@ public class RmsOilPriceServiceImpl implements IRmsOilPriceService {
         rmsOilPrice.setPriceId(rmsOilPriceMapper.selectOilPriceId());
         //获取油品ID、油价日期、油价
         BigDecimal oilTypeId = DataChange.dataToBigDecimal(map.get("oilNameId"));
+        BigDecimal transportationType = DataChange.dataToBigDecimal(map.get("transportationType"));
         rmsOilPrice.setPriceOilTypeId(oilTypeId);
         rmsOilPrice.setPriceDate(new Date((long) map.get("priceDate")));
+        rmsOilPrice.setTransportType(transportationType);
         BigDecimal priceValue = DataChange.dataToBigDecimal(map.get("priceValue"));
         rmsOilPrice.setPriceValue(priceValue);
         //根据油品ID获取上一次油价价格计算油价浮动
-        Map<String, Object> mesMap = rmsOilPriceMapper.getLastOilPrice(oilTypeId);
+        Map<String, Object> mesMap = rmsOilPriceMapper.getLastOilPrice(oilTypeId,transportationType);
         BigDecimal n = null; //浮动比例
         if(mesMap != null){
             BigDecimal lastPrice = DataChange.dataToBigDecimal(mesMap.get("priceValue"));
@@ -152,7 +154,7 @@ public class RmsOilPriceServiceImpl implements IRmsOilPriceService {
                 rmsOilPrice.setPriceStatus(new BigDecimal(1));
             }
         }else {
-            if(priceStatus && n.compareTo(BigDecimal.ZERO)==-1){
+            if(priceStatus && n.compareTo(BigDecimal.ZERO) != 0){
                 if(mesMap != null){
                     map.put("oilTypeId", oilTypeId);
                     rmsOilPriceMapper.closeLastOilPrice(map);

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

@@ -14,15 +14,17 @@
     <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
     <result column="PRICE_STATUS" jdbcType="DECIMAL" property="priceStatus" />
     <result column="FLOATING_SCALE" jdbcType="DECIMAL" property="floatingScale" />
+    <result column="TRANSPORT_TYPE" jdbcType="DECIMAL" property="transportType" />
   </resultMap>
   <sql id="columns">
     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
+    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, PRICE_STATUS, FLOATING_SCALE, 
+    TRANSPORT_TYPE
   </sql>
   <sql id="columns_alias">
     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
+    t.PRICE_STATUS, t.FLOATING_SCALE, t.TRANSPORT_TYPE
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM RMS_OIL_PRICE
@@ -68,6 +70,9 @@
       <if test="floatingScale != null">
         and FLOATING_SCALE = #{floatingScale}
       </if>
+      <if test="transportType != null">
+        and TRANSPORT_TYPE = #{transportType}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -108,9 +113,12 @@
       <if test="floatingScale != null">
         and FLOATING_SCALE = #{floatingScale}
       </if>
+      <if test="transportType != null">
+        and TRANSPORT_TYPE = #{transportType}
+      </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+  <delete id="deleteByPrimaryKey" parameterType="short">
     delete from RMS_OIL_PRICE
     where PRICE_ID = #{priceId,jdbcType=DECIMAL}
   </delete>
@@ -150,18 +158,21 @@
     <if test="floatingScale != null">
       or FLOATING_SCALE = #{floatingScale}
     </if>
+    <if test="transportType != null">
+      or TRANSPORT_TYPE = #{transportType}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.RmsOilPrice">
     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
-    )
+                               DELETED, PRICE_STATUS, FLOATING_SCALE,
+                               TRANSPORT_TYPE)
     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}
-           )
+            #{deleted,jdbcType=DECIMAL}, #{priceStatus,jdbcType=DECIMAL}, #{floatingScale,jdbcType=DECIMAL},
+            #{transportType,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsOilPrice">
     insert into RMS_OIL_PRICE
@@ -202,6 +213,9 @@
       <if test="floatingScale != null">
         FLOATING_SCALE,
       </if>
+      <if test="transportType != null">
+        TRANSPORT_TYPE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="priceId != null">
@@ -240,6 +254,9 @@
       <if test="floatingScale != null">
         #{floatingScale,jdbcType=DECIMAL},
       </if>
+      <if test="transportType != null">
+        #{transportType,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsOilPrice">
@@ -254,7 +271,8 @@
         INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
         DELETED = #{deleted,jdbcType=DECIMAL},
         PRICE_STATUS = #{priceStatus,jdbcType=DECIMAL},
-        FLOATING_SCALE = #{floatingScale,jdbcType=DECIMAL}
+        FLOATING_SCALE = #{floatingScale,jdbcType=DECIMAL},
+        TRANSPORT_TYPE = #{transportType,jdbcType=DECIMAL}
     where PRICE_ID = #{priceId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsOilPrice">
@@ -293,10 +311,13 @@
       <if test="floatingScale != null">
         FLOATING_SCALE = #{floatingScale,jdbcType=DECIMAL},
       </if>
+      <if test="transportType != null">
+        TRANSPORT_TYPE = #{transportType,jdbcType=DECIMAL},
+      </if>
     </set>
     where PRICE_ID = #{priceId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="decimal" resultMap="BaseResultMap">
     <include refid="select" />
     where PRICE_ID = #{priceId,jdbcType=DECIMAL}
   </select>
@@ -315,7 +336,8 @@
     INSERT_USERNAME, INSERT_TIME,
     UPDATE_USERNAME, UPDATE_TIME,
     INSERT_UPDATE_REMARK, DELETED,
-    PRICE_STATUS, FLOATING_SCALE)
+    PRICE_STATUS, FLOATING_SCALE, TRANSPORT_TYPE
+    )
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.priceId,jdbcType=DECIMAL},
@@ -323,7 +345,8 @@
     #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
     #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
     #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
-    #{item.priceStatus,jdbcType=DECIMAL}, #{item.floatingScale,jdbcType=DECIMAL} from dual
+    #{item.priceStatus,jdbcType=DECIMAL}, #{item.floatingScale,jdbcType=DECIMAL}, #{item.transportType,jdbcType=DECIMAL}
+    from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -377,6 +400,10 @@
     <foreach close="end" collection="list" index="index" item="item" open="case PRICE_ID" separator=" ">
       when #{item.priceId,jdbcType=DECIMAL} then #{item.floatingScale,jdbcType=DECIMAL}
     </foreach>
+    ,TRANSPORT_TYPE=
+    <foreach close="end" collection="list" index="index" item="item" open="case PRICE_ID" separator=" ">
+      when #{item.priceId,jdbcType=DECIMAL} then #{item.transportType,jdbcType=DECIMAL}
+    </foreach>
     where PRICE_ID in
     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
       #{item.priceId,jdbcType=DECIMAL}
@@ -392,6 +419,12 @@
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
   <!-- 油价列表 -->
   <select id="getOilPriceList" parameterType="java.util.Map" resultType="java.util.Map">
     SELECT * FROM
@@ -486,13 +519,14 @@
   </select>
 
 <!-- 通过油品ID获取上一次油品价格 -->
-  <select id="getLastOilPrice" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+  <select id="getLastOilPrice"  resultType="java.util.Map">
     select ROP.PRICE_VALUE "priceValue",
            ROP.PRICE_ID "priceId"
     from RMS_OIL_PRICE ROP
     where ROP.PRICE_OIL_TYPE_ID = #{oilNameId}
       and ROP.DELETED = 0
       and ROP.PRICE_STATUS = 0
+      and ROP.TRANSPORT_TYPE = #{transportationType}
   </select>
 
 <!-- 关闭之前当前油品所有正在启用的油价 -->