'修改港口装卸费'

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

@@ -3,6 +3,7 @@ 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;
 
@@ -80,6 +81,12 @@ public class BmsportHandlingFee implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="逻辑删除",required=false)
     private BigDecimal deleted;
 
+    /**
+     * 装卸费编号(FEE_NO,VARCHAR,50)
+     */
+    @ApiModelProperty(value="装卸费编号",required=false)
+    private String feeNo;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -188,6 +195,14 @@ public class BmsportHandlingFee implements IBasePO<BigDecimal> {
         this.deleted = deleted;
     }
 
+    public String getFeeNo() {
+        return feeNo;
+    }
+
+    public void setFeeNo(String feeNo) {
+        this.feeNo = feeNo == null ? null : feeNo.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -206,6 +221,7 @@ public class BmsportHandlingFee implements IBasePO<BigDecimal> {
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
         sb.append(", deleted=").append(deleted);
+        sb.append(", feeNo=").append(feeNo);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -4,6 +4,7 @@ import com.steerinfo.dil.feign.JoinApiFeign;
 import com.steerinfo.dil.mapper.BmsportHandlingFeeMapper;
 import com.steerinfo.dil.model.BmsportHandlingFee;
 import com.steerinfo.dil.service.IBmsportHandlingFeeService;
+import com.steerinfo.dil.util.NoUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -29,6 +30,8 @@ public class BmsportHandlingFeeServiceImpl implements IBmsportHandlingFeeService
     BmstruckFormulaServiceImpl bmstruckFormulaService;
     @Autowired
     JoinApiFeign joinApiFeign;
+    @Autowired
+    NoUtil noUtil;
 
     /**
      * 修改港口装卸费结算
@@ -66,6 +69,7 @@ public class BmsportHandlingFeeServiceImpl implements IBmsportHandlingFeeService
         BigDecimal materialId = new BigDecimal((Integer) rowMap.get("materialId")) ;
         String feeForeignShipName = (String) rowMap.get("foreignShipName");
         BigDecimal feeId = selectMaxId();
+        String feeNo = noUtil.setResultNo("GKZXF", feeId);
         BigDecimal feeMaterialTonnage = new BigDecimal((String) mapVal.get("feeMaterialTonnage"));
         List<Map<String,Object>> priceList = bmsportHandlingFeeMapper.getPriceId();
         Map<String, Object> priceMap = priceList.get(0);
@@ -78,6 +82,7 @@ public class BmsportHandlingFeeServiceImpl implements IBmsportHandlingFeeService
         bmsportHandlingFee.setDeleted(new BigDecimal(0));
         bmsportHandlingFee.setPriceId(priceId);
         bmsportHandlingFee.setFeeId(feeId);
+        bmsportHandlingFee.setFeeNo(feeNo);
         bmsportHandlingFee.setFeeMaterialTonnage(feeMaterialTonnage);
         bmsportHandlingFee.setFeeValue(feeValue);
         bmsportHandlingFee.setMaterialId(materialId);

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

@@ -2,38 +2,35 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.BmsportHandlingFeeMapper">
     <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.BmsportHandlingFee">
-        <id column="FEE_ID" jdbcType="DECIMAL" property="feeId"/>
-        <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId"/>
-        <result column="FEE_FOREIGN_SHIP_NAME" jdbcType="VARCHAR" property="feeForeignShipName"/>
-        <result column="FEE_MATERIAL_TONNAGE" jdbcType="DECIMAL" property="feeMaterialTonnage"/>
-        <result column="PRICE_ID" jdbcType="DECIMAL" property="priceId"/>
-        <result column="FEE_VALUE" jdbcType="DECIMAL" property="feeValue"/>
-        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername"/>
-        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime"/>
-        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername"/>
-        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
-        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
-        <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
+        <id column="FEE_ID" jdbcType="DECIMAL" property="feeId" />
+        <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
+        <result column="FEE_FOREIGN_SHIP_NAME" jdbcType="VARCHAR" property="feeForeignShipName" />
+        <result column="FEE_MATERIAL_TONNAGE" jdbcType="DECIMAL" property="feeMaterialTonnage" />
+        <result column="PRICE_ID" jdbcType="DECIMAL" property="priceId" />
+        <result column="FEE_VALUE" jdbcType="DECIMAL" property="feeValue" />
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+        <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+        <result column="FEE_NO" jdbcType="VARCHAR" property="feeNo" />
     </resultMap>
     <sql id="columns">
         FEE_ID, MATERIAL_ID, FEE_FOREIGN_SHIP_NAME, FEE_MATERIAL_TONNAGE, PRICE_ID, FEE_VALUE,
     INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
-    DELETED
+    DELETED, FEE_NO
     </sql>
     <sql id="columns_alias">
         t.FEE_ID, t.MATERIAL_ID, t.FEE_FOREIGN_SHIP_NAME, t.FEE_MATERIAL_TONNAGE, t.PRICE_ID,
     t.FEE_VALUE, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME,
-    t.INSERT_UPDATE_REMARK, t.DELETED
+    t.INSERT_UPDATE_REMARK, t.DELETED, t.FEE_NO
     </sql>
     <sql id="select">
-        SELECT
-        <include refid="columns"/>
-        FROM BMSPORT_HANDLING_FEE
+        SELECT <include refid="columns"/> FROM BMSPORT_HANDLING_FEE
     </sql>
     <sql id="select_alias">
-        SELECT
-        <include refid="columns_alias"/>
-        FROM BMSPORT_HANDLING_FEE t
+        SELECT <include refid="columns_alias"/> FROM BMSPORT_HANDLING_FEE t
     </sql>
     <sql id="where">
         <where>
@@ -73,6 +70,9 @@
             <if test="deleted != null">
                 and DELETED = #{deleted}
             </if>
+            <if test="feeNo != null and feeNo != ''">
+                and FEE_NO = #{feeNo}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -113,11 +113,13 @@
             <if test="deleted != null">
                 and DELETED = #{deleted}
             </if>
+            <if test="feeNo != null and feeNo != ''">
+                and FEE_NO LIKE '%${feeNo}%'
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-        delete
-        from BMSPORT_HANDLING_FEE
+        delete from BMSPORT_HANDLING_FEE
         where FEE_ID = #{feeId,jdbcType=DECIMAL}
     </delete>
     <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
@@ -156,17 +158,21 @@
         <if test="deleted != null">
             or DELETED = #{deleted}
         </if>
+        <if test="feeNo != null and feeNo != ''">
+            or FEE_NO = #{feeNo}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.BmsportHandlingFee">
         insert into BMSPORT_HANDLING_FEE (FEE_ID, MATERIAL_ID, FEE_FOREIGN_SHIP_NAME,
                                           FEE_MATERIAL_TONNAGE, PRICE_ID, FEE_VALUE,
                                           INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-                                          UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED)
+                                          UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED,
+                                          FEE_NO)
         values (#{feeId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL}, #{feeForeignShipName,jdbcType=VARCHAR},
                 #{feeMaterialTonnage,jdbcType=DECIMAL}, #{priceId,jdbcType=DECIMAL}, #{feeValue,jdbcType=DECIMAL},
-                #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
-                #{updateUsername,jdbcType=VARCHAR},
-                #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL})
+                #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
+                #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL},
+                #{feeNo,jdbcType=VARCHAR})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.BmsportHandlingFee">
         insert into BMSPORT_HANDLING_FEE
@@ -207,6 +213,9 @@
             <if test="deleted != null">
                 DELETED,
             </if>
+            <if test="feeNo != null">
+                FEE_NO,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="feeId != null">
@@ -245,21 +254,25 @@
             <if test="deleted != null">
                 #{deleted,jdbcType=DECIMAL},
             </if>
+            <if test="feeNo != null">
+                #{feeNo,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.BmsportHandlingFee">
         update BMSPORT_HANDLING_FEE
-        set MATERIAL_ID           = #{materialId,jdbcType=DECIMAL},
+        set MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
             FEE_FOREIGN_SHIP_NAME = #{feeForeignShipName,jdbcType=VARCHAR},
-            FEE_MATERIAL_TONNAGE  = #{feeMaterialTonnage,jdbcType=DECIMAL},
-            PRICE_ID              = #{priceId,jdbcType=DECIMAL},
-            FEE_VALUE             = #{feeValue,jdbcType=DECIMAL},
-            INSERT_USERNAME       = #{insertUsername,jdbcType=VARCHAR},
-            INSERT_TIME           = #{insertTime,jdbcType=TIMESTAMP},
-            UPDATE_USERNAME       = #{updateUsername,jdbcType=VARCHAR},
-            UPDATE_TIME           = #{updateTime,jdbcType=TIMESTAMP},
-            INSERT_UPDATE_REMARK  = #{insertUpdateRemark,jdbcType=VARCHAR},
-            DELETED               = #{deleted,jdbcType=DECIMAL}
+            FEE_MATERIAL_TONNAGE = #{feeMaterialTonnage,jdbcType=DECIMAL},
+            PRICE_ID = #{priceId,jdbcType=DECIMAL},
+            FEE_VALUE = #{feeValue,jdbcType=DECIMAL},
+            INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            DELETED = #{deleted,jdbcType=DECIMAL},
+            FEE_NO = #{feeNo,jdbcType=VARCHAR}
         where FEE_ID = #{feeId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.BmsportHandlingFee">
@@ -298,6 +311,9 @@
             <if test="deleted != null">
                 DELETED = #{deleted,jdbcType=DECIMAL},
             </if>
+            <if test="feeNo != null">
+                FEE_NO = #{feeNo,jdbcType=VARCHAR},
+            </if>
         </set>
         where FEE_ID = #{feeId,jdbcType=DECIMAL}
     </update>
@@ -320,16 +336,17 @@
         FEE_MATERIAL_TONNAGE, PRICE_ID,
         FEE_VALUE, INSERT_USERNAME, INSERT_TIME,
         UPDATE_USERNAME, UPDATE_TIME,
-        INSERT_UPDATE_REMARK, DELETED)
+        INSERT_UPDATE_REMARK, DELETED,
+        FEE_NO)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.feeId,jdbcType=DECIMAL},
         #{item.materialId,jdbcType=DECIMAL}, #{item.feeForeignShipName,jdbcType=VARCHAR},
         #{item.feeMaterialTonnage,jdbcType=DECIMAL}, #{item.priceId,jdbcType=DECIMAL},
-        #{item.feeValue,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR},
-        #{item.insertTime,jdbcType=TIMESTAMP},
+        #{item.feeValue,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
         #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
-        #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL} from dual
+        #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
+        #{item.feeNo,jdbcType=VARCHAR} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -383,6 +400,10 @@
         <foreach collection="list" item="item" index="index" separator=" " open="case FEE_ID" close="end">
             when #{item.feeId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
         </foreach>
+        ,FEE_NO=
+        <foreach collection="list" item="item" index="index" separator=" " open="case FEE_ID" close="end">
+            when #{item.feeId,jdbcType=DECIMAL} then #{item.feeNo,jdbcType=VARCHAR}
+        </foreach>
         where FEE_ID in
         <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
             #{item.feeId,jdbcType=DECIMAL}