修改

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

@@ -415,6 +415,17 @@ public class BmsportHandlingFeeController extends BaseRESTfulController {
         return success(list);
     }
 
+    @PostMapping("/getShipFeeStatemented")
+    RESTfulResult getShipFeeStatemented(@RequestBody(required = false)Map<String, Object> map) throws Exception {
+        String startTime=map.get("startTime")+"";
+        String endTime=map.get("endTime")+"";
+        if(!startTime.equals("") && !endTime.equals(""))
+            DataChange.queryDataByDateTime(startTime,endTime, map, sdfDateTime);//根据时间段查询数据
+        else
+            throw new Exception("请输入日期区间!");
+        List<Map<String,Object>> list=bmsportHandlingFeeService.getShipFeeStatemented(map);
+        return success(list);
+    }
     /**
      * 新增三程船水运费及其账单
      * @param

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

@@ -64,4 +64,6 @@ public interface BmsportHandlingFeeMapper extends IBaseMapper<BmsportHandlingFee
     List<Map<String,Object>> findTotalTonnage();
 
     List<Map<String,Object>> getShipFeeStatement(Map map);
+
+    List<Map<String,Object>> getShipFeeStatemented(Map map);
 }

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

@@ -188,6 +188,12 @@ public class BmsshipFee implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="装船比例(保留4位小数)",required=false)
     private BigDecimal loadingProportion;
 
+    /**
+     * 水分检测费(INSPECTIONS_FEE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="水分检测费",required=false)
+    private BigDecimal inspectionsFee;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -440,6 +446,14 @@ public class BmsshipFee implements IBasePO<BigDecimal> {
         this.loadingProportion = loadingProportion;
     }
 
+    public BigDecimal getInspectionsFee() {
+        return inspectionsFee;
+    }
+
+    public void setInspectionsFee(BigDecimal inspectionsFee) {
+        this.inspectionsFee = inspectionsFee;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -476,6 +490,7 @@ public class BmsshipFee implements IBasePO<BigDecimal> {
         sb.append(", totalResultId=").append(totalResultId);
         sb.append(", statementId=").append(statementId);
         sb.append(", loadingProportion=").append(loadingProportion);
+        sb.append(", inspectionsFee=").append(inspectionsFee);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -92,6 +92,12 @@ public class BmsshipStatement implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="到厂湿吨",required=false)
     private BigDecimal totalWetTon;
 
+    /**
+     * 结算状态（0：未结算；1：已结算）(STATEMENT_STATUS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="结算状态（0：未结算；1：已结算）",required=false)
+    private BigDecimal statementStatus;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -216,6 +222,14 @@ public class BmsshipStatement implements IBasePO<BigDecimal> {
         this.totalWetTon = totalWetTon;
     }
 
+    public BigDecimal getStatementStatus() {
+        return statementStatus;
+    }
+
+    public void setStatementStatus(BigDecimal statementStatus) {
+        this.statementStatus = statementStatus;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -236,6 +250,7 @@ public class BmsshipStatement implements IBasePO<BigDecimal> {
         sb.append(", batchId=").append(batchId);
         sb.append(", easAmount=").append(easAmount);
         sb.append(", totalWetTon=").append(totalWetTon);
+        sb.append(", statementStatus=").append(statementStatus);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -90,6 +90,8 @@ public interface IBmsportHandlingFeeService {
 
     List<Map<String,Object>> getShipFeeStatement(Map<String, Object> map);
 
+    List<Map<String,Object>> getShipFeeStatemented(Map<String, Object> map);
+
     Map<BigDecimal, BigDecimal> findTotalTonnage();
 
     BigDecimal getEnFactoryTonnage(Map<String,Object> map);

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

@@ -166,7 +166,7 @@ public class BmsportHandlingFeeServiceImpl implements IBmsportHandlingFeeService
         BigDecimal loadWater=DataChange.dataToBigDecimal(map.get("loadWater"));
         BigDecimal enFacotoryWater=DataChange.dataToBigDecimal(map.get("enFacotoryWater"));
         BigDecimal makeTonnage=DataChange.dataToBigDecimal(map.get("makeTonnage"));
-        BigDecimal makeFee=DataChange.dataToBigDecimal(map.get("feeMake"));
+        BigDecimal makeFee=DataChange.dataToBigDecimal(map.get("actuallyMoney"));
         BigDecimal totalResultId=DataChange.dataToBigDecimal(map.get("totalResultId"));
         if(map.get("makeTime")!=null) {
              makeTime = (long) map.get("makeTime");
@@ -340,6 +340,11 @@ public class BmsportHandlingFeeServiceImpl implements IBmsportHandlingFeeService
         return bmsportHandlingFeeMapper.getShipFeeStatement(map);
     }
 
+    @Override
+    public List<Map<String, Object>> getShipFeeStatemented(Map<String,Object> map) {
+        return bmsportHandlingFeeMapper.getShipFeeStatemented(map);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int addShipFeeStatement(Map<String, Object> map) throws Exception {
@@ -359,9 +364,10 @@ public class BmsportHandlingFeeServiceImpl implements IBmsportHandlingFeeService
         bmsshipStatement.setStatementId(stateMentId);
         bmsshipStatement.setStatementType(map.get("statementType")+"");
         bmsshipStatement.setBatchId(DataChange.dataToBigDecimal(list.get(0).get("batchId")));
-        bmsshipStatement.setStatementTotalAmount(DataChange.dataToBigDecimal(map.get("stateMentTotalAmount")));
+        bmsshipStatement.setStatementTotalAmount(DataChange.dataToBigDecimal(map.get("statementTotalAmount")));
         bmsshipStatement.setTotalWetTon(DataChange.dataToBigDecimal(map.get("totalEnTonnage")));
         bmsshipStatement.setStatementNo("BMSSF"+new Date().getTime());
+        bmsshipStatement.setStatementStatus(new BigDecimal(0));
         bmsshipStatement.setInsertTime(new Date());
         bmsshipStatement.setInsertUsername(personnelName);
         for(Map<String,Object> temp : list) {
@@ -380,8 +386,9 @@ public class BmsportHandlingFeeServiceImpl implements IBmsportHandlingFeeService
                 BigDecimal loadWater=DataChange.dataToBigDecimal(temp.get("loadWater"));
                 BigDecimal enFacotoryWater=DataChange.dataToBigDecimal(temp.get("enFacotoryWater"));
                 BigDecimal makeTonnage=DataChange.dataToBigDecimal(temp.get("makeTonnage"));
-                BigDecimal makeFee=DataChange.dataToBigDecimal(temp.get("feeMake"));
+                BigDecimal makeFee=DataChange.dataToBigDecimal(temp.get("actuallyMoney"));
                 BigDecimal totalResultId=DataChange.dataToBigDecimal(temp.get("totalResultId"));
+                BigDecimal inspectionsFee=DataChange.dataToBigDecimal(temp.get("inspectionFees"));//税后水分质检费
                 //获取主键id
                 bmsshipFee.setResultId(bmsshipFeeMapper.MaxId());
                 bmsshipFee.setStatementId(stateMentId);
@@ -394,6 +401,7 @@ public class BmsportHandlingFeeServiceImpl implements IBmsportHandlingFeeService
                 bmsshipFee.setFeeMake(makeFee);
                 bmsshipFee.setLoadWaterTonnage(loadWater);
                 bmsshipFee.setEnWaterTonnage(enFacotoryWater);
+                bmsshipFee.setInspectionsFee(inspectionsFee);
                 bmsshipFee.setPortId(portId);
                 bmsshipFee.setTotalResultId(totalResultId);
                 bmsshipFee.setImage((String) map.get("image"));
@@ -423,7 +431,8 @@ public class BmsportHandlingFeeServiceImpl implements IBmsportHandlingFeeService
                 BigDecimal loadWater=DataChange.dataToBigDecimal(temp.get("loadWater"));
                 BigDecimal enFacotoryWater=DataChange.dataToBigDecimal(temp.get("enFacotoryWater"));
                 BigDecimal makeTonnage=DataChange.dataToBigDecimal(temp.get("makeTonnage"));
-                BigDecimal makeFee=DataChange.dataToBigDecimal(temp.get("makeTonnage"));
+                BigDecimal makeFee=DataChange.dataToBigDecimal(temp.get("actuallyMoney"));
+                BigDecimal inspectionsFee=DataChange.dataToBigDecimal(temp.get("inspectionFees"));//税后水分质检费
                 bmsshipFee.setRealTonnage(tonnage);
                 bmsshipFee.setPreviewTonnage(previewTonnage);
                 bmsshipFee.setPreviewFee(previewFee);
@@ -434,14 +443,15 @@ public class BmsportHandlingFeeServiceImpl implements IBmsportHandlingFeeService
                 bmsshipFee.setImage((String) map.get("image"));
                 bmsshipFee.setInsertTime(new Date());
                 bmsshipFee.setUnitPrice(unitPrice);
-                bmsshipFee.setUnitPriceId(DataChange.dataToBigDecimal(map.get("unitPriceId")));
-                bmsshipFee.setFee(DataChange.dataToBigDecimal(map.get("fee")));
-                bmsshipFee.setInsertUpdateRemark((String) map.get("resultRemarks"));
+                bmsshipFee.setUnitPriceId(DataChange.dataToBigDecimal(temp.get("unitPriceId")));
+                bmsshipFee.setFee(DataChange.dataToBigDecimal(temp.get("fee")));
+                bmsshipFee.setInsertUpdateRemark((String) temp.get("resultRemarks"));
                 bmsshipFee.setLoadingProportion(DataChange.dataToBigDecimal(temp.get("loadingProportion")));
+                bmsshipFee.setInspectionsFee(inspectionsFee);
                 if (personnelName!=null) {
-                    bmsshipFee.setInsertUsername(personnelName);
+                    bmsshipFee.setUpdateUsername(personnelName);
                 }else {
-                    bmsshipFee.setInsertUsername(userId);
+                    bmsshipFee.setUpdateUsername(userId);
                 }
                 bmsshipFeeMapper.updateByPrimaryKeySelective(bmsshipFee);
             }
@@ -465,14 +475,17 @@ public class BmsportHandlingFeeServiceImpl implements IBmsportHandlingFeeService
         BmsshipStatement bmsshipStatement=new BmsshipStatement();
         BigDecimal stateMentId = DataChange.dataToBigDecimal(list.get(0).get("statementId"));
         bmsshipStatement.setStatementId(stateMentId);
-        bmsshipStatement.setStatementTotalAmount(DataChange.dataToBigDecimal(map.get("stateMentTotalAmount")));
+        bmsshipStatement.setStatementTotalAmount(DataChange.dataToBigDecimal(map.get("statementTotalAmount")));
         bmsshipStatement.setTotalWetTon(DataChange.dataToBigDecimal(map.get("totalEnTonnage")));
         bmsshipStatement.setUpdateTime(new Date());
         bmsshipStatement.setUpdateUsername(personnelName);
+        if(map.get("statementStatus")!=null){
+            bmsshipStatement.setStatementStatus(DataChange.dataToBigDecimal(map.get("statementStatus")));
+        }
         for(Map<String,Object> temp : list) {
             //更新费用详单
             BmsshipFee bmsshipFee =new BmsshipFee();
-            bmsshipFee.setResultId(DataChange.dataToBigDecimal(map.get("feeId")));
+            bmsshipFee.setResultId(DataChange.dataToBigDecimal(temp.get("feeId")));
             BigDecimal unitPrice = DataChange.dataToBigDecimal(temp.get("unitPrice"));
             BigDecimal tonnage =DataChange.dataToBigDecimal(temp.get("realTonnage"));
             BigDecimal previewFee=DataChange.dataToBigDecimal(temp.get("previewFee"));
@@ -480,7 +493,8 @@ public class BmsportHandlingFeeServiceImpl implements IBmsportHandlingFeeService
             BigDecimal loadWater=DataChange.dataToBigDecimal(temp.get("loadWater"));
             BigDecimal enFacotoryWater=DataChange.dataToBigDecimal(temp.get("enFacotoryWater"));
             BigDecimal makeTonnage=DataChange.dataToBigDecimal(temp.get("makeTonnage"));
-            BigDecimal makeFee=DataChange.dataToBigDecimal(temp.get("makeTonnage"));
+            BigDecimal makeFee=DataChange.dataToBigDecimal(temp.get("actuallyMoney"));
+            BigDecimal inspectionsFee=DataChange.dataToBigDecimal(temp.get("inspectionFees"));//税后水分质检费
             bmsshipFee.setRealTonnage(tonnage);
             bmsshipFee.setPreviewTonnage(previewTonnage);
             bmsshipFee.setPreviewFee(previewFee);
@@ -488,16 +502,17 @@ public class BmsportHandlingFeeServiceImpl implements IBmsportHandlingFeeService
             bmsshipFee.setFeeMake(makeFee);
             bmsshipFee.setLoadWaterTonnage(loadWater);
             bmsshipFee.setEnWaterTonnage(enFacotoryWater);
-            bmsshipFee.setImage((String) map.get("image"));
+            bmsshipFee.setImage((String) temp.get("image"));
             bmsshipFee.setInsertTime(new Date());
             bmsshipFee.setUnitPrice(unitPrice);
-            bmsshipFee.setUnitPriceId(DataChange.dataToBigDecimal(map.get("unitPriceId")));
-            bmsshipFee.setFee(DataChange.dataToBigDecimal(map.get("fee")));
+            bmsshipFee.setUnitPriceId(DataChange.dataToBigDecimal(temp.get("unitPriceId")));
+            bmsshipFee.setFee(DataChange.dataToBigDecimal(temp.get("fee")));
+            bmsshipFee.setInspectionsFee(inspectionsFee);
             bmsshipFee.setInsertUpdateRemark((String) map.get("resultRemarks"));
             if (personnelName!=null) {
-                bmsshipFee.setInsertUsername(personnelName);
+                bmsshipFee.setUpdateUsername(personnelName);
             }else {
-                bmsshipFee.setInsertUsername(userId);
+                bmsshipFee.setUpdateUsername(userId);
             }
             bmsshipFeeMapper.updateByPrimaryKeySelective(bmsshipFee);
         }

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

@@ -692,7 +692,7 @@
         db.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",--外轮船名
         RCR.PORT_NAME "carrierName",--承运单位
         tlsr.RESULT_LOAD_SHIP_DATE  "resultLoadShipDate",--装船日期
-        tlsr.RESULT_OUT_PORT_TIME  "resultOutPortTime",--离港日期
+        to_char(tlsr.RESULT_OUT_PORT_TIME,'yyyy-MM-dd') || '(' || RC.CAPACITY_NUMBER  || ')'  "resultOutPortTime",--离港日期
         ADN.PORT_ID "sendPortId",--放货港口id
         rp.PORT_NAME "portName",--放货港口
         bcr.RESULT_ID "unitPriceId",--水运单价id
@@ -704,7 +704,7 @@
         BF.RESULT_ID "feeId",--水运费Id
         BF.PREVIEW_TONNAGE "previewTonnage",--预开湿吨
         BF.PREVIEW_FEE "previewFee",--预开金额
-        BF.FEE_MAKE "feeMake",--开票金额
+        BF.FEE_MAKE "actuallyMoney",--开票金额
         BF.MAKE_TONNAGE "makeTonnage",--开票湿吨
         BF.MAKE_TIME "makeTime",--开票日期
         ttr.RESULT_ID "totalResultId",--装船总实绩id
@@ -713,7 +713,11 @@
         BS.STATEMENT_TOTAL_AMOUNT "stateMentTotalAmount",--账单总金额
         BS.STATEMENT_SHIPPER_ID "stateMentShipperId",--结算单位id
         RS.SHIPPER_NAME "shipperName",--结算单位名
-        ADN.INSERT_TIME "noticeTime"
+        ADN.INSERT_TIME "noticeTime",
+        (case
+            when BF.result_id is not null then BF.INSPECTIONS_FEE
+            when BF.result_id is null then ROUND(TWQR.RESULT_INSPECTION_FEES/1.06*1.09,2)
+        end) "inspectionFees"
         FROM TMSSHIP_LOAD_SHIP_RESULT tlsr
         LEFT JOIN TMSSHIP_TOTAL_RESULT ttr
         ON ttr.RESULT_ID = tlsr.TOTAL_RESULT_ID
@@ -750,6 +754,7 @@
         LEFT JOIN RMS_PORT RCR
         on ada.CARRIER_ID=RCR.PORT_ID
         WHERE tlsr.DELETED=0 AND adn.DELETED=0
+        and (BS.STATEMENT_ID is null or BS.STATEMENT_STATUS=0)
         <if test="con!=null and con!=''.toString()">
          and (
             RM.MATERIAL_NAME like concat('%',concat(#{con},'%'))
@@ -784,5 +789,93 @@
         GROUP BY DB.BATCH_ID,TLSR.DELETED
         HAVING TLSR.DELETED=0
     </select>
+    <select id="getShipFeeStatemented" resultType="java.util.Map">
+        --查询计费详单及其计费账单信息
+        select  * from(
+        SELECT
+        DISTINCT db.BATCH_ID "batchId",--批次id
+        apo.PURCHASE_ORDER_ID "purchaseOrderId",--采购订单id
+        RM.MATERIAL_NAME "materialName",--物资名
+        RC.CAPACITY_NUMBER "capacityNumber",--江船船名
+        db.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",--外轮船名
+        RCR.PORT_NAME "carrierName",--承运单位
+        tlsr.RESULT_LOAD_SHIP_DATE  "resultLoadShipDate",--装船日期
+        to_char(tlsr.RESULT_OUT_PORT_TIME,'yyyy-MM-dd') || '(' || RC.CAPACITY_NUMBER  || ')'  "resultOutPortTime",--离港日期
+        ADN.PORT_ID "sendPortId",--放货港口id
+        rp.PORT_NAME "portName",--放货港口
+        bcr.RESULT_ID "unitPriceId",--水运单价id
+        BCR.UNIT_PRICE "unitPrice",--水运单价
+        tlsr.RESULT_ACTUAL_INSTALLATIONS "loadTonnage",--装船实装湿吨
+        BF.LOADING_PROPORTION "loadingProportion",--装船比例
+        BF.REAL_TONNAGE "realTonnage",--结算湿吨
+        BF.FEE "fee",--水运费
+        BF.RESULT_ID "feeId",--水运费Id
+        BF.PREVIEW_TONNAGE "previewTonnage",--预开湿吨
+        BF.PREVIEW_FEE "previewFee",--预开金额
+        BF.FEE_MAKE "feeMake",--开票金额
+        BF.MAKE_TONNAGE "makeTonnage",--开票湿吨
+        BF.MAKE_TIME "makeTime",--开票日期
+        ttr.RESULT_ID "totalResultId",--装船总实绩id
+        BS.STATEMENT_ID "statementId",--账单id
+        BS.TOTAL_WET_TON "totalEnTonnage",--到场湿吨
+        BS.STATEMENT_TOTAL_AMOUNT "statementTotalAmount",--账单总金额
+        BS.STATEMENT_SHIPPER_ID "stateMentShipperId",--结算单位id
+        RS.SHIPPER_NAME "shipperName",--结算单位名
+        ADN.INSERT_TIME "noticeTime",
+        BF.INSPECTIONS_FEE "inspectionFees",
+        (SELECT SUM(BF_TEMP.MAKE_TONNAGE)
+        FROM BMSSHIP_FEE BF_TEMP
+        WHERE BF_TEMP.STATEMENT_ID=BS.STATEMENT_ID) "makeTonnageTotal"
+        FROM
+        BMSSHIP_STATEMENT BS
+        LEFT JOIN BMSSHIP_FEE BF
+        ON BF.STATEMENT_ID=BS.STATEMENT_ID
+        LEFT JOIN TMSSHIP_TOTAL_RESULT ttr
+        ON BF.TOTAL_RESULT_ID=TTR.RESULT_ID
+        LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT tlsr
+        ON ttr.RESULT_ID = tlsr.TOTAL_RESULT_ID
+        LEFT JOIN TMSSHIP_WATER_QUALITY_RESULT TWQR
+        ON TWQR.TOTAL_RESULT_ID=TTR.RESULT_ID
+        LEFT JOIN DIL_BATCH_INFACOTRY dbi
+        ON dbi.BATCH_INFACOTRY_ID = tlsr.BATCH_ID
+        LEFT JOIN DIL_BATCH db
+        ON db.BATCH_ID = dbi.BATCH_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID=DB.MATERIAL_ID
+        LEFT JOIN BMSSHIP_CONTRACT_PRICE bcr
+        ON TWQR.UNIT_PRICE_ID=BCR.RESULT_ID
+        LEFT JOIN AMSSHIP_DELIVERY_NOTICE adn
+        ON adn.BATCH_ID=dbi.BATCH_INFACOTRY_ID
+        LEFT JOIN RMS_PORT	rp
+        ON rp.PORT_ID=adn.PORT_ID
+        LEFT JOIN AMS_PURCHASE_ORDER apo
+        ON db.BATCH_ID=apo.BATCH_ID
+        LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY oic
+        ON oic.INSTRUCTIONS_CAPACITY_ID = ttr.ORDER_ID
+        LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
+        ON osi.SHIPMENT_INSTRUCTIONS_ID = oic.INSTRUCTIONS_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID=OIC.CAPACITY_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID=BS.STATEMENT_ID
+        LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ada
+        on ada.BATCH_ID=dbi.BATCH_INFACOTRY_ID
+        LEFT JOIN RMS_PORT RCR
+        on ada.CARRIER_ID=RCR.PORT_ID
+        WHERE tlsr.DELETED=0 AND adn.DELETED=0 and BS.STATEMENT_STATUS=1
+        <if test="con!=null and con!=''.toString()">
+            and (
+            RM.MATERIAL_NAME like concat('%',concat(#{con},'%'))
+            or  RC.CAPACITY_NUMBER like concat('%',concat(#{con},'%'))
+            or db.RESULT_FOREIGN_SHIP_NAME like concat('%',concat(#{con},'%'))
+            or rp.PORT_NAME like concat('%',concat(#{con},'%'))
+            )
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= tlsr.RESULT_OUT_PORT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= tlsr.RESULT_OUT_PORT_TIME
+        </if>
+        ) ORDER BY "noticeTime" DESC,"statementId" ASC
+    </select>
 
 </mapper>

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

@@ -32,21 +32,22 @@
     <result column="TOTAL_RESULT_ID" jdbcType="DECIMAL" property="totalResultId" />
     <result column="STATEMENT_ID" jdbcType="DECIMAL" property="statementId" />
     <result column="LOADING_PROPORTION" jdbcType="DECIMAL" property="loadingProportion" />
+    <result column="INSPECTIONS_FEE" jdbcType="DECIMAL" property="inspectionsFee" />
   </resultMap>
   <sql id="columns">
-    RESULT_ID, FEE, FEE_TYPE, PURCHASE_ORDER_ID, BATCH_ID, REAL_TONNAGE, UNIT_PRICE,
-    UNIT_PRICE_ID, RESULT_REMARKS, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
-    INSERT_UPDATE_REMARK, DELETED, IMAGE, WAGON_NUMBER, MAKE_TIME, PORT_ID, PORT_NUM,
-    SHIP_NUM, PREVIEW_FEE, PREVIEW_TONNAGE, FEE_MAKE, MAKE_TONNAGE, LOAD_WATER_TONNAGE,
-    EN_WATER_TONNAGE, TOTAL_RESULT_ID, STATEMENT_ID, LOADING_PROPORTION
+    RESULT_ID, FEE, FEE_TYPE, PURCHASE_ORDER_ID, BATCH_ID, REAL_TONNAGE, UNIT_PRICE, 
+    UNIT_PRICE_ID, RESULT_REMARKS, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
+    INSERT_UPDATE_REMARK, DELETED, IMAGE, WAGON_NUMBER, MAKE_TIME, PORT_ID, PORT_NUM, 
+    SHIP_NUM, PREVIEW_FEE, PREVIEW_TONNAGE, FEE_MAKE, MAKE_TONNAGE, LOAD_WATER_TONNAGE, 
+    EN_WATER_TONNAGE, TOTAL_RESULT_ID, STATEMENT_ID, LOADING_PROPORTION, INSPECTIONS_FEE
   </sql>
   <sql id="columns_alias">
-    t.RESULT_ID, t.FEE, t.FEE_TYPE, t.PURCHASE_ORDER_ID, t.BATCH_ID, t.REAL_TONNAGE,
-    t.UNIT_PRICE, t.UNIT_PRICE_ID, t.RESULT_REMARKS, t.INSERT_USERNAME, t.INSERT_TIME,
-    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, t.IMAGE, t.WAGON_NUMBER,
-    t.MAKE_TIME, t.PORT_ID, t.PORT_NUM, t.SHIP_NUM, t.PREVIEW_FEE, t.PREVIEW_TONNAGE,
-    t.FEE_MAKE, t.MAKE_TONNAGE, t.LOAD_WATER_TONNAGE, t.EN_WATER_TONNAGE, t.TOTAL_RESULT_ID,
-    t.STATEMENT_ID, t.LOADING_PROPORTION
+    t.RESULT_ID, t.FEE, t.FEE_TYPE, t.PURCHASE_ORDER_ID, t.BATCH_ID, t.REAL_TONNAGE, 
+    t.UNIT_PRICE, t.UNIT_PRICE_ID, t.RESULT_REMARKS, t.INSERT_USERNAME, t.INSERT_TIME, 
+    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, t.IMAGE, t.WAGON_NUMBER, 
+    t.MAKE_TIME, t.PORT_ID, t.PORT_NUM, t.SHIP_NUM, t.PREVIEW_FEE, t.PREVIEW_TONNAGE, 
+    t.FEE_MAKE, t.MAKE_TONNAGE, t.LOAD_WATER_TONNAGE, t.EN_WATER_TONNAGE, t.TOTAL_RESULT_ID, 
+    t.STATEMENT_ID, t.LOADING_PROPORTION, t.INSPECTIONS_FEE
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM BMSSHIP_FEE
@@ -146,6 +147,9 @@
       <if test="loadingProportion != null">
         and LOADING_PROPORTION = #{loadingProportion}
       </if>
+      <if test="inspectionsFee != null">
+        and INSPECTIONS_FEE = #{inspectionsFee}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -240,6 +244,9 @@
       <if test="loadingProportion != null">
         and LOADING_PROPORTION = #{loadingProportion}
       </if>
+      <if test="inspectionsFee != null">
+        and INSPECTIONS_FEE = #{inspectionsFee}
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
@@ -336,6 +343,9 @@
     <if test="loadingProportion != null">
       or LOADING_PROPORTION = #{loadingProportion}
     </if>
+    <if test="inspectionsFee != null">
+      or INSPECTIONS_FEE = #{inspectionsFee}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.BmsshipFee">
     insert into BMSSHIP_FEE (RESULT_ID, FEE, FEE_TYPE,
@@ -347,8 +357,8 @@
                              PORT_ID, PORT_NUM, SHIP_NUM,
                              PREVIEW_FEE, PREVIEW_TONNAGE, FEE_MAKE,
                              MAKE_TONNAGE, LOAD_WATER_TONNAGE, EN_WATER_TONNAGE,
-                             TOTAL_RESULT_ID, STATEMENT_ID, LOADING_PROPORTION
-    )
+                             TOTAL_RESULT_ID, STATEMENT_ID, LOADING_PROPORTION,
+                             INSPECTIONS_FEE)
     values (#{resultId,jdbcType=DECIMAL}, #{fee,jdbcType=DECIMAL}, #{feeType,jdbcType=DECIMAL},
             #{purchaseOrderId,jdbcType=DECIMAL}, #{batchId,jdbcType=DECIMAL}, #{realTonnage,jdbcType=DECIMAL},
             #{unitPrice,jdbcType=DECIMAL}, #{unitPriceId,jdbcType=DECIMAL}, #{resultRemarks,jdbcType=VARCHAR},
@@ -358,8 +368,8 @@
             #{portId,jdbcType=DECIMAL}, #{portNum,jdbcType=DECIMAL}, #{shipNum,jdbcType=DECIMAL},
             #{previewFee,jdbcType=DECIMAL}, #{previewTonnage,jdbcType=DECIMAL}, #{feeMake,jdbcType=DECIMAL},
             #{makeTonnage,jdbcType=DECIMAL}, #{loadWaterTonnage,jdbcType=DECIMAL}, #{enWaterTonnage,jdbcType=DECIMAL},
-            #{totalResultId,jdbcType=DECIMAL}, #{statementId,jdbcType=DECIMAL}, #{loadingProportion,jdbcType=DECIMAL}
-           )
+            #{totalResultId,jdbcType=DECIMAL}, #{statementId,jdbcType=DECIMAL}, #{loadingProportion,jdbcType=DECIMAL},
+            #{inspectionsFee,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.BmsshipFee">
     insert into BMSSHIP_FEE
@@ -454,6 +464,9 @@
       <if test="loadingProportion != null">
         LOADING_PROPORTION,
       </if>
+      <if test="inspectionsFee != null">
+        INSPECTIONS_FEE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="resultId != null">
@@ -546,6 +559,9 @@
       <if test="loadingProportion != null">
         #{loadingProportion,jdbcType=DECIMAL},
       </if>
+      <if test="inspectionsFee != null">
+        #{inspectionsFee,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.BmsshipFee">
@@ -578,7 +594,8 @@
         EN_WATER_TONNAGE = #{enWaterTonnage,jdbcType=DECIMAL},
         TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL},
         STATEMENT_ID = #{statementId,jdbcType=DECIMAL},
-        LOADING_PROPORTION = #{loadingProportion,jdbcType=DECIMAL}
+        LOADING_PROPORTION = #{loadingProportion,jdbcType=DECIMAL},
+        INSPECTIONS_FEE = #{inspectionsFee,jdbcType=DECIMAL}
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.BmsshipFee">
@@ -671,6 +688,9 @@
       <if test="loadingProportion != null">
         LOADING_PROPORTION = #{loadingProportion,jdbcType=DECIMAL},
       </if>
+      <if test="inspectionsFee != null">
+        INSPECTIONS_FEE = #{inspectionsFee,jdbcType=DECIMAL},
+      </if>
     </set>
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
@@ -699,8 +719,8 @@
     SHIP_NUM, PREVIEW_FEE, PREVIEW_TONNAGE,
     FEE_MAKE, MAKE_TONNAGE, LOAD_WATER_TONNAGE,
     EN_WATER_TONNAGE, TOTAL_RESULT_ID,
-    STATEMENT_ID, LOADING_PROPORTION
-    )
+    STATEMENT_ID, LOADING_PROPORTION,
+    INSPECTIONS_FEE)
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.resultId,jdbcType=DECIMAL},
@@ -714,8 +734,8 @@
     #{item.shipNum,jdbcType=DECIMAL}, #{item.previewFee,jdbcType=DECIMAL}, #{item.previewTonnage,jdbcType=DECIMAL},
     #{item.feeMake,jdbcType=DECIMAL}, #{item.makeTonnage,jdbcType=DECIMAL}, #{item.loadWaterTonnage,jdbcType=DECIMAL},
     #{item.enWaterTonnage,jdbcType=DECIMAL}, #{item.totalResultId,jdbcType=DECIMAL},
-    #{item.statementId,jdbcType=DECIMAL}, #{item.loadingProportion,jdbcType=DECIMAL}
-    from dual
+    #{item.statementId,jdbcType=DECIMAL}, #{item.loadingProportion,jdbcType=DECIMAL},
+    #{item.inspectionsFee,jdbcType=DECIMAL} from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -841,6 +861,10 @@
     <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.loadingProportion,jdbcType=DECIMAL}
     </foreach>
+    ,INSPECTIONS_FEE=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.inspectionsFee,jdbcType=DECIMAL}
+    </foreach>
     where RESULT_ID in
     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
       #{item.resultId,jdbcType=DECIMAL}

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

@@ -16,16 +16,18 @@
         <result column="BATCH_ID" jdbcType="DECIMAL" property="batchId" />
         <result column="EAS_AMOUNT" jdbcType="DECIMAL" property="easAmount" />
         <result column="TOTAL_WET_TON" jdbcType="DECIMAL" property="totalWetTon" />
+        <result column="STATEMENT_STATUS" jdbcType="DECIMAL" property="statementStatus" />
     </resultMap>
     <sql id="columns">
-        STATEMENT_ID, STATEMENT_NO, STATEMENT_SHIPPER_ID, STATEMENT_TOTAL_AMOUNT, STATEMENT_DATE, 
-    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-    STATEMENT_TYPE, BATCH_ID, EAS_AMOUNT, TOTAL_WET_TON
+        STATEMENT_ID, STATEMENT_NO, STATEMENT_SHIPPER_ID, STATEMENT_TOTAL_AMOUNT, STATEMENT_DATE,
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+    STATEMENT_TYPE, BATCH_ID, EAS_AMOUNT, TOTAL_WET_TON, STATEMENT_STATUS
     </sql>
     <sql id="columns_alias">
-        t.STATEMENT_ID, t.STATEMENT_NO, t.STATEMENT_SHIPPER_ID, t.STATEMENT_TOTAL_AMOUNT, 
-    t.STATEMENT_DATE, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, 
-    t.INSERT_UPDATE_REMARK, t.STATEMENT_TYPE, t.BATCH_ID, t.EAS_AMOUNT, t.TOTAL_WET_TON
+        t.STATEMENT_ID, t.STATEMENT_NO, t.STATEMENT_SHIPPER_ID, t.STATEMENT_TOTAL_AMOUNT,
+    t.STATEMENT_DATE, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME,
+    t.INSERT_UPDATE_REMARK, t.STATEMENT_TYPE, t.BATCH_ID, t.EAS_AMOUNT, t.TOTAL_WET_TON,
+    t.STATEMENT_STATUS
     </sql>
     <sql id="select">
         SELECT <include refid="columns" /> FROM BMSSHIP_STATEMENT
@@ -77,6 +79,9 @@
             <if test="totalWetTon != null">
                 and TOTAL_WET_TON = #{totalWetTon}
             </if>
+            <if test="statementStatus != null">
+                and STATEMENT_STATUS = #{statementStatus}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -123,6 +128,9 @@
             <if test="totalWetTon != null">
                 and TOTAL_WET_TON = #{totalWetTon}
             </if>
+            <if test="statementStatus != null">
+                and STATEMENT_STATUS = #{statementStatus}
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
@@ -171,20 +179,23 @@
         <if test="totalWetTon != null">
             or TOTAL_WET_TON = #{totalWetTon}
         </if>
+        <if test="statementStatus != null">
+            or STATEMENT_STATUS = #{statementStatus}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.BmsshipStatement">
         insert into BMSSHIP_STATEMENT (STATEMENT_ID, STATEMENT_NO, STATEMENT_SHIPPER_ID,
                                        STATEMENT_TOTAL_AMOUNT, STATEMENT_DATE,
                                        INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
                                        UPDATE_TIME, INSERT_UPDATE_REMARK, STATEMENT_TYPE,
-                                       BATCH_ID, EAS_AMOUNT, TOTAL_WET_TON
-        )
+                                       BATCH_ID, EAS_AMOUNT, TOTAL_WET_TON,
+                                       STATEMENT_STATUS)
         values (#{statementId,jdbcType=DECIMAL}, #{statementNo,jdbcType=VARCHAR}, #{statementShipperId,jdbcType=DECIMAL},
                 #{statementTotalAmount,jdbcType=DECIMAL}, #{statementDate,jdbcType=TIMESTAMP},
                 #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
                 #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{statementType,jdbcType=VARCHAR},
-                #{batchId,jdbcType=DECIMAL}, #{easAmount,jdbcType=DECIMAL}, #{totalWetTon,jdbcType=DECIMAL}
-               )
+                #{batchId,jdbcType=DECIMAL}, #{easAmount,jdbcType=DECIMAL}, #{totalWetTon,jdbcType=DECIMAL},
+                #{statementStatus,jdbcType=DECIMAL})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.BmsshipStatement">
         insert into BMSSHIP_STATEMENT
@@ -231,6 +242,9 @@
             <if test="totalWetTon != null">
                 TOTAL_WET_TON,
             </if>
+            <if test="statementStatus != null">
+                STATEMENT_STATUS,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="statementId != null">
@@ -275,6 +289,9 @@
             <if test="totalWetTon != null">
                 #{totalWetTon,jdbcType=DECIMAL},
             </if>
+            <if test="statementStatus != null">
+                #{statementStatus,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.BmsshipStatement">
@@ -291,7 +308,8 @@
             STATEMENT_TYPE = #{statementType,jdbcType=VARCHAR},
             BATCH_ID = #{batchId,jdbcType=DECIMAL},
             EAS_AMOUNT = #{easAmount,jdbcType=DECIMAL},
-            TOTAL_WET_TON = #{totalWetTon,jdbcType=DECIMAL}
+            TOTAL_WET_TON = #{totalWetTon,jdbcType=DECIMAL},
+            STATEMENT_STATUS = #{statementStatus,jdbcType=DECIMAL}
         where STATEMENT_ID = #{statementId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.BmsshipStatement">
@@ -336,6 +354,9 @@
             <if test="totalWetTon != null">
                 TOTAL_WET_TON = #{totalWetTon,jdbcType=DECIMAL},
             </if>
+            <if test="statementStatus != null">
+                STATEMENT_STATUS = #{statementStatus,jdbcType=DECIMAL},
+            </if>
         </set>
         where STATEMENT_ID = #{statementId,jdbcType=DECIMAL}
     </update>
@@ -359,8 +380,8 @@
         INSERT_USERNAME, INSERT_TIME,
         UPDATE_USERNAME, UPDATE_TIME,
         INSERT_UPDATE_REMARK, STATEMENT_TYPE,
-        BATCH_ID, EAS_AMOUNT, TOTAL_WET_TON
-        )
+        BATCH_ID, EAS_AMOUNT, TOTAL_WET_TON,
+        STATEMENT_STATUS)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.statementId,jdbcType=DECIMAL},
@@ -369,8 +390,8 @@
         #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
         #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
         #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.statementType,jdbcType=VARCHAR},
-        #{item.batchId,jdbcType=DECIMAL}, #{item.easAmount,jdbcType=DECIMAL}, #{item.totalWetTon,jdbcType=DECIMAL}
-        from dual
+        #{item.batchId,jdbcType=DECIMAL}, #{item.easAmount,jdbcType=DECIMAL}, #{item.totalWetTon,jdbcType=DECIMAL},
+        #{item.statementStatus,jdbcType=DECIMAL} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -432,6 +453,10 @@
         <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
             when #{item.statementId,jdbcType=DECIMAL} then #{item.totalWetTon,jdbcType=DECIMAL}
         </foreach>
+        ,STATEMENT_STATUS=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.statementStatus,jdbcType=DECIMAL}
+        </foreach>
         where STATEMENT_ID in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.statementId,jdbcType=DECIMAL}