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

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

@@ -35,18 +35,18 @@ public class AmsPurchaseOrderController extends BaseRESTfulController {
      */
     @ApiModelProperty(value = "采购订单管理对接接口")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "EASPurchaseId", value = "1", required = true, dataType = "java.util.Integer"),
-            @ApiImplicitParam(name = "purchaseOrderNo", value = "WCGDD2021083000000007", required = true, dataType = "java.lang.String"),
-            @ApiImplicitParam(name = "materialCode", value = "08010102010300006", required = true, dataType = "java.lang.String"),
-            @ApiImplicitParam(name = "resultForeignShipName", value = "未来A", required = true, dataType = "java.lang.String"),
-            @ApiImplicitParam(name = "purchaseOrderBuyer", value = "张三", required = true, dataType = "java.lang.String"),
-            @ApiImplicitParam(name = "sendUnit", value = "四川美立达矿业有限责任公司", required = true, dataType = "java.lang.String"),
-            @ApiImplicitParam(name = "purchaseOrganization", value = "四川达州钢铁集团有限责任公司", required = true, dataType = "java.lang.String"),
-            @ApiImplicitParam(name = "receiveUnit", value = "四川达州钢铁集团有限责任公司", required = true, dataType = "java.lang.String"),
-            @ApiImplicitParam(name = "purchaseOrderMaterialNumber", value = "200", required = true, dataType = "java.util.Double"),
-            @ApiImplicitParam(name = "purchaseOrderDate", value = "2021-10-09 14:10:34", required = true, dataType = "java.util.Date"),
-            @ApiImplicitParam(name = "supplierDutyParagraph", value = "SCMLD20211027", required = true, dataType = "java.lang.String"),
-            @ApiImplicitParam(name = "dataStatus", value = "1", required = true, dataType = "java.util.Integer"),
+            @ApiImplicitParam(name = "EASPurchaseId", value = "1", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "purchaseOrderNo", value = "WCGDD2021083000000007", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "materialCode", value = "08010102010300006", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "resultForeignShipName", value = "未来A", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "purchaseOrderBuyer", value = "张三", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "sendUnit", value = "四川美立达矿业有限责任公司", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "purchaseOrganization", value = "四川达州钢铁集团有限责任公司", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "receiveUnit", value = "四川达州钢铁集团有限责任公司", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "purchaseOrderMaterialNumber", value = "200", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "purchaseOrderDate", value = "1636426968000", required = true, dataType = "Long"),
+            @ApiImplicitParam(name = "supplierDutyParagraph", value = "SCMLD20211027", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "dataStatus", value = "1", required = true, dataType = "Integer"),
     })
     @PostMapping("/operationPurchaseOrder")
     public RESTfulResult operationPurchaseOrder(@RequestBody Map<String, Object> mapVal) {

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.service.impl.BmsportHandlingFeeServiceImpl;
 import com.steerinfo.dil.service.impl.BmstruckStatementServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
@@ -22,38 +23,23 @@ import java.util.Map;
 public class BmsportHandlingFeeController extends BaseRESTfulController {
 
     @Autowired
-    BmstruckStatementServiceImpl bmstruckStatementService;
+    BmsportHandlingFeeServiceImpl bmsportHandlingFeeService;
 
     /**
      * 销售汽运账单接口
      *
-     * @param statementId
+     * @param feeId
      * @return
      */
     @ApiModelProperty(value = "销售汽运账单接口")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "statementId", value = "账单主键id", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "feeId", value = "港口装卸费主键id", required = true, dataType = "Integer"),
     })
-    @PostMapping("/getStatement")
-    public RESTfulResult getStatement(@RequestParam Integer statementId) {
-        Map<String,Object> mapValue = bmstruckStatementService.getStatement(statementId);
-        return success(mapValue);
+    @PostMapping("/getPortFee")
+    public Map<String,Object> getPortFee(@RequestParam Integer feeId) {
+        Map<String,Object> mapValue = bmsportHandlingFeeService.getPortFee(feeId);
+        return mapValue;
     }
 
-    /**
-     * 销售汽运账单接口
-     *
-     * @param mapValue
-     * @return
-     */
-    @ApiModelProperty(value = "销售汽运账单接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "账单主键id", required = true, dataType = "MAP"),
-    })
-    @PostMapping("/updateStatement")
-    public RESTfulResult updateStatement(@RequestBody Map<String,Object> mapValue) {
-        int result = bmstruckStatementService.updateStatement(mapValue);
-        return success(result);
-    }
 
 }

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

@@ -1,8 +1,7 @@
 package com.steerinfo.dil.controller;
 
-import com.steerinfo.dil.service.impl.BmstruckDetailsOrderServiceImpl;
+import com.steerinfo.dil.service.impl.BmsshipDetailsOrderServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
@@ -26,38 +25,22 @@ import java.util.Map;
 public class BmsshipDetailsOrderController extends BaseRESTfulController {
 
     @Autowired
-    BmstruckDetailsOrderServiceImpl bmstruckDetailsOrderService;
+    BmsshipDetailsOrderServiceImpl bmsshipDetailsOrderService;
 
     /**
-     * 采购汽运详单接口
-     *
-     * @param detailsId
-     * @return
-     */
-    @ApiModelProperty(value = "采购汽运详单接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "detailsId", value = "详单主键id", required = true, dataType = "Integer"),
-    })
-    @PostMapping("/getPurchaseDetailsOrder")
-    public RESTfulResult getPurchaseDetailsOrder(@RequestParam Integer detailsId) {
-        Map<String,Object> mapValue = bmstruckDetailsOrderService.getPurchaseDetailsOrder(detailsId);
-        return success(mapValue);
-    }
-
-    /**
-     * 销售汽运详单接口
+     * 采购船运详单接口
      *
      * @param statementId
      * @return
      */
-    @ApiModelProperty(value = "销售汽运详单接口")
+    @ApiModelProperty(value = "采购船运详单接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "statementId", value = "账单主键id", required = true, dataType = "Integer"),
     })
-    @PostMapping("/getSaleDetailsOrder")
-    public RESTfulResult getSaleDetailsOrder(@RequestParam Integer statementId) {
-        List<Map<String, Object>> mapValue = bmstruckDetailsOrderService.getSaleDetailsOrder(statementId);
-        return success(mapValue);
+    @PostMapping("/getPurchaseShipDetails")
+    public List<Map<String, Object>> getPurchaseShipDetails(@RequestParam Integer statementId) {
+        List<Map<String,Object>> mapList = bmsshipDetailsOrderService.getPurchaseShipDetails(statementId);
+        return mapList;
     }
 
 

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

@@ -1,8 +1,7 @@
 package com.steerinfo.dil.controller;
 
-import com.steerinfo.dil.service.impl.BmstruckStatementServiceImpl;
+import com.steerinfo.dil.service.impl.BmsshipStatementServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
@@ -22,38 +21,23 @@ import java.util.Map;
 public class BmsshipStatementController extends BaseRESTfulController {
 
     @Autowired
-    BmstruckStatementServiceImpl bmstruckStatementService;
+    BmsshipStatementServiceImpl bmsshipStatementService;
 
     /**
-     * 销售汽运账单接口
+     * 采购船运账单接口
      *
      * @param statementId
      * @return
      */
-    @ApiModelProperty(value = "销售汽运账单接口")
+    @ApiModelProperty(value = "采购船运账单接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "statementId", value = "账单主键id", required = true, dataType = "Integer"),
     })
-    @PostMapping("/getStatement")
-    public RESTfulResult getStatement(@RequestParam Integer statementId) {
-        Map<String,Object> mapValue = bmstruckStatementService.getStatement(statementId);
-        return success(mapValue);
+    @PostMapping("/getShipStatement")
+    public Map<String, Object> getShipStatement(@RequestParam Integer statementId) {
+        Map<String,Object> mapValue = bmsshipStatementService.getShipStatement(statementId);
+        return mapValue;
     }
 
-    /**
-     * 销售汽运账单接口
-     *
-     * @param mapValue
-     * @return
-     */
-    @ApiModelProperty(value = "销售汽运账单接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "账单主键id", required = true, dataType = "MAP"),
-    })
-    @PostMapping("/updateStatement")
-    public RESTfulResult updateStatement(@RequestBody Map<String,Object> mapValue) {
-        int result = bmstruckStatementService.updateStatement(mapValue);
-        return success(result);
-    }
 
 }

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

@@ -1,9 +1,7 @@
 package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.service.impl.BmstrainDetailsOrderServiceImpl;
-import com.steerinfo.dil.service.impl.BmstruckDetailsOrderServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
@@ -40,9 +38,9 @@ public class BmstrainDetailsOrderController extends BaseRESTfulController {
             @ApiImplicitParam(name = "StatementId", value = "账单主键id", required = true, dataType = "Integer"),
     })
     @PostMapping("/getPurchaseTrainDetailsOrder")
-    public RESTfulResult getPurchaseTrainDetailsOrder(@RequestParam Integer StatementId) {
+    public List<Map<String, Object>> getPurchaseTrainDetailsOrder(@RequestParam Integer StatementId) {
         List<Map<String, Object>> mapValue = bmstrainDetailsOrderService.getPurchaseTrainDetailsOrder(StatementId);
-        return success(mapValue);
+        return mapValue;
     }
 
 

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

@@ -1,8 +1,7 @@
 package com.steerinfo.dil.controller;
 
-import com.steerinfo.dil.service.impl.BmstruckStatementServiceImpl;
+import com.steerinfo.dil.service.impl.BmstrainSettlementServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
@@ -22,38 +21,21 @@ import java.util.Map;
 public class BmstrainSettlementController extends BaseRESTfulController {
 
     @Autowired
-    BmstruckStatementServiceImpl bmstruckStatementService;
+    BmstrainSettlementServiceImpl bmstrainSettlementService;
 
     /**
-     * 销售汽运账单接口
+     * 销售火运结算接口
      *
-     * @param statementId
+     * @param settlementId
      * @return
      */
-    @ApiModelProperty(value = "销售汽运账单接口")
+    @ApiModelProperty(value = "销售火运结算接口")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "statementId", value = "账单主键id", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "settlementId", value = "销售火运结算主键id", required = true, dataType = "Integer"),
     })
-    @PostMapping("/getStatement")
-    public RESTfulResult getStatement(@RequestParam Integer statementId) {
-        Map<String,Object> mapValue = bmstruckStatementService.getStatement(statementId);
-        return success(mapValue);
+    @PostMapping("/getTrainSettlement")
+    public Map<String, Object> getTrainSettlement(@RequestParam Integer settlementId) {
+        Map<String,Object> mapValue = bmstrainSettlementService.getTrainSettlement(settlementId);
+        return mapValue;
     }
-
-    /**
-     * 销售汽运账单接口
-     *
-     * @param mapValue
-     * @return
-     */
-    @ApiModelProperty(value = "销售汽运账单接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "账单主键id", required = true, dataType = "MAP"),
-    })
-    @PostMapping("/updateStatement")
-    public RESTfulResult updateStatement(@RequestBody Map<String,Object> mapValue) {
-        int result = bmstruckStatementService.updateStatement(mapValue);
-        return success(result);
-    }
-
 }

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

@@ -1,8 +1,6 @@
 package com.steerinfo.dil.controller;
 
-import com.steerinfo.dil.model.BmstrainStatement;
 import com.steerinfo.dil.service.impl.BmstrainStatementServiceImpl;
-import com.steerinfo.dil.service.impl.BmstruckStatementServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
@@ -37,9 +35,9 @@ public class BmstrainStatementController extends BaseRESTfulController {
             @ApiImplicitParam(name = "statementId", value = "账单主键id", required = true, dataType = "Integer"),
     })
     @PostMapping("/getTrainStatement")
-    public RESTfulResult getTrainStatement(@RequestParam Integer statementId) {
+    public Map<String, Object> getTrainStatement(@RequestParam Integer statementId) {
         Map<String,Object> mapValue = bmstrainStatementService.getTrainStatement(statementId);
-        return success(mapValue);
+        return mapValue;
     }
 
     /**

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

@@ -1,9 +1,7 @@
 package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.service.impl.BmstruckDetailsOrderServiceImpl;
-import com.steerinfo.dil.service.impl.BmstruckStatementServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
@@ -40,9 +38,9 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
             @ApiImplicitParam(name = "detailsId", value = "详单主键id", required = true, dataType = "Integer"),
     })
     @PostMapping("/getPurchaseDetailsOrder")
-    public RESTfulResult getPurchaseDetailsOrder(@RequestParam Integer detailsId) {
+    public Map<String, Object> getPurchaseDetailsOrder(@RequestParam Integer detailsId) {
         Map<String,Object> mapValue = bmstruckDetailsOrderService.getPurchaseDetailsOrder(detailsId);
-        return success(mapValue);
+        return mapValue;
     }
 
     /**
@@ -56,9 +54,9 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
             @ApiImplicitParam(name = "statementId", value = "账单主键id", required = true, dataType = "Integer"),
     })
     @PostMapping("/getSaleDetailsOrder")
-    public RESTfulResult getSaleDetailsOrder(@RequestParam Integer statementId) {
-        List<Map<String, Object>> mapValue = bmstruckDetailsOrderService.getSaleDetailsOrder(statementId);
-        return success(mapValue);
+    public List<Map<String, Object>> getSaleDetailsOrder(@RequestParam Integer statementId) {
+        List<Map<String, Object>> mapList = bmstruckDetailsOrderService.getSaleDetailsOrder(statementId);
+        return mapList;
     }
 
 

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

@@ -35,9 +35,9 @@ public class BmstruckStatementController extends BaseRESTfulController {
             @ApiImplicitParam(name = "statementId", value = "账单主键id", required = true, dataType = "Integer"),
     })
     @PostMapping("/getStatement")
-    public RESTfulResult getStatement(@RequestParam Integer statementId) {
+    public Map<String, Object> getStatement(@RequestParam Integer statementId) {
         Map<String,Object> mapValue = bmstruckStatementService.getStatement(statementId);
-        return success(mapValue);
+        return mapValue;
     }
 
     /**

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

@@ -3,6 +3,8 @@ package com.steerinfo.dil.controller;
 import com.steerinfo.dil.service.impl.RmsConsigneeServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -32,6 +34,15 @@ public class RmsConsigneeController extends BaseRESTfulController {
      * @return
      */
     @ApiModelProperty(value = "收货客户管理对接接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "EASConsigneeId", value = "1", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "consigneeCompanyName", value = "安顺市鑫智成实业有限公司", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "consigneeAbbreviation", value = "安顺市鑫智成", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "consigneeRegisteredAddress", value = "安顺市鑫智成通川区金龙大道119号", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "consigneeContactName", value = "李四", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "consigneeContactTel", value = "17356241456", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "dataStatus", value = "1", required = true, dataType = "Integer"),
+    })
     @PostMapping("/operationConsignee")
     public RESTfulResult operationConsignee(@RequestBody Map<String, Object> mapVal) {
         int result = rmsConsigneeService.operationConsignee(mapVal);

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

@@ -39,14 +39,14 @@ public class RmsMaterialController extends BaseRESTfulController {
      */
     @ApiModelProperty(value = "物资管理对接接口")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "EASMaterialId", value = "1", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "EASMaterialId", value = "1", required = true, dataType = "String"),
             @ApiImplicitParam(name = "materialCode", value = "08010102010300005", required = true, dataType = "String"),
             @ApiImplicitParam(name = "materialType", value = "原料", required = true, dataType = "String"),
             @ApiImplicitParam(name = "materialName", value = "巴粉", required = true, dataType = "String"),
             @ApiImplicitParam(name = "materialSpecification", value = "", required = true, dataType = "String"),
             @ApiImplicitParam(name = "materialModel", value = "", required = true, dataType = "String"),
             @ApiImplicitParam(name = "unitOfMeasure", value = "吨", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "materialLength", value = "", required = true, dataType = "Double"),
+            @ApiImplicitParam(name = "materialLength", value = "", required = true, dataType = "String"),
             @ApiImplicitParam(name = "dataStatus", value = "1", required = true, dataType = "Integer"),
     })
     @PostMapping("/operationMaterial")

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

@@ -39,12 +39,12 @@ public class RmsSupplierController extends BaseRESTfulController {
      */
     @ApiModelProperty(value = "供应商管理对接接口")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "EASSupplierId", value = "1", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "EASSupplierId", value = "1", required = true, dataType = "String"),
             @ApiImplicitParam(name = "supplierName", value = "四川美立达矿业有限责任公司", required = true, dataType = "String"),
             @ApiImplicitParam(name = "supplierAbbreviation", value = "四川美立达", required = true, dataType = "String"),
             @ApiImplicitParam(name = "supplierDutyParagraph", value = "SCMLD20211027", required = true, dataType = "String"),
             @ApiImplicitParam(name = "supplierAddress", value = "四川省达州市通川区金龙大道119号", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "supplierRegisterDate", value = "2021-10-09 14:10:34", required = true, dataType = "Date"),
+            @ApiImplicitParam(name = "supplierRegisterDate", value = "1636426968000", required = true, dataType = "Long"),
             @ApiImplicitParam(name = "supplierAgent", value = "李四", required = true, dataType = "String"),
             @ApiImplicitParam(name = "supplierContactNumber", value = "17356241456", required = true, dataType = "String"),
             @ApiImplicitParam(name = "dataStatus", value = "1", required = true, dataType = "Integer"),

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

@@ -3,8 +3,15 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.BmsportHandlingFee;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface BmsportHandlingFeeMapper extends IBaseMapper<BmsportHandlingFee, BigDecimal> {
+    // 得到港口装卸费信息
+    List<Map<String, Object>> getPortFee(Integer feeId);
+    // 得到支付单位，发货单位，收货单位
+    Map<String, Object> getOtherMessage(Integer feeId);
 }

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

@@ -3,8 +3,13 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.BmsshipDetailsOrder;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface BmsshipDetailsOrderMapper extends IBaseMapper<BmsshipDetailsOrder, BigDecimal> {
+    // 采购船运详单
+    List<Map<String, Object>> getPurchaseShipDetails(Integer statementId);
 }

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

@@ -3,8 +3,15 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.BmsshipStatement;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface BmsshipStatementMapper extends IBaseMapper<BmsshipStatement, BigDecimal> {
+    // 采购船运账单
+    Map<String, Object> getShipStatement(Integer statementId);
+
+    List<Map<String, Object>> getOtherMessage(Integer statementId);
 }

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

@@ -3,8 +3,12 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.BmstrainSettlement;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface BmstrainSettlementMapper extends IBaseMapper<BmstrainSettlement, BigDecimal> {
+    // 得到销售火运信息
+    Map<String, Object> getTrainSettlement(Integer settlementId);
 }

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

@@ -4,6 +4,7 @@ import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.dil.model.BmsportHandlingFee;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.Map;
 
 /**
  * BmsportHandlingFee服务接口：
@@ -20,4 +21,10 @@ import java.math.BigDecimal;
  */
 public interface IBmsportHandlingFeeService {
 
+    /**
+     * 得到港口装卸费信息
+     * @param feeId
+     * @return
+     */
+    Map<String, Object> getPortFee(Integer feeId);
 }

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

@@ -4,6 +4,8 @@ import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.dil.model.BmsshipDetailsOrder;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
 
 /**
  * BmsshipDetailsOrder服务接口：
@@ -19,5 +21,10 @@ import java.math.BigDecimal;
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
 public interface IBmsshipDetailsOrderService {
-
+    /**
+     * 采购船运详单
+     * @param statementId
+     * @return
+     */
+    List<Map<String, Object>> getPurchaseShipDetails(Integer statementId);
 }

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

@@ -4,6 +4,7 @@ import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.dil.model.BmsshipStatement;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.Map;
 
 /**
  * BmsshipStatement服务接口：
@@ -20,4 +21,10 @@ import java.math.BigDecimal;
  */
 public interface IBmsshipStatementService {
 
+    /**
+     * 船运计费账单
+     * @param statementId
+     * @return
+     */
+    Map<String, Object> getShipStatement(Integer statementId);
 }

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

@@ -4,6 +4,7 @@ import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.dil.model.BmstrainSettlement;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.Map;
 
 /**
  * BmstrainSettlement服务接口：
@@ -20,4 +21,10 @@ import java.math.BigDecimal;
  */
 public interface IBmstrainSettlementService {
 
+    /**
+     * 销售火运结算
+     * @param settlementId
+     * @return
+     */
+    Map<String, Object> getTrainSettlement(Integer settlementId);
 }

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

@@ -63,9 +63,9 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         String receiveUnit = (String) mapVal.get("receiveUnit");
         BigDecimal shipperId = amsPurchaseOrderMapper.getShipperId(receiveUnit);
         // 得到订货数量
-        Double purchaseOrderMaterialNumber = (Double) mapVal.get("purchaseOrderMaterialNumber");
+        String purchaseOrderMaterialNumber = (String) mapVal.get("purchaseOrderMaterialNumber");
         // 得到订单日期
-        Date purchaseOrderDate = (Date) mapVal.get("purchaseOrderDate");
+        Date purchaseOrderDate = new Date((Long) mapVal.get("purchaseOrderDate"));
         // 得到供应商代码
         String supplierDutyParagraph = (String) mapVal.get("supplierDutyParagraph");
         BigDecimal supplierId = amsPurchaseOrderMapper.getSupplierId(supplierDutyParagraph);

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

@@ -52,11 +52,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         // 得到销售订单号
         String saleNumber = (String) mapVal.get("saleNumber");
         // 得到账户余额
-        Double saleAccountBalance = (Double) mapVal.get("saleAccountBalance");
+        String saleAccountBalance = (String) mapVal.get("saleAccountBalance");
         // 得到当前订单金额
-        Double saleCurrentOrderAmount = (Double) mapVal.get("saleCurrentOrderAmount");
+        String saleCurrentOrderAmount = (String) mapVal.get("saleCurrentOrderAmount");
         // 得到历史订单金额
-        Double saleHistoricalOrderAmount = (Double) mapVal.get("saleHistoricalOrderAmount");
+        String saleHistoricalOrderAmount = (String) mapVal.get("saleHistoricalOrderAmount");
         // 得到主键id
         Map<String,Object> map = new HashMap<>();
         map.put("saleNumber",saleNumber);

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

@@ -9,6 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * BmsportHandlingFee服务实现：
@@ -29,5 +32,32 @@ public class BmsportHandlingFeeServiceImpl implements IBmsportHandlingFeeService
     @Autowired
     private BmsportHandlingFeeMapper bmsportHandlingFeeMapper;
 
-
+    /**
+     * 得到港口装卸费信息
+     * @param feeId
+     * @return
+     */
+    @Override
+    public Map<String, Object> getPortFee(Integer feeId) {
+        List<Map<String, Object>> mapList = bmsportHandlingFeeMapper.getPortFee(feeId);
+        for (Map<String,Object> map : mapList) {
+            map.put("detailsNo","");
+            map.put("capacityNumber","");
+            map.put("carrierName","");
+        }
+        Map<String, Object> map = mapList.get(0);
+        BigDecimal statementTotalAmount = (BigDecimal) map.get("detailsAmount");
+        Date statementTime = (Date) map.get("detailsTime");
+        Map<String,Object> mapValue = new HashMap<>();
+        Map<String,Object> otherMap = bmsportHandlingFeeMapper.getOtherMessage(feeId);
+        mapValue.put("mapList",mapList);
+        mapValue.put("statementTotalAmount",statementTotalAmount);
+        mapValue.put("statementTime",statementTime);
+        mapValue.put("statementNo","");
+        String amountType = "港口装卸费";
+        mapValue.put("amountType",amountType);
+        mapValue.put("collectionName","");
+        mapValue.putAll(otherMap);
+        return mapValue;
+    }
 }

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

@@ -9,6 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
 
 /**
  * BmsshipDetailsOrder服务实现：
@@ -33,4 +35,15 @@ public class BmsshipDetailsOrderServiceImpl extends BaseServiceImpl<BmsshipDetai
     protected IBaseMapper<BmsshipDetailsOrder, BigDecimal> getMapper() {
         return bmsshipDetailsOrderMapper;
     }
+
+    /**
+     * 采购船运详单
+     * @param statementId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getPurchaseShipDetails(Integer statementId) {
+        List<Map<String,Object>> mapList = bmsshipDetailsOrderMapper.getPurchaseShipDetails(statementId);
+        return mapList;
+    }
 }

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

@@ -1,14 +1,11 @@
 package com.steerinfo.dil.service.impl;
 
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import com.steerinfo.dil.model.BmsshipStatement;
 import com.steerinfo.dil.mapper.BmsshipStatementMapper;
 import com.steerinfo.dil.service.IBmsshipStatementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.util.Date;
-import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
 
 /**
  * BmsshipStatement服务实现：
@@ -29,4 +26,17 @@ public class BmsshipStatementServiceImpl implements IBmsshipStatementService {
     @Autowired
     private BmsshipStatementMapper bmsshipStatementMapper;
 
+    /**
+     * 采购船运账单
+     * @param statementId
+     * @return
+     */
+    @Override
+    public Map<String, Object> getShipStatement(Integer statementId) {
+        Map<String,Object> mapValue = bmsshipStatementMapper.getShipStatement(statementId);
+        List<Map<String,Object>> mapList = bmsshipStatementMapper.getOtherMessage(statementId);
+        Map<String, Object> map = mapList.get(0);
+        mapValue.putAll(map);
+        return mapValue;
+    }
 }

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

@@ -39,6 +39,16 @@ public class BmstrainDetailsOrderServiceImpl implements IBmstrainDetailsOrderSer
     @Override
     public List<Map<String, Object>> getPurchaseTrainDetailsOrder(Integer StatementId) {
         List<Map<String, Object>> mapList = bmstrainDetailsOrderMapper.getPurchaseTrainDetailsOrder(new BigDecimal(StatementId));
+        String capacityNumber = "";
+        String carrierName = "";
+        String shipperName = "";
+        String consigneeCompanyName = "";
+        for (Map<String,Object> map: mapList) {
+            map.put("capacityNumber",capacityNumber);
+            map.put("carrierName",carrierName);
+            map.put("startPlace",shipperName);
+            map.put("endPlace",consigneeCompanyName);
+        }
         return mapList;
     }
 }

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

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.Map;
 
 /**
  * BmstrainSettlement服务实现：
@@ -29,4 +30,14 @@ public class BmstrainSettlementServiceImpl implements IBmstrainSettlementService
     @Autowired
     private BmstrainSettlementMapper bmstrainSettlementMapper;
 
+    /**
+     * 销售火运结算
+     * @param settlementId
+     * @return
+     */
+    @Override
+    public Map<String, Object> getTrainSettlement(Integer settlementId) {
+        Map<String,Object> mapValue = bmstrainSettlementMapper.getTrainSettlement(settlementId);
+        return mapValue;
+    }
 }

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

@@ -45,10 +45,12 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
         BigDecimal detailsAmount = (BigDecimal) (mapList.get(0).get("detailsAmount"));
         Double statementExcludTax = detailsAmount.doubleValue();
         Map<String,Object> statementMap = bmstruckDetailsOrderMapper.getStatementMessage(detailsId);
+        map.put("startPlace","");
+        map.put("endPlace","");
         map.put("statementNumber",statementNumber);
         map.put("statementTime",statementTime);
         map.put("amountType",amountType);
-        map.put("statementExcludTax",statementExcludTax);
+        map.put("statementTotalAmount",statementExcludTax);
         map.put("mapList",mapList);
         map.putAll(statementMap);
         return map;

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

@@ -60,7 +60,7 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
         // 得到计量单位
         String unitOfMeasure = (String) mapVal.get("unitOfMeasure");
         // 得到长度
-        Double materialLengthValue = (Double) mapVal.get("materialLength");
+        String materialLengthValue = (String) mapVal.get("materialLength");
         BigDecimal materialLength = new BigDecimal(materialLengthValue);
         // 得到数据状态
         Integer dataStatus = (Integer) mapVal.get("dataStatus");

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

@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

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

@@ -1,369 +1,415 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!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" />
-  </resultMap>
-  <sql id="columns">
-    FEE_ID, MATERIAL_ID, FEE_FOREIGN_SHIP_NAME, FEE_MATERIAL_TONNAGE, PRICE_ID, FEE_VALUE, 
+    <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"/>
+    </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
-  </sql>
-  <sql id="columns_alias">
-    t.FEE_ID, t.MATERIAL_ID, t.FEE_FOREIGN_SHIP_NAME, t.FEE_MATERIAL_TONNAGE, t.PRICE_ID, 
+    </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
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM BMSPORT_HANDLING_FEE
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM BMSPORT_HANDLING_FEE t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="feeId != null">
-        and FEE_ID = #{feeId}
-      </if>
-      <if test="materialId != null">
-        and MATERIAL_ID = #{materialId}
-      </if>
-      <if test="feeForeignShipName != null and feeForeignShipName != ''">
-        and FEE_FOREIGN_SHIP_NAME = #{feeForeignShipName}
-      </if>
-      <if test="feeMaterialTonnage != null">
-        and FEE_MATERIAL_TONNAGE = #{feeMaterialTonnage}
-      </if>
-      <if test="priceId != null">
-        and PRICE_ID = #{priceId}
-      </if>
-      <if test="feeValue != null">
-        and FEE_VALUE = #{feeValue}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="feeId != null">
-        and FEE_ID = #{feeId}
-      </if>
-      <if test="materialId != null">
-        and MATERIAL_ID = #{materialId}
-      </if>
-      <if test="feeForeignShipName != null and feeForeignShipName != ''">
-        and FEE_FOREIGN_SHIP_NAME LIKE '%${feeForeignShipName}%'
-      </if>
-      <if test="feeMaterialTonnage != null">
-        and FEE_MATERIAL_TONNAGE = #{feeMaterialTonnage}
-      </if>
-      <if test="priceId != null">
-        and PRICE_ID = #{priceId}
-      </if>
-      <if test="feeValue != null">
-        and FEE_VALUE = #{feeValue}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME LIKE '%${insertUsername}%'
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME LIKE '%${updateUsername}%'
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from BMSPORT_HANDLING_FEE
-    where FEE_ID = #{feeId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from BMSPORT_HANDLING_FEE
-    where 1!=1 
-      <if test="materialId != null">
-        or MATERIAL_ID = #{materialId}
-      </if>
-      <if test="feeForeignShipName != null and feeForeignShipName != ''">
-        or FEE_FOREIGN_SHIP_NAME = #{feeForeignShipName}
-      </if>
-      <if test="feeMaterialTonnage != null">
-        or FEE_MATERIAL_TONNAGE = #{feeMaterialTonnage}
-      </if>
-      <if test="priceId != null">
-        or PRICE_ID = #{priceId}
-      </if>
-      <if test="feeValue != null">
-        or FEE_VALUE = #{feeValue}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        or INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        or UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </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)
-    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})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.BmsportHandlingFee">
-    insert into BMSPORT_HANDLING_FEE
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="feeId != null">
-        FEE_ID,
-      </if>
-      <if test="materialId != null">
-        MATERIAL_ID,
-      </if>
-      <if test="feeForeignShipName != null">
-        FEE_FOREIGN_SHIP_NAME,
-      </if>
-      <if test="feeMaterialTonnage != null">
-        FEE_MATERIAL_TONNAGE,
-      </if>
-      <if test="priceId != null">
-        PRICE_ID,
-      </if>
-      <if test="feeValue != null">
-        FEE_VALUE,
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME,
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME,
-      </if>
-      <if test="updateUsername != null">
-        UPDATE_USERNAME,
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME,
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="feeId != null">
-        #{feeId,jdbcType=DECIMAL},
-      </if>
-      <if test="materialId != null">
-        #{materialId,jdbcType=DECIMAL},
-      </if>
-      <if test="feeForeignShipName != null">
-        #{feeForeignShipName,jdbcType=VARCHAR},
-      </if>
-      <if test="feeMaterialTonnage != null">
-        #{feeMaterialTonnage,jdbcType=DECIMAL},
-      </if>
-      <if test="priceId != null">
-        #{priceId,jdbcType=DECIMAL},
-      </if>
-      <if test="feeValue != null">
-        #{feeValue,jdbcType=DECIMAL},
-      </if>
-      <if test="insertUsername != null">
-        #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
-        #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
-        #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUpdateRemark != null">
-        #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.BmsportHandlingFee">
-    update BMSPORT_HANDLING_FEE
-    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}
-    where FEE_ID = #{feeId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.BmsportHandlingFee">
-    update BMSPORT_HANDLING_FEE
-    <set>
-      <if test="materialId != null">
-        MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
-      </if>
-      <if test="feeForeignShipName != null">
-        FEE_FOREIGN_SHIP_NAME = #{feeForeignShipName,jdbcType=VARCHAR},
-      </if>
-      <if test="feeMaterialTonnage != null">
-        FEE_MATERIAL_TONNAGE = #{feeMaterialTonnage,jdbcType=DECIMAL},
-      </if>
-      <if test="priceId != null">
-        PRICE_ID = #{priceId,jdbcType=DECIMAL},
-      </if>
-      <if test="feeValue != null">
-        FEE_VALUE = #{feeValue,jdbcType=DECIMAL},
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
-        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where FEE_ID = #{feeId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select" />
-    where FEE_ID = #{feeId,jdbcType=DECIMAL}
-  </select>
-  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select" />
-    <include refid="where" />
-  </select>
-  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select" />
-    <include refid="whereLike" />
-  </select>
-  <insert id="batchInsert" parameterType="java.util.List">
-    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)
-    ( <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.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update BMSPORT_HANDLING_FEE
-     set
-       FEE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case FEE_ID" separator=" ">
-          when #{item.feeId,jdbcType=DECIMAL} then #{item.feeId,jdbcType=DECIMAL}
-       </foreach>
-       ,MATERIAL_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case FEE_ID" separator=" ">
-          when #{item.feeId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
-       </foreach>
-       ,FEE_FOREIGN_SHIP_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case FEE_ID" separator=" ">
-          when #{item.feeId,jdbcType=DECIMAL} then #{item.feeForeignShipName,jdbcType=VARCHAR}
-       </foreach>
-       ,FEE_MATERIAL_TONNAGE=
-       <foreach close="end" collection="list" index="index" item="item" open="case FEE_ID" separator=" ">
-          when #{item.feeId,jdbcType=DECIMAL} then #{item.feeMaterialTonnage,jdbcType=DECIMAL}
-       </foreach>
-       ,PRICE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case FEE_ID" separator=" ">
-          when #{item.feeId,jdbcType=DECIMAL} then #{item.priceId,jdbcType=DECIMAL}
-       </foreach>
-       ,FEE_VALUE=
-       <foreach close="end" collection="list" index="index" item="item" open="case FEE_ID" separator=" ">
-          when #{item.feeId,jdbcType=DECIMAL} then #{item.feeValue,jdbcType=DECIMAL}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case FEE_ID" separator=" ">
-          when #{item.feeId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case FEE_ID" separator=" ">
-          when #{item.feeId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case FEE_ID" separator=" ">
-          when #{item.feeId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case FEE_ID" separator=" ">
-          when #{item.feeId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case FEE_ID" separator=" ">
-          when #{item.feeId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-     where FEE_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.feeId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from BMSPORT_HANDLING_FEE
-    where FEE_ID in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM BMSPORT_HANDLING_FEE
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM BMSPORT_HANDLING_FEE t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="feeId != null">
+                and FEE_ID = #{feeId}
+            </if>
+            <if test="materialId != null">
+                and MATERIAL_ID = #{materialId}
+            </if>
+            <if test="feeForeignShipName != null and feeForeignShipName != ''">
+                and FEE_FOREIGN_SHIP_NAME = #{feeForeignShipName}
+            </if>
+            <if test="feeMaterialTonnage != null">
+                and FEE_MATERIAL_TONNAGE = #{feeMaterialTonnage}
+            </if>
+            <if test="priceId != null">
+                and PRICE_ID = #{priceId}
+            </if>
+            <if test="feeValue != null">
+                and FEE_VALUE = #{feeValue}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME = #{insertUsername}
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME = #{updateUsername}
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="feeId != null">
+                and FEE_ID = #{feeId}
+            </if>
+            <if test="materialId != null">
+                and MATERIAL_ID = #{materialId}
+            </if>
+            <if test="feeForeignShipName != null and feeForeignShipName != ''">
+                and FEE_FOREIGN_SHIP_NAME LIKE '%${feeForeignShipName}%'
+            </if>
+            <if test="feeMaterialTonnage != null">
+                and FEE_MATERIAL_TONNAGE = #{feeMaterialTonnage}
+            </if>
+            <if test="priceId != null">
+                and PRICE_ID = #{priceId}
+            </if>
+            <if test="feeValue != null">
+                and FEE_VALUE = #{feeValue}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME LIKE '%${insertUsername}%'
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME LIKE '%${updateUsername}%'
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+        delete
+        from BMSPORT_HANDLING_FEE
+        where FEE_ID = #{feeId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from BMSPORT_HANDLING_FEE
+        where 1!=1
+        <if test="materialId != null">
+            or MATERIAL_ID = #{materialId}
+        </if>
+        <if test="feeForeignShipName != null and feeForeignShipName != ''">
+            or FEE_FOREIGN_SHIP_NAME = #{feeForeignShipName}
+        </if>
+        <if test="feeMaterialTonnage != null">
+            or FEE_MATERIAL_TONNAGE = #{feeMaterialTonnage}
+        </if>
+        <if test="priceId != null">
+            or PRICE_ID = #{priceId}
+        </if>
+        <if test="feeValue != null">
+            or FEE_VALUE = #{feeValue}
+        </if>
+        <if test="insertUsername != null and insertUsername != ''">
+            or INSERT_USERNAME = #{insertUsername}
+        </if>
+        <if test="insertTime != null">
+            or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+        </if>
+        <if test="updateUsername != null and updateUsername != ''">
+            or UPDATE_USERNAME = #{updateUsername}
+        </if>
+        <if test="updateTime != null">
+            or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+        </if>
+        <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+            or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+        </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)
+        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})
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.BmsportHandlingFee">
+        insert into BMSPORT_HANDLING_FEE
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="feeId != null">
+                FEE_ID,
+            </if>
+            <if test="materialId != null">
+                MATERIAL_ID,
+            </if>
+            <if test="feeForeignShipName != null">
+                FEE_FOREIGN_SHIP_NAME,
+            </if>
+            <if test="feeMaterialTonnage != null">
+                FEE_MATERIAL_TONNAGE,
+            </if>
+            <if test="priceId != null">
+                PRICE_ID,
+            </if>
+            <if test="feeValue != null">
+                FEE_VALUE,
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME,
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME,
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME,
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME,
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="feeId != null">
+                #{feeId,jdbcType=DECIMAL},
+            </if>
+            <if test="materialId != null">
+                #{materialId,jdbcType=DECIMAL},
+            </if>
+            <if test="feeForeignShipName != null">
+                #{feeForeignShipName,jdbcType=VARCHAR},
+            </if>
+            <if test="feeMaterialTonnage != null">
+                #{feeMaterialTonnage,jdbcType=DECIMAL},
+            </if>
+            <if test="priceId != null">
+                #{priceId,jdbcType=DECIMAL},
+            </if>
+            <if test="feeValue != null">
+                #{feeValue,jdbcType=DECIMAL},
+            </if>
+            <if test="insertUsername != null">
+                #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.BmsportHandlingFee">
+        update BMSPORT_HANDLING_FEE
+        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}
+        where FEE_ID = #{feeId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.BmsportHandlingFee">
+        update BMSPORT_HANDLING_FEE
+        <set>
+            <if test="materialId != null">
+                MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+            </if>
+            <if test="feeForeignShipName != null">
+                FEE_FOREIGN_SHIP_NAME = #{feeForeignShipName,jdbcType=VARCHAR},
+            </if>
+            <if test="feeMaterialTonnage != null">
+                FEE_MATERIAL_TONNAGE = #{feeMaterialTonnage,jdbcType=DECIMAL},
+            </if>
+            <if test="priceId != null">
+                PRICE_ID = #{priceId,jdbcType=DECIMAL},
+            </if>
+            <if test="feeValue != null">
+                FEE_VALUE = #{feeValue,jdbcType=DECIMAL},
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+        </set>
+        where FEE_ID = #{feeId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where FEE_ID = #{feeId,jdbcType=DECIMAL}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="where"/>
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="whereLike"/>
+    </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+        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)
+        ( <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.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+        #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update BMSPORT_HANDLING_FEE
+        set
+        FEE_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case FEE_ID" separator=" ">
+            when #{item.feeId,jdbcType=DECIMAL} then #{item.feeId,jdbcType=DECIMAL}
+        </foreach>
+        ,MATERIAL_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case FEE_ID" separator=" ">
+            when #{item.feeId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
+        </foreach>
+        ,FEE_FOREIGN_SHIP_NAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case FEE_ID" separator=" ">
+            when #{item.feeId,jdbcType=DECIMAL} then #{item.feeForeignShipName,jdbcType=VARCHAR}
+        </foreach>
+        ,FEE_MATERIAL_TONNAGE=
+        <foreach close="end" collection="list" index="index" item="item" open="case FEE_ID" separator=" ">
+            when #{item.feeId,jdbcType=DECIMAL} then #{item.feeMaterialTonnage,jdbcType=DECIMAL}
+        </foreach>
+        ,PRICE_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case FEE_ID" separator=" ">
+            when #{item.feeId,jdbcType=DECIMAL} then #{item.priceId,jdbcType=DECIMAL}
+        </foreach>
+        ,FEE_VALUE=
+        <foreach close="end" collection="list" index="index" item="item" open="case FEE_ID" separator=" ">
+            when #{item.feeId,jdbcType=DECIMAL} then #{item.feeValue,jdbcType=DECIMAL}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case FEE_ID" separator=" ">
+            when #{item.feeId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case FEE_ID" separator=" ">
+            when #{item.feeId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case FEE_ID" separator=" ">
+            when #{item.feeId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case FEE_ID" separator=" ">
+            when #{item.feeId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach close="end" collection="list" index="index" item="item" open="case FEE_ID" separator=" ">
+            when #{item.feeId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        where FEE_ID in
+        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+            #{item.feeId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from BMSPORT_HANDLING_FEE
+        where FEE_ID in
+        <foreach close=")" collection="list" item="id" open="(" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    <select id="getPortFee" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT BHF.INSERT_TIME          AS "detailsTime",
+               RP1.PORT_NAME            AS "startPlace",
+               RP2.PORT_NAME            AS "endPlace",
+               BHF.FEE_MATERIAL_TONNAGE AS "materialNumber",
+               BHF.FEE_VALUE            AS "detailsAmount",
+               RM.MATERIAL_NAME         AS "materialName",
+               RM.MATERIAL_CODE         AS "materialCode"
+        FROM BMSPORT_HANDLING_FEE BHF
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON RM.MATERIAL_ID = BHF.MATERIAL_ID
+                 LEFT JOIN DIL_BATCH DB
+                           ON DB.RESULT_FOREIGN_SHIP_NAME = BHF.FEE_FOREIGN_SHIP_NAME
+                               AND DB.MATERIAL_ID = BHF.MATERIAL_ID
+                 LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN
+                           ON ADN.BATCH_ID = DB.BATCH_ID
+                 LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ADA
+                           ON ADA.BATCH_ID = DB.BATCH_ID
+                 LEFT JOIN RMS_PORT RP1
+                           ON RP1.PORT_ID = ADN.PORT_ID
+                 LEFT JOIN RMS_PORT RP2
+                           ON RP2.PORT_ID = ADA.DOWN_SWIM_PORT_ID
+        WHERE BHF.FEE_ID = #{feeId}
+    </select>
+
+    <select id="getOtherMessage" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT RS.SHIPPER_NAME             AS "statementPaymentUnit",
+               RS.SHIPPER_NAME             AS "consigneeCompanyName",
+               RSU.SUPPLIER_DUTY_PARAGRAPH AS "statementSendUnit"
+        FROM BMSPORT_HANDLING_FEE BHF
+                 LEFT JOIN DIL_BATCH DB
+                           ON DB.RESULT_FOREIGN_SHIP_NAME = BHF.FEE_FOREIGN_SHIP_NAME
+                               AND DB.MATERIAL_ID = BHF.MATERIAL_ID
+                 LEFT JOIN AMS_PURCHASE_ORDER APO
+                           ON APO.BATCH_ID = DB.BATCH_ID
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = APO.RECEIVE_UNIT_ID
+                 LEFT JOIN RMS_SUPPLIER RSU
+                           ON RSU.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+    </select>
 </mapper>

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

@@ -1,423 +1,471 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.BmsshipDetailsOrderMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.BmsshipDetailsOrder">
-    <id column="DETAILS_ID" jdbcType="DECIMAL" property="detailsId" />
-    <result column="PURCHASE_ORDER_ID" jdbcType="DECIMAL" property="purchaseOrderId" />
-    <result column="DETAILS_NO" jdbcType="VARCHAR" property="detailsNo" />
-    <result column="DETAILS_TIME" jdbcType="TIMESTAMP" property="detailsTime" />
-    <result column="DETAILS_FEE_TYPE" jdbcType="VARCHAR" property="detailsFeeType" />
-    <result column="DETAILS_AMOUNT" jdbcType="DECIMAL" property="detailsAmount" />
-    <result column="WETHER_TO_STATEMENT" jdbcType="DECIMAL" property="wetherToStatement" />
-    <result column="TRUCK_RESULT_TOTAL_ID" jdbcType="DECIMAL" property="truckResultTotalId" />
-    <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" />
-  </resultMap>
-  <sql id="columns">
-    DETAILS_ID, PURCHASE_ORDER_ID, DETAILS_NO, DETAILS_TIME, DETAILS_FEE_TYPE, DETAILS_AMOUNT, 
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.BmsshipDetailsOrder">
+        <id column="DETAILS_ID" jdbcType="DECIMAL" property="detailsId"/>
+        <result column="PURCHASE_ORDER_ID" jdbcType="DECIMAL" property="purchaseOrderId"/>
+        <result column="DETAILS_NO" jdbcType="VARCHAR" property="detailsNo"/>
+        <result column="DETAILS_TIME" jdbcType="TIMESTAMP" property="detailsTime"/>
+        <result column="DETAILS_FEE_TYPE" jdbcType="VARCHAR" property="detailsFeeType"/>
+        <result column="DETAILS_AMOUNT" jdbcType="DECIMAL" property="detailsAmount"/>
+        <result column="WETHER_TO_STATEMENT" jdbcType="DECIMAL" property="wetherToStatement"/>
+        <result column="TRUCK_RESULT_TOTAL_ID" jdbcType="DECIMAL" property="truckResultTotalId"/>
+        <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"/>
+    </resultMap>
+    <sql id="columns">
+        DETAILS_ID, PURCHASE_ORDER_ID, DETAILS_NO, DETAILS_TIME, DETAILS_FEE_TYPE, DETAILS_AMOUNT,
     WETHER_TO_STATEMENT, TRUCK_RESULT_TOTAL_ID, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
     UPDATE_TIME, INSERT_UPDATE_REMARK
-  </sql>
-  <sql id="columns_alias">
-    t.DETAILS_ID, t.PURCHASE_ORDER_ID, t.DETAILS_NO, t.DETAILS_TIME, t.DETAILS_FEE_TYPE, 
+    </sql>
+    <sql id="columns_alias">
+        t.DETAILS_ID, t.PURCHASE_ORDER_ID, t.DETAILS_NO, t.DETAILS_TIME, t.DETAILS_FEE_TYPE,
     t.DETAILS_AMOUNT, t.WETHER_TO_STATEMENT, t.TRUCK_RESULT_TOTAL_ID, t.INSERT_USERNAME, 
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM BMSSHIP_DETAILS_ORDER
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM BMSSHIP_DETAILS_ORDER t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="detailsId != null">
-        and DETAILS_ID = #{detailsId}
-      </if>
-      <if test="purchaseOrderId != null">
-        and PURCHASE_ORDER_ID = #{purchaseOrderId}
-      </if>
-      <if test="detailsNo != null and detailsNo != ''">
-        and DETAILS_NO = #{detailsNo}
-      </if>
-      <if test="detailsTime != null">
-        and TO_CHAR(DETAILS_TIME,'yyyy-MM-dd') = #{detailsTime}
-      </if>
-      <if test="detailsFeeType != null and detailsFeeType != ''">
-        and DETAILS_FEE_TYPE = #{detailsFeeType}
-      </if>
-      <if test="detailsAmount != null">
-        and DETAILS_AMOUNT = #{detailsAmount}
-      </if>
-      <if test="wetherToStatement != null">
-        and WETHER_TO_STATEMENT = #{wetherToStatement}
-      </if>
-      <if test="truckResultTotalId != null">
-        and TRUCK_RESULT_TOTAL_ID = #{truckResultTotalId}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="detailsId != null">
-        and DETAILS_ID = #{detailsId}
-      </if>
-      <if test="purchaseOrderId != null">
-        and PURCHASE_ORDER_ID = #{purchaseOrderId}
-      </if>
-      <if test="detailsNo != null and detailsNo != ''">
-        and DETAILS_NO LIKE '%${detailsNo}%'
-      </if>
-      <if test="detailsTime != null">
-        and TO_CHAR(DETAILS_TIME,'yyyy-MM-dd') = #{detailsTime}
-      </if>
-      <if test="detailsFeeType != null and detailsFeeType != ''">
-        and DETAILS_FEE_TYPE LIKE '%${detailsFeeType}%'
-      </if>
-      <if test="detailsAmount != null">
-        and DETAILS_AMOUNT = #{detailsAmount}
-      </if>
-      <if test="wetherToStatement != null">
-        and WETHER_TO_STATEMENT = #{wetherToStatement}
-      </if>
-      <if test="truckResultTotalId != null">
-        and TRUCK_RESULT_TOTAL_ID = #{truckResultTotalId}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME LIKE '%${insertUsername}%'
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME LIKE '%${updateUsername}%'
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from BMSSHIP_DETAILS_ORDER
-    where DETAILS_ID = #{detailsId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from BMSSHIP_DETAILS_ORDER
-    where 1!=1 
-      <if test="purchaseOrderId != null">
-        or PURCHASE_ORDER_ID = #{purchaseOrderId}
-      </if>
-      <if test="detailsNo != null and detailsNo != ''">
-        or DETAILS_NO = #{detailsNo}
-      </if>
-      <if test="detailsTime != null">
-        or TO_CHAR(DETAILS_TIME,'yyyy-MM-dd') = '#{detailsTime}'
-      </if>
-      <if test="detailsFeeType != null and detailsFeeType != ''">
-        or DETAILS_FEE_TYPE = #{detailsFeeType}
-      </if>
-      <if test="detailsAmount != null">
-        or DETAILS_AMOUNT = #{detailsAmount}
-      </if>
-      <if test="wetherToStatement != null">
-        or WETHER_TO_STATEMENT = #{wetherToStatement}
-      </if>
-      <if test="truckResultTotalId != null">
-        or TRUCK_RESULT_TOTAL_ID = #{truckResultTotalId}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        or INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        or UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.BmsshipDetailsOrder">
-    insert into BMSSHIP_DETAILS_ORDER (DETAILS_ID, PURCHASE_ORDER_ID, DETAILS_NO, 
-      DETAILS_TIME, DETAILS_FEE_TYPE, DETAILS_AMOUNT, 
-      WETHER_TO_STATEMENT, TRUCK_RESULT_TOTAL_ID, 
-      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK)
-    values (#{detailsId,jdbcType=DECIMAL}, #{purchaseOrderId,jdbcType=DECIMAL}, #{detailsNo,jdbcType=VARCHAR}, 
-      #{detailsTime,jdbcType=TIMESTAMP}, #{detailsFeeType,jdbcType=VARCHAR}, #{detailsAmount,jdbcType=DECIMAL}, 
-      #{wetherToStatement,jdbcType=DECIMAL}, #{truckResultTotalId,jdbcType=DECIMAL}, 
-      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.BmsshipDetailsOrder">
-    insert into BMSSHIP_DETAILS_ORDER
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="detailsId != null">
-        DETAILS_ID,
-      </if>
-      <if test="purchaseOrderId != null">
-        PURCHASE_ORDER_ID,
-      </if>
-      <if test="detailsNo != null">
-        DETAILS_NO,
-      </if>
-      <if test="detailsTime != null">
-        DETAILS_TIME,
-      </if>
-      <if test="detailsFeeType != null">
-        DETAILS_FEE_TYPE,
-      </if>
-      <if test="detailsAmount != null">
-        DETAILS_AMOUNT,
-      </if>
-      <if test="wetherToStatement != null">
-        WETHER_TO_STATEMENT,
-      </if>
-      <if test="truckResultTotalId != null">
-        TRUCK_RESULT_TOTAL_ID,
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME,
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME,
-      </if>
-      <if test="updateUsername != null">
-        UPDATE_USERNAME,
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME,
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="detailsId != null">
-        #{detailsId,jdbcType=DECIMAL},
-      </if>
-      <if test="purchaseOrderId != null">
-        #{purchaseOrderId,jdbcType=DECIMAL},
-      </if>
-      <if test="detailsNo != null">
-        #{detailsNo,jdbcType=VARCHAR},
-      </if>
-      <if test="detailsTime != null">
-        #{detailsTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="detailsFeeType != null">
-        #{detailsFeeType,jdbcType=VARCHAR},
-      </if>
-      <if test="detailsAmount != null">
-        #{detailsAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="wetherToStatement != null">
-        #{wetherToStatement,jdbcType=DECIMAL},
-      </if>
-      <if test="truckResultTotalId != null">
-        #{truckResultTotalId,jdbcType=DECIMAL},
-      </if>
-      <if test="insertUsername != null">
-        #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
-        #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
-        #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUpdateRemark != null">
-        #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.BmsshipDetailsOrder">
-    update BMSSHIP_DETAILS_ORDER
-    set PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL},
-      DETAILS_NO = #{detailsNo,jdbcType=VARCHAR},
-      DETAILS_TIME = #{detailsTime,jdbcType=TIMESTAMP},
-      DETAILS_FEE_TYPE = #{detailsFeeType,jdbcType=VARCHAR},
-      DETAILS_AMOUNT = #{detailsAmount,jdbcType=DECIMAL},
-      WETHER_TO_STATEMENT = #{wetherToStatement,jdbcType=DECIMAL},
-      TRUCK_RESULT_TOTAL_ID = #{truckResultTotalId,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}
-    where DETAILS_ID = #{detailsId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.BmsshipDetailsOrder">
-    update BMSSHIP_DETAILS_ORDER
-    <set>
-      <if test="purchaseOrderId != null">
-        PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL},
-      </if>
-      <if test="detailsNo != null">
-        DETAILS_NO = #{detailsNo,jdbcType=VARCHAR},
-      </if>
-      <if test="detailsTime != null">
-        DETAILS_TIME = #{detailsTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="detailsFeeType != null">
-        DETAILS_FEE_TYPE = #{detailsFeeType,jdbcType=VARCHAR},
-      </if>
-      <if test="detailsAmount != null">
-        DETAILS_AMOUNT = #{detailsAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="wetherToStatement != null">
-        WETHER_TO_STATEMENT = #{wetherToStatement,jdbcType=DECIMAL},
-      </if>
-      <if test="truckResultTotalId != null">
-        TRUCK_RESULT_TOTAL_ID = #{truckResultTotalId,jdbcType=DECIMAL},
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
-        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where DETAILS_ID = #{detailsId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select" />
-    where DETAILS_ID = #{detailsId,jdbcType=DECIMAL}
-  </select>
-  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select" />
-    <include refid="where" />
-  </select>
-  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select" />
-    <include refid="whereLike" />
-  </select>
-  <insert id="batchInsert" parameterType="java.util.List">
-    insert into BMSSHIP_DETAILS_ORDER 
-      (DETAILS_ID, 
-      PURCHASE_ORDER_ID, DETAILS_NO, DETAILS_TIME, 
-      DETAILS_FEE_TYPE, DETAILS_AMOUNT, 
-      WETHER_TO_STATEMENT, TRUCK_RESULT_TOTAL_ID, 
-      INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.detailsId,jdbcType=DECIMAL}, 
-      #{item.purchaseOrderId,jdbcType=DECIMAL}, #{item.detailsNo,jdbcType=VARCHAR}, #{item.detailsTime,jdbcType=TIMESTAMP}, 
-      #{item.detailsFeeType,jdbcType=VARCHAR}, #{item.detailsAmount,jdbcType=DECIMAL}, 
-      #{item.wetherToStatement,jdbcType=DECIMAL}, #{item.truckResultTotalId,jdbcType=DECIMAL}, 
-      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
-      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update BMSSHIP_DETAILS_ORDER
-     set
-       DETAILS_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
-          when #{item.detailsId,jdbcType=DECIMAL} then #{item.detailsId,jdbcType=DECIMAL}
-       </foreach>
-       ,PURCHASE_ORDER_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
-          when #{item.detailsId,jdbcType=DECIMAL} then #{item.purchaseOrderId,jdbcType=DECIMAL}
-       </foreach>
-       ,DETAILS_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
-          when #{item.detailsId,jdbcType=DECIMAL} then #{item.detailsNo,jdbcType=VARCHAR}
-       </foreach>
-       ,DETAILS_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
-          when #{item.detailsId,jdbcType=DECIMAL} then #{item.detailsTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,DETAILS_FEE_TYPE=
-       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
-          when #{item.detailsId,jdbcType=DECIMAL} then #{item.detailsFeeType,jdbcType=VARCHAR}
-       </foreach>
-       ,DETAILS_AMOUNT=
-       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
-          when #{item.detailsId,jdbcType=DECIMAL} then #{item.detailsAmount,jdbcType=DECIMAL}
-       </foreach>
-       ,WETHER_TO_STATEMENT=
-       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
-          when #{item.detailsId,jdbcType=DECIMAL} then #{item.wetherToStatement,jdbcType=DECIMAL}
-       </foreach>
-       ,TRUCK_RESULT_TOTAL_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
-          when #{item.detailsId,jdbcType=DECIMAL} then #{item.truckResultTotalId,jdbcType=DECIMAL}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
-          when #{item.detailsId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
-          when #{item.detailsId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
-          when #{item.detailsId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
-          when #{item.detailsId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
-          when #{item.detailsId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-     where DETAILS_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.detailsId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from BMSSHIP_DETAILS_ORDER
-    where DETAILS_ID in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM BMSSHIP_DETAILS_ORDER
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM BMSSHIP_DETAILS_ORDER t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="detailsId != null">
+                and DETAILS_ID = #{detailsId}
+            </if>
+            <if test="purchaseOrderId != null">
+                and PURCHASE_ORDER_ID = #{purchaseOrderId}
+            </if>
+            <if test="detailsNo != null and detailsNo != ''">
+                and DETAILS_NO = #{detailsNo}
+            </if>
+            <if test="detailsTime != null">
+                and TO_CHAR(DETAILS_TIME,'yyyy-MM-dd') = #{detailsTime}
+            </if>
+            <if test="detailsFeeType != null and detailsFeeType != ''">
+                and DETAILS_FEE_TYPE = #{detailsFeeType}
+            </if>
+            <if test="detailsAmount != null">
+                and DETAILS_AMOUNT = #{detailsAmount}
+            </if>
+            <if test="wetherToStatement != null">
+                and WETHER_TO_STATEMENT = #{wetherToStatement}
+            </if>
+            <if test="truckResultTotalId != null">
+                and TRUCK_RESULT_TOTAL_ID = #{truckResultTotalId}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME = #{insertUsername}
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME = #{updateUsername}
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="detailsId != null">
+                and DETAILS_ID = #{detailsId}
+            </if>
+            <if test="purchaseOrderId != null">
+                and PURCHASE_ORDER_ID = #{purchaseOrderId}
+            </if>
+            <if test="detailsNo != null and detailsNo != ''">
+                and DETAILS_NO LIKE '%${detailsNo}%'
+            </if>
+            <if test="detailsTime != null">
+                and TO_CHAR(DETAILS_TIME,'yyyy-MM-dd') = #{detailsTime}
+            </if>
+            <if test="detailsFeeType != null and detailsFeeType != ''">
+                and DETAILS_FEE_TYPE LIKE '%${detailsFeeType}%'
+            </if>
+            <if test="detailsAmount != null">
+                and DETAILS_AMOUNT = #{detailsAmount}
+            </if>
+            <if test="wetherToStatement != null">
+                and WETHER_TO_STATEMENT = #{wetherToStatement}
+            </if>
+            <if test="truckResultTotalId != null">
+                and TRUCK_RESULT_TOTAL_ID = #{truckResultTotalId}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME LIKE '%${insertUsername}%'
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME LIKE '%${updateUsername}%'
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+        delete
+        from BMSSHIP_DETAILS_ORDER
+        where DETAILS_ID = #{detailsId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from BMSSHIP_DETAILS_ORDER
+        where 1!=1
+        <if test="purchaseOrderId != null">
+            or PURCHASE_ORDER_ID = #{purchaseOrderId}
+        </if>
+        <if test="detailsNo != null and detailsNo != ''">
+            or DETAILS_NO = #{detailsNo}
+        </if>
+        <if test="detailsTime != null">
+            or TO_CHAR(DETAILS_TIME,'yyyy-MM-dd') = '#{detailsTime}'
+        </if>
+        <if test="detailsFeeType != null and detailsFeeType != ''">
+            or DETAILS_FEE_TYPE = #{detailsFeeType}
+        </if>
+        <if test="detailsAmount != null">
+            or DETAILS_AMOUNT = #{detailsAmount}
+        </if>
+        <if test="wetherToStatement != null">
+            or WETHER_TO_STATEMENT = #{wetherToStatement}
+        </if>
+        <if test="truckResultTotalId != null">
+            or TRUCK_RESULT_TOTAL_ID = #{truckResultTotalId}
+        </if>
+        <if test="insertUsername != null and insertUsername != ''">
+            or INSERT_USERNAME = #{insertUsername}
+        </if>
+        <if test="insertTime != null">
+            or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+        </if>
+        <if test="updateUsername != null and updateUsername != ''">
+            or UPDATE_USERNAME = #{updateUsername}
+        </if>
+        <if test="updateTime != null">
+            or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+        </if>
+        <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+            or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.BmsshipDetailsOrder">
+        insert into BMSSHIP_DETAILS_ORDER (DETAILS_ID, PURCHASE_ORDER_ID, DETAILS_NO,
+                                           DETAILS_TIME, DETAILS_FEE_TYPE, DETAILS_AMOUNT,
+                                           WETHER_TO_STATEMENT, TRUCK_RESULT_TOTAL_ID,
+                                           INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+                                           UPDATE_TIME, INSERT_UPDATE_REMARK)
+        values (#{detailsId,jdbcType=DECIMAL}, #{purchaseOrderId,jdbcType=DECIMAL}, #{detailsNo,jdbcType=VARCHAR},
+                #{detailsTime,jdbcType=TIMESTAMP}, #{detailsFeeType,jdbcType=VARCHAR},
+                #{detailsAmount,jdbcType=DECIMAL},
+                #{wetherToStatement,jdbcType=DECIMAL}, #{truckResultTotalId,jdbcType=DECIMAL},
+                #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
+                #{updateUsername,jdbcType=VARCHAR},
+                #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR})
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.BmsshipDetailsOrder">
+        insert into BMSSHIP_DETAILS_ORDER
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="detailsId != null">
+                DETAILS_ID,
+            </if>
+            <if test="purchaseOrderId != null">
+                PURCHASE_ORDER_ID,
+            </if>
+            <if test="detailsNo != null">
+                DETAILS_NO,
+            </if>
+            <if test="detailsTime != null">
+                DETAILS_TIME,
+            </if>
+            <if test="detailsFeeType != null">
+                DETAILS_FEE_TYPE,
+            </if>
+            <if test="detailsAmount != null">
+                DETAILS_AMOUNT,
+            </if>
+            <if test="wetherToStatement != null">
+                WETHER_TO_STATEMENT,
+            </if>
+            <if test="truckResultTotalId != null">
+                TRUCK_RESULT_TOTAL_ID,
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME,
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME,
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME,
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME,
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="detailsId != null">
+                #{detailsId,jdbcType=DECIMAL},
+            </if>
+            <if test="purchaseOrderId != null">
+                #{purchaseOrderId,jdbcType=DECIMAL},
+            </if>
+            <if test="detailsNo != null">
+                #{detailsNo,jdbcType=VARCHAR},
+            </if>
+            <if test="detailsTime != null">
+                #{detailsTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="detailsFeeType != null">
+                #{detailsFeeType,jdbcType=VARCHAR},
+            </if>
+            <if test="detailsAmount != null">
+                #{detailsAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="wetherToStatement != null">
+                #{wetherToStatement,jdbcType=DECIMAL},
+            </if>
+            <if test="truckResultTotalId != null">
+                #{truckResultTotalId,jdbcType=DECIMAL},
+            </if>
+            <if test="insertUsername != null">
+                #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.BmsshipDetailsOrder">
+        update BMSSHIP_DETAILS_ORDER
+        set PURCHASE_ORDER_ID     = #{purchaseOrderId,jdbcType=DECIMAL},
+            DETAILS_NO            = #{detailsNo,jdbcType=VARCHAR},
+            DETAILS_TIME          = #{detailsTime,jdbcType=TIMESTAMP},
+            DETAILS_FEE_TYPE      = #{detailsFeeType,jdbcType=VARCHAR},
+            DETAILS_AMOUNT        = #{detailsAmount,jdbcType=DECIMAL},
+            WETHER_TO_STATEMENT   = #{wetherToStatement,jdbcType=DECIMAL},
+            TRUCK_RESULT_TOTAL_ID = #{truckResultTotalId,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}
+        where DETAILS_ID = #{detailsId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.BmsshipDetailsOrder">
+        update BMSSHIP_DETAILS_ORDER
+        <set>
+            <if test="purchaseOrderId != null">
+                PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL},
+            </if>
+            <if test="detailsNo != null">
+                DETAILS_NO = #{detailsNo,jdbcType=VARCHAR},
+            </if>
+            <if test="detailsTime != null">
+                DETAILS_TIME = #{detailsTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="detailsFeeType != null">
+                DETAILS_FEE_TYPE = #{detailsFeeType,jdbcType=VARCHAR},
+            </if>
+            <if test="detailsAmount != null">
+                DETAILS_AMOUNT = #{detailsAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="wetherToStatement != null">
+                WETHER_TO_STATEMENT = #{wetherToStatement,jdbcType=DECIMAL},
+            </if>
+            <if test="truckResultTotalId != null">
+                TRUCK_RESULT_TOTAL_ID = #{truckResultTotalId,jdbcType=DECIMAL},
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+        </set>
+        where DETAILS_ID = #{detailsId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where DETAILS_ID = #{detailsId,jdbcType=DECIMAL}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="where"/>
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="whereLike"/>
+    </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+        insert into BMSSHIP_DETAILS_ORDER
+        (DETAILS_ID,
+        PURCHASE_ORDER_ID, DETAILS_NO, DETAILS_TIME,
+        DETAILS_FEE_TYPE, DETAILS_AMOUNT,
+        WETHER_TO_STATEMENT, TRUCK_RESULT_TOTAL_ID,
+        INSERT_USERNAME, INSERT_TIME,
+        UPDATE_USERNAME, UPDATE_TIME,
+        INSERT_UPDATE_REMARK)
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.detailsId,jdbcType=DECIMAL},
+        #{item.purchaseOrderId,jdbcType=DECIMAL}, #{item.detailsNo,jdbcType=VARCHAR},
+        #{item.detailsTime,jdbcType=TIMESTAMP},
+        #{item.detailsFeeType,jdbcType=VARCHAR}, #{item.detailsAmount,jdbcType=DECIMAL},
+        #{item.wetherToStatement,jdbcType=DECIMAL}, #{item.truckResultTotalId,jdbcType=DECIMAL},
+        #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
+        #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+        #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update BMSSHIP_DETAILS_ORDER
+        set
+        DETAILS_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.detailsId,jdbcType=DECIMAL}
+        </foreach>
+        ,PURCHASE_ORDER_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.purchaseOrderId,jdbcType=DECIMAL}
+        </foreach>
+        ,DETAILS_NO=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.detailsNo,jdbcType=VARCHAR}
+        </foreach>
+        ,DETAILS_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.detailsTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,DETAILS_FEE_TYPE=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.detailsFeeType,jdbcType=VARCHAR}
+        </foreach>
+        ,DETAILS_AMOUNT=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.detailsAmount,jdbcType=DECIMAL}
+        </foreach>
+        ,WETHER_TO_STATEMENT=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.wetherToStatement,jdbcType=DECIMAL}
+        </foreach>
+        ,TRUCK_RESULT_TOTAL_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.truckResultTotalId,jdbcType=DECIMAL}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        where DETAILS_ID in
+        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+            #{item.detailsId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from BMSSHIP_DETAILS_ORDER
+        where DETAILS_ID in
+        <foreach close=")" collection="list" item="id" open="(" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 
-  
+    <!-- 采购船运详单 -->
+    <select id="getPurchaseShipDetails" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT BDO.DETAILS_NO                    AS "detailsNo",
+               BDO.DETAILS_TIME                  AS "detailsTime",
+               RC.CAPACITY_NUMBER                AS "capacityNumber",
+               RP1.PORT_NAME                     AS "startPlace",
+               RP3.PORT_NAME                     AS "endPlace",
+               APO.PUCHASE_ORDER_MATERIAL_NUMBER AS "materialNumber",
+               BDO.DETAILS_AMOUNT                AS "detailsAmount",
+               RP2.PORT_NAME                     AS "carrierName",
+               RM.MATERIAL_NAME                  AS "materialName",
+               RM.MATERIAL_CODE                  AS "materialCode"
+        FROM BMSSHIP_DETAILS_STATEMENT BDS
+                 LEFT JOIN BMSSHIP_DETAILS_ORDER BDO
+                           ON BDS.DETAILS_ID = BDO.DETAILS_ID
+                 LEFT JOIN AMS_PURCHASE_ORDER APO
+                           ON APO.PURCHASE_ORDER_ID = BDO.PURCHASE_ORDER_ID
+                 LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN
+                           ON ADN.BATCH_ID = APO.BATCH_ID
+                 LEFT JOIN RMS_PORT RP1
+                           ON RP1.PORT_ID = ADN.PORT_ID
+                 LEFT JOIN RMS_PORT RP2
+                           ON RP2.PORT_ID = ADN.CARRIER_ID
+                 LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ADA
+                           ON ADA.BATCH_ID = APO.BATCH_ID
+                 LEFT JOIN RMS_PORT RP3
+                           ON RP3.PORT_ID = ADA.DOWN_SWIM_PORT_ID
+                 LEFT JOIN DIL_BATCH DB
+                           ON DB.BATCH_ID = APO.BATCH_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON DB.MATERIAL_ID = RM.MATERIAL_ID
+                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                           ON TTR.RESULT_TOTAL_ID = BDO.TRUCK_RESULT_TOTAL_ID
+                 LEFT JOIN OMSTRUCK_ORDER OO
+                           ON OO.ORDER_ID = TTR.ORDER_ID
+                 LEFT JOIN RMS_DRIVER_CAPACITY RDC
+                           ON OO.DRIVER_CAPACITY_ID = RDC.DRIVER_CAPACITY_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RDC.CAPACITY_ID = RC.CAPACITY_ID
+        WHERE BDS.STATEMENT_ID = #{statementId}
+    </select>
 </mapper>

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

@@ -1,374 +1,407 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.BmsshipStatementMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.BmsshipStatement">
-    <id column="STATEMENT_ID" jdbcType="DECIMAL" property="statementId" />
-    <result column="STATEMENT_NO" jdbcType="VARCHAR" property="statementNo" />
-    <result column="STATEMENT_SHIPPER_ID" jdbcType="DECIMAL" property="statementShipperId" />
-    <result column="STATEMENT_TOTAL_AMOUNT" jdbcType="DECIMAL" property="statementTotalAmount" />
-    <result column="STATEMENT_DATE" jdbcType="TIMESTAMP" property="statementDate" />
-    <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="STATEMENT_TYPE" jdbcType="VARCHAR" property="statementType" />
-  </resultMap>
-  <sql id="columns">
-    STATEMENT_ID, STATEMENT_NO, STATEMENT_SHIPPER_ID, STATEMENT_TOTAL_AMOUNT, STATEMENT_DATE, 
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.BmsshipStatement">
+        <id column="STATEMENT_ID" jdbcType="DECIMAL" property="statementId"/>
+        <result column="STATEMENT_NO" jdbcType="VARCHAR" property="statementNo"/>
+        <result column="STATEMENT_SHIPPER_ID" jdbcType="DECIMAL" property="statementShipperId"/>
+        <result column="STATEMENT_TOTAL_AMOUNT" jdbcType="DECIMAL" property="statementTotalAmount"/>
+        <result column="STATEMENT_DATE" jdbcType="TIMESTAMP" property="statementDate"/>
+        <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="STATEMENT_TYPE" jdbcType="VARCHAR" property="statementType"/>
+    </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
-  </sql>
-  <sql id="columns_alias">
-    t.STATEMENT_ID, t.STATEMENT_NO, t.STATEMENT_SHIPPER_ID, t.STATEMENT_TOTAL_AMOUNT, 
+    </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
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM BMSSHIP_STATEMENT
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM BMSSHIP_STATEMENT t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="statementId != null">
-        and STATEMENT_ID = #{statementId}
-      </if>
-      <if test="statementNo != null and statementNo != ''">
-        and STATEMENT_NO = #{statementNo}
-      </if>
-      <if test="statementShipperId != null">
-        and STATEMENT_SHIPPER_ID = #{statementShipperId}
-      </if>
-      <if test="statementTotalAmount != null">
-        and STATEMENT_TOTAL_AMOUNT = #{statementTotalAmount}
-      </if>
-      <if test="statementDate != null">
-        and TO_CHAR(STATEMENT_DATE,'yyyy-MM-dd') = #{statementDate}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-      <if test="statementType != null and statementType != ''">
-        and STATEMENT_TYPE = #{statementType}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="statementId != null">
-        and STATEMENT_ID = #{statementId}
-      </if>
-      <if test="statementNo != null and statementNo != ''">
-        and STATEMENT_NO LIKE '%${statementNo}%'
-      </if>
-      <if test="statementShipperId != null">
-        and STATEMENT_SHIPPER_ID = #{statementShipperId}
-      </if>
-      <if test="statementTotalAmount != null">
-        and STATEMENT_TOTAL_AMOUNT = #{statementTotalAmount}
-      </if>
-      <if test="statementDate != null">
-        and TO_CHAR(STATEMENT_DATE,'yyyy-MM-dd') = #{statementDate}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME LIKE '%${insertUsername}%'
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME LIKE '%${updateUsername}%'
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
-      </if>
-      <if test="statementType != null and statementType != ''">
-        and STATEMENT_TYPE LIKE '%${statementType}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from BMSSHIP_STATEMENT
-    where STATEMENT_ID = #{statementId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from BMSSHIP_STATEMENT
-    where 1!=1 
-      <if test="statementNo != null and statementNo != ''">
-        or STATEMENT_NO = #{statementNo}
-      </if>
-      <if test="statementShipperId != null">
-        or STATEMENT_SHIPPER_ID = #{statementShipperId}
-      </if>
-      <if test="statementTotalAmount != null">
-        or STATEMENT_TOTAL_AMOUNT = #{statementTotalAmount}
-      </if>
-      <if test="statementDate != null">
-        or TO_CHAR(STATEMENT_DATE,'yyyy-MM-dd') = '#{statementDate}'
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        or INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        or UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-      <if test="statementType != null and statementType != ''">
-        or STATEMENT_TYPE = #{statementType}
-      </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
-      )
-    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}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.BmsshipStatement">
-    insert into BMSSHIP_STATEMENT
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="statementId != null">
-        STATEMENT_ID,
-      </if>
-      <if test="statementNo != null">
-        STATEMENT_NO,
-      </if>
-      <if test="statementShipperId != null">
-        STATEMENT_SHIPPER_ID,
-      </if>
-      <if test="statementTotalAmount != null">
-        STATEMENT_TOTAL_AMOUNT,
-      </if>
-      <if test="statementDate != null">
-        STATEMENT_DATE,
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME,
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME,
-      </if>
-      <if test="updateUsername != null">
-        UPDATE_USERNAME,
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME,
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK,
-      </if>
-      <if test="statementType != null">
-        STATEMENT_TYPE,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="statementId != null">
-        #{statementId,jdbcType=DECIMAL},
-      </if>
-      <if test="statementNo != null">
-        #{statementNo,jdbcType=VARCHAR},
-      </if>
-      <if test="statementShipperId != null">
-        #{statementShipperId,jdbcType=DECIMAL},
-      </if>
-      <if test="statementTotalAmount != null">
-        #{statementTotalAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="statementDate != null">
-        #{statementDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUsername != null">
-        #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
-        #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
-        #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUpdateRemark != null">
-        #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-      <if test="statementType != null">
-        #{statementType,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.BmsshipStatement">
-    update BMSSHIP_STATEMENT
-    set STATEMENT_NO = #{statementNo,jdbcType=VARCHAR},
-      STATEMENT_SHIPPER_ID = #{statementShipperId,jdbcType=DECIMAL},
-      STATEMENT_TOTAL_AMOUNT = #{statementTotalAmount,jdbcType=DECIMAL},
-      STATEMENT_DATE = #{statementDate,jdbcType=TIMESTAMP},
-      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},
-      STATEMENT_TYPE = #{statementType,jdbcType=VARCHAR}
-    where STATEMENT_ID = #{statementId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.BmsshipStatement">
-    update BMSSHIP_STATEMENT
-    <set>
-      <if test="statementNo != null">
-        STATEMENT_NO = #{statementNo,jdbcType=VARCHAR},
-      </if>
-      <if test="statementShipperId != null">
-        STATEMENT_SHIPPER_ID = #{statementShipperId,jdbcType=DECIMAL},
-      </if>
-      <if test="statementTotalAmount != null">
-        STATEMENT_TOTAL_AMOUNT = #{statementTotalAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="statementDate != null">
-        STATEMENT_DATE = #{statementDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
-        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-      <if test="statementType != null">
-        STATEMENT_TYPE = #{statementType,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where STATEMENT_ID = #{statementId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select" />
-    where STATEMENT_ID = #{statementId,jdbcType=DECIMAL}
-  </select>
-  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select" />
-    <include refid="where" />
-  </select>
-  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select" />
-    <include refid="whereLike" />
-  </select>
-  <insert id="batchInsert" parameterType="java.util.List">
-    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
-      )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.statementId,jdbcType=DECIMAL}, 
-      #{item.statementNo,jdbcType=VARCHAR}, #{item.statementShipperId,jdbcType=DECIMAL}, 
-      #{item.statementTotalAmount,jdbcType=DECIMAL}, #{item.statementDate,jdbcType=TIMESTAMP}, 
-      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
-      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.statementType,jdbcType=VARCHAR}
-       from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update BMSSHIP_STATEMENT
-     set
-       STATEMENT_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
-          when #{item.statementId,jdbcType=DECIMAL} then #{item.statementId,jdbcType=DECIMAL}
-       </foreach>
-       ,STATEMENT_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
-          when #{item.statementId,jdbcType=DECIMAL} then #{item.statementNo,jdbcType=VARCHAR}
-       </foreach>
-       ,STATEMENT_SHIPPER_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
-          when #{item.statementId,jdbcType=DECIMAL} then #{item.statementShipperId,jdbcType=DECIMAL}
-       </foreach>
-       ,STATEMENT_TOTAL_AMOUNT=
-       <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
-          when #{item.statementId,jdbcType=DECIMAL} then #{item.statementTotalAmount,jdbcType=DECIMAL}
-       </foreach>
-       ,STATEMENT_DATE=
-       <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
-          when #{item.statementId,jdbcType=DECIMAL} then #{item.statementDate,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
-          when #{item.statementId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
-          when #{item.statementId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
-          when #{item.statementId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
-          when #{item.statementId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
-          when #{item.statementId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,STATEMENT_TYPE=
-       <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
-          when #{item.statementId,jdbcType=DECIMAL} then #{item.statementType,jdbcType=VARCHAR}
-       </foreach>
-     where STATEMENT_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.statementId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from BMSSHIP_STATEMENT
-    where STATEMENT_ID in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM BMSSHIP_STATEMENT
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM BMSSHIP_STATEMENT t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="statementId != null">
+                and STATEMENT_ID = #{statementId}
+            </if>
+            <if test="statementNo != null and statementNo != ''">
+                and STATEMENT_NO = #{statementNo}
+            </if>
+            <if test="statementShipperId != null">
+                and STATEMENT_SHIPPER_ID = #{statementShipperId}
+            </if>
+            <if test="statementTotalAmount != null">
+                and STATEMENT_TOTAL_AMOUNT = #{statementTotalAmount}
+            </if>
+            <if test="statementDate != null">
+                and TO_CHAR(STATEMENT_DATE,'yyyy-MM-dd') = #{statementDate}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME = #{insertUsername}
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME = #{updateUsername}
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+            </if>
+            <if test="statementType != null and statementType != ''">
+                and STATEMENT_TYPE = #{statementType}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="statementId != null">
+                and STATEMENT_ID = #{statementId}
+            </if>
+            <if test="statementNo != null and statementNo != ''">
+                and STATEMENT_NO LIKE '%${statementNo}%'
+            </if>
+            <if test="statementShipperId != null">
+                and STATEMENT_SHIPPER_ID = #{statementShipperId}
+            </if>
+            <if test="statementTotalAmount != null">
+                and STATEMENT_TOTAL_AMOUNT = #{statementTotalAmount}
+            </if>
+            <if test="statementDate != null">
+                and TO_CHAR(STATEMENT_DATE,'yyyy-MM-dd') = #{statementDate}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME LIKE '%${insertUsername}%'
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME LIKE '%${updateUsername}%'
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+            </if>
+            <if test="statementType != null and statementType != ''">
+                and STATEMENT_TYPE LIKE '%${statementType}%'
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+        delete
+        from BMSSHIP_STATEMENT
+        where STATEMENT_ID = #{statementId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from BMSSHIP_STATEMENT
+        where 1!=1
+        <if test="statementNo != null and statementNo != ''">
+            or STATEMENT_NO = #{statementNo}
+        </if>
+        <if test="statementShipperId != null">
+            or STATEMENT_SHIPPER_ID = #{statementShipperId}
+        </if>
+        <if test="statementTotalAmount != null">
+            or STATEMENT_TOTAL_AMOUNT = #{statementTotalAmount}
+        </if>
+        <if test="statementDate != null">
+            or TO_CHAR(STATEMENT_DATE,'yyyy-MM-dd') = '#{statementDate}'
+        </if>
+        <if test="insertUsername != null and insertUsername != ''">
+            or INSERT_USERNAME = #{insertUsername}
+        </if>
+        <if test="insertTime != null">
+            or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+        </if>
+        <if test="updateUsername != null and updateUsername != ''">
+            or UPDATE_USERNAME = #{updateUsername}
+        </if>
+        <if test="updateTime != null">
+            or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+        </if>
+        <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+            or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+        </if>
+        <if test="statementType != null and statementType != ''">
+            or STATEMENT_TYPE = #{statementType}
+        </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)
+        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})
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.BmsshipStatement">
+        insert into BMSSHIP_STATEMENT
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="statementId != null">
+                STATEMENT_ID,
+            </if>
+            <if test="statementNo != null">
+                STATEMENT_NO,
+            </if>
+            <if test="statementShipperId != null">
+                STATEMENT_SHIPPER_ID,
+            </if>
+            <if test="statementTotalAmount != null">
+                STATEMENT_TOTAL_AMOUNT,
+            </if>
+            <if test="statementDate != null">
+                STATEMENT_DATE,
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME,
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME,
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME,
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME,
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK,
+            </if>
+            <if test="statementType != null">
+                STATEMENT_TYPE,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="statementId != null">
+                #{statementId,jdbcType=DECIMAL},
+            </if>
+            <if test="statementNo != null">
+                #{statementNo,jdbcType=VARCHAR},
+            </if>
+            <if test="statementShipperId != null">
+                #{statementShipperId,jdbcType=DECIMAL},
+            </if>
+            <if test="statementTotalAmount != null">
+                #{statementTotalAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="statementDate != null">
+                #{statementDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUsername != null">
+                #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="statementType != null">
+                #{statementType,jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.BmsshipStatement">
+        update BMSSHIP_STATEMENT
+        set STATEMENT_NO           = #{statementNo,jdbcType=VARCHAR},
+            STATEMENT_SHIPPER_ID   = #{statementShipperId,jdbcType=DECIMAL},
+            STATEMENT_TOTAL_AMOUNT = #{statementTotalAmount,jdbcType=DECIMAL},
+            STATEMENT_DATE         = #{statementDate,jdbcType=TIMESTAMP},
+            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},
+            STATEMENT_TYPE         = #{statementType,jdbcType=VARCHAR}
+        where STATEMENT_ID = #{statementId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.BmsshipStatement">
+        update BMSSHIP_STATEMENT
+        <set>
+            <if test="statementNo != null">
+                STATEMENT_NO = #{statementNo,jdbcType=VARCHAR},
+            </if>
+            <if test="statementShipperId != null">
+                STATEMENT_SHIPPER_ID = #{statementShipperId,jdbcType=DECIMAL},
+            </if>
+            <if test="statementTotalAmount != null">
+                STATEMENT_TOTAL_AMOUNT = #{statementTotalAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="statementDate != null">
+                STATEMENT_DATE = #{statementDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="statementType != null">
+                STATEMENT_TYPE = #{statementType,jdbcType=VARCHAR},
+            </if>
+        </set>
+        where STATEMENT_ID = #{statementId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where STATEMENT_ID = #{statementId,jdbcType=DECIMAL}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="where"/>
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="whereLike"/>
+    </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+        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
+        )
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.statementId,jdbcType=DECIMAL},
+        #{item.statementNo,jdbcType=VARCHAR}, #{item.statementShipperId,jdbcType=DECIMAL},
+        #{item.statementTotalAmount,jdbcType=DECIMAL}, #{item.statementDate,jdbcType=TIMESTAMP},
+        #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
+        #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+        #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.statementType,jdbcType=VARCHAR}
+        from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update BMSSHIP_STATEMENT
+        set
+        STATEMENT_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.statementId,jdbcType=DECIMAL}
+        </foreach>
+        ,STATEMENT_NO=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.statementNo,jdbcType=VARCHAR}
+        </foreach>
+        ,STATEMENT_SHIPPER_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.statementShipperId,jdbcType=DECIMAL}
+        </foreach>
+        ,STATEMENT_TOTAL_AMOUNT=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.statementTotalAmount,jdbcType=DECIMAL}
+        </foreach>
+        ,STATEMENT_DATE=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.statementDate,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,STATEMENT_TYPE=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.statementType,jdbcType=VARCHAR}
+        </foreach>
+        where STATEMENT_ID in
+        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+            #{item.statementId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from BMSSHIP_STATEMENT
+        where STATEMENT_ID in
+        <foreach close=")" collection="list" item="id" open="(" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    <select id="getShipStatement" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT BS.STATEMENT_NO           AS "statementNo",
+               BS.STATEMENT_DATE         AS "statementTime",
+               RS.SHIPPER_NAME           AS "statementPaymentUnit",
+               RS.SHIPPER_NAME           AS "consigneeCompanyName",
+               BS.STATEMENT_TOTAL_AMOUNT AS "statementTotalAmount",
+               BS.STATEMENT_TYPE         AS "amountType"
+        FROM BMSSHIP_STATEMENT BS
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = BS.STATEMENT_SHIPPER_ID
+    </select>
+
+    <!-- 发货单位和收款单位 -->
+    <select id="getOtherMessage" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT RS.SUPPLIER_DUTY_PARAGRAPH AS "statementSendUnit",
+               RP.PORT_NAME AS "collectionName"
+        FROM BMSSHIP_DETAILS_STATEMENT BDS
+                 LEFT JOIN BMSSHIP_DETAILS_ORDER BDO
+                           ON BDO.DETAILS_ID = BDS.DETAILS_ID
+                 LEFT JOIN AMS_PURCHASE_ORDER APO
+                           ON APO.PURCHASE_ORDER_ID = BDO.PURCHASE_ORDER_ID
+                 LEFT JOIN RMS_SUPPLIER RS
+                           ON APO.SUPPLIER_UNIT_ID = RS.SUPPLIER_ID
+                 LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN
+                           ON ADN.BATCH_ID = APO.BATCH_ID
+                 LEFT JOIN RMS_PORT RP
+                           ON RP.PORT_ID = ADN.CARRIER_ID
+    </select>
 </mapper>

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

@@ -481,11 +481,22 @@
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
     <select id="getPurchaseTrainDetailsOrder" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT BDO.DETAILS_NO   AS "detailsNo",
-               BDO.DETAILS_TIME AS "detailsTime"
+        SELECT BDO.DETAILS_NO                    AS "detailsNo",
+               BDO.DETAILS_TIME                  AS "detailsTime",
+               APO.PUCHASE_ORDER_MATERIAL_NUMBER AS "materialNumber",
+               BDO.DETAILS_AMOUNT                AS "detailsAmount",
+               RM.MATERIAL_CODE                  AS "materialCode",
+               RM.MATERIAL_NAME                  AS "materialName"
         FROM BMSTRAIN_DETAILS_STATEMENT BDS
                  LEFT JOIN BMSTRAIN_DETAILS_ORDER BDO
                            ON BDO.DETAILS_ID = BDS.DETAILS_ID
+                 LEFT JOIN AMS_PURCHASE_ORDER APO
+                           ON BDO.PURCHASE_ORDER_ID = APO.PURCHASE_ORDER_ID
+                 LEFT JOIN DIL_BATCH DB
+                           ON DB.BATCH_ID = APO.BATCH_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON RM.MATERIAL_ID = DB.MATERIAL_ID
+        WHERE BDS.STATEMENT_ID = #{statementId}
     </select>
 
 </mapper>

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

@@ -502,5 +502,10 @@
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   
-  
+  <select id="getTrainSettlement" parameterType="DECIMAL" resultType="java.util.Map">
+    SELECT
+
+FROM BMSTRAIN_SETTLEMENT BS
+
+  </select>
 </mapper>

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

@@ -350,14 +350,14 @@
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
     <select id="getTrainStatement" parameterType="DECIMAL" resultType="java.util.Map">
         SELECT BS.STATEMENT_NO           AS "statementNo",
-               BS.STATEMENT_DATE         AS "statementDate",
+               BS.STATEMENT_DATE         AS "statementTime",
                RS.SHIPPER_NAME           AS "statementPaymentUnit",
                RS.SHIPPER_NAME           AS "consigneeCompanyName",
                BS.STATEMENT_TOTAL_AMOUNT AS "statementTotalAmount"
         FROM BMSTRAIN_STATEMENT BS
                  LEFT JOIN RMS_SHIPPER RS
                            ON RS.SHIPPER_ID = BS.STATEMENT_SHIPPER_ID
-
+        WHERE BS.STATEMENT_ID = #{statementId}
     </select>
 
     <select id="getCarrierAndReceiver" parameterType="DECIMAL" resultType="java.util.Map">

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

@@ -431,8 +431,8 @@
         SELECT DISTINCT BDO.DETAILS_NO             AS "detailsNo",
                         BDO.DETAILS_TIME           AS "detailsTime",
                         RCA.CAPACITY_NUMBER        AS "capacityNumber",
-                        RS.SHIPPER_NAME            AS "shipperName",
-                        RCO.CONSIGNEE_COMPANY_NAME AS "consigneeCompanyName",
+                        RS.SHIPPER_NAME            AS "startPlace",
+                        RCO.CONSIGNEE_COMPANY_NAME AS "endPlace",
                         ASP.PLAN_MATERIAL_NUMBER   AS "materialNumber",
                         BDO.DETAILS_AMOUNT         AS "detailsAmount",
                         RC.CARRIER_NAME            AS "carrierName",
@@ -493,6 +493,7 @@
                            ON DB.BATCH_ID = AP.BATCH_ID
                  LEFT JOIN RMS_MATERIAL RM
                            ON RM.MATERIAL_ID = DB.MATERIAL_ID
+        WHERE BDO.DETAILS_ID = #{detailsId}
     </select>
 
     <!-- 查询采购汽运账单所需信息 -->

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

@@ -456,11 +456,11 @@
 
     <!-- 得到账单信息 -->
     <select id="getStatement" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT BS.STATEMENT_NUMBER       AS "statementNumber",
+        SELECT BS.STATEMENT_NUMBER       AS "statementNo",
                BS.INSERT_TIME            AS "statementTime",
                BS.STATEMENT_PAYMENT_UNIT AS "statementPaymentUnit",
                BS.STATEMENT_PAYMENT_UNIT AS "statementSendUnit",
-               BS.STATEMENT_EXCLUD_TAX   AS "statementExcludTax",
+               BS.STATEMENT_EXCLUD_TAX   AS "statementTotalAmount",
                BS.STATEMENT_TYPE         AS "statementType"
         FROM BMSTRUCK_STATEMENT BS
         WHERE BS.STATEMENT_ID = #{statementId}