10.11提交

pom.xml

@@ -114,7 +114,7 @@
 <!--                        <param>AMS_PURCHASE_ORDER</param>&lt;!&ndash;采购订单&ndash;&gt;-->
 <!--                        <param>AMS_CONTRACT_TRANSPORT_PRICE</param>&lt;!&ndash;运费&ndash;&gt;-->
 <!--                        <param>AMS_CONTRACT_BREACH</param>&lt;!&ndash;违约规则&ndash;&gt;-->
-                        <param>AMS_CONTRACT_TRAIN_PRICE</param><!--违约规则-->
+                        <param>AMS_CONTRACT_OTHER_PRICE</param><!--违约规则-->
                     </tables>
                 </configuration>
                 <executions>

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

@@ -0,0 +1,122 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.model.AmsContractOtherPrice;
+import com.steerinfo.dil.service.impl.AmsContractOtherPriceServiceImpl;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+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.*;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/9/13 19:57
+ * @Version:V2.0
+ */
+@RestController
+@RequestMapping("/${api.version}/amscontractotherprices")
+public class AmsContractOtherPriceController extends BaseRESTfulController {
+
+    @Autowired
+    AmsContractOtherPriceServiceImpl amsContractOtherPriceService;
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    /**
+     * 展示港口装卸费
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiModelProperty(value = "展示港口装卸费")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "144", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getLoadUnloadPriceList")
+    public RESTfulResult getLoadUnloadPriceList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          Integer apiId) {
+        List<Map<String, Object>> list = amsContractOtherPriceService.getLoadUnloadPriceList(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = amsContractOtherPriceService.getLoadUnloadPriceList(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
+
+    /**
+     * 新增港口装卸费
+     * @param amsContractOtherPrice
+     * @return
+     */
+    @ApiModelProperty(value = "新增港口装卸费")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsContractOtherPrice", value = "运价实体", required = false, dataType = "AmsContractTrainPrice"),
+    })
+    @PostMapping("/addLoadUnloadPrice")
+    public RESTfulResult addLoadUnloadPrice(@RequestBody AmsContractOtherPrice amsContractOtherPrice) {
+        int result = amsContractOtherPriceService.insert(amsContractOtherPrice);
+        return success(result);
+    }
+
+    /**
+     * 逻辑删除港口装卸费
+     * @param priceId
+     * @return
+     */
+    @ApiModelProperty(value = "逻辑删除港口装卸费")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "priceId", value = "价格编号", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/deleteLoadUnloadPrice/{priceId}")
+    public RESTfulResult deleteLoadUnloadPrice(@PathVariable("priceId") BigDecimal priceId) {
+        int result = amsContractOtherPriceService.delete(priceId);
+        return success(result);
+    }
+
+    /**
+     * 修改港口装卸费
+     * @param amsContractOtherPrice
+     * @return
+     */
+    @ApiModelProperty(value = "修改港口装卸费")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsContractOtherPrice", value = "运价实体", required = false, dataType = "amsContractOtherPrice"),
+    })
+    @PostMapping("/updateLoadUnloadPrice")
+    public RESTfulResult updateLoadUnloadPrice(@RequestBody AmsContractOtherPrice amsContractOtherPrice) {
+        int result = amsContractOtherPriceService.updateByPrimaryKeySelective(amsContractOtherPrice);
+        return success(result);
+    }
+
+    /**
+     * 得到修改渲染
+     * @param priceId
+     * @return
+     */
+    @ApiModelProperty(value = "得到修改渲染")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "priceId", value = "价格编号", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/selectLoadUnloadPriceToUpdate/{priceId}")
+    public RESTfulResult selectLoadUnloadPriceToUpdate(@PathVariable("priceId") BigDecimal priceId) {
+        List<Map<String,Object>> result = amsContractOtherPriceService.selectLoadUnloadPriceToUpdate(priceId);
+        return success(result);
+    }
+}

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

@@ -10,6 +10,7 @@ import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -121,6 +122,90 @@ public class AmsContractTransportPriceController extends BaseRESTfulController {
         return success(result);
     }
 
+    /**
+     * 展示汽运单价
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiModelProperty(value = "展示汽运单价列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "139", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getTruckPriceList")
+    public RESTfulResult getTruckPriceList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          Integer apiId) {
+        List<Map<String, Object>> list = amsContractTransportPriceService.getAmsContractTransportPrice(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = amsContractTransportPriceService.getAmsContractTransportPrice(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
+    /**
+     * 新增汽运单价
+     * @param amsContractTransportPrice
+     * @return
+     */
+    @ApiOperation(value="新增汽运单价")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsContractTransportPrice", value = "汽运单价对象", required = false, dataType = "AmsContractTransportPrice")
+    })
+    @PostMapping(value = "/addAmsContractTransportPrice")
+    public RESTfulResult addAmsContractTransportPrice(@RequestBody(required = false) AmsContractTransportPrice amsContractTransportPrice){
+        int i = amsContractTransportPriceService.insert(amsContractTransportPrice);
+        return success(i);
+    }
+
+    /**
+     * 通过主键修改汽运单价
+     * @param amsContractTransportPrice
+     * @return
+     */
+    @ApiOperation(value="通过主键修改汽运单价")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsContractTransportPrice", value = "销售订单对象", required = false, dataType = "AmsContractTransportPrice")
+    })
+    @PostMapping(value = "/updateAmsContractTransportPrice")
+    public RESTfulResult updateAmsContractTransportPrice(@RequestBody(required = false) AmsContractTransportPrice amsContractTransportPrice){
+        int i = amsContractTransportPriceService.updateByPrimaryKeySelective(amsContractTransportPrice);
+        return success(i);
+    }
+
+    /**
+     * 油价联动导致运价变动，批量修改运价
+     * @param
+     * @return
+     */
+    @ApiOperation(value="油价联动导致运价变动，批量修改运价")
+    @ApiImplicitParams({
+    })
+    @PostMapping(value = "/batchUpdateTransportPriceByOilPrice")
+    public RESTfulResult batchUpdateTransportPriceByOilPrice(){
+        int i = amsContractTransportPriceService.batchUpdateTransportPriceByOilPrice();
+        return success(i);
+    }
+
+    /**
+     * 获取收货地址
+     * @param
+     * @return
+     */
+    @ApiOperation(value="获取收货地址")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/getAddressDeliveryAddress")
+    public RESTfulResult getAddressDeliveryAddress(){
+        return success(amsContractTransportPriceService.getAddressDeliveryAddress());
+    }
+
     /**
      * 得到托运人id
      * @param
@@ -146,17 +231,30 @@ public class AmsContractTransportPriceController extends BaseRESTfulController {
     }
 
     /**
-     * 得到运力id
+     * 得到船运运力id
      * @param
      * @return
      */
-    @ApiModelProperty(value = "得到运力id")
+    @ApiModelProperty(value = "得到船运运力id")
     @GetMapping("/getCapacityId")
     public RESTfulResult getCapacityId() {
         List<Map<String,Object>> result = amsContractTransportPriceService.getCapacityId();
         return success(result);
     }
 
+    /**
+     * 得到汽运运力id
+     * @param
+     * @return
+     */
+    @ApiModelProperty(value = "得到汽运运力id")
+    @GetMapping("/getTruckCapacityId")
+    public RESTfulResult getTruckCapacityId() {
+        List<Map<String,Object>> result = amsContractTransportPriceService.getTruckCapacityId();
+        return success(result);
+    }
+
+
     /**
      * 得到物资id
      * @param

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

@@ -12,8 +12,7 @@ import java.util.Map;
  * @Date 2021/6/23 9:58
  * @Version 1.0
  */
-@FeignClient(value = "DIL-COLUMN-DATA-DEV",url = "192.168.10.167:8083")
-//@FeignClient(value = "DIL-COLUMN-DATA-DEV",url = "10.244.97.183:80")
+@FeignClient(value = "DIL-COLUMN-DATA-DEV",url = "192.168.0.106:8083")
 public interface ColumnDataFeign {
     @RequestMapping("getColumnData")
     List<Map<String,Object>> getColumnData(@RequestParam("apiId") Integer apiId);

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

@@ -0,0 +1,30 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.dil.util.PageListAdd;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author zhangnan
+ * @Date 2021/7/27 15:49
+ * @Version 1.0
+ */
+
+@FeignClient(value = "DIL-ES-DEV",url = "https://portal-dev.steerinfo.com/icore.icp.web/pass/dil/dil-es-api")
+public interface ESFeign {
+    @PostMapping("api/v1/es/getConResult")
+    PageListAdd getConResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                             @RequestParam String index,
+                             @RequestParam Integer apiId,
+                             @RequestParam Integer pageNum,
+                             @RequestParam Integer pageSize,
+                             @RequestParam String con);
+
+    @PostMapping( value = "api/v1/es/insertIndex",consumes = "application/json", produces = "application/json")
+    void insertIndex(@RequestBody List<Map<String, Object>> detailListTotal);
+}

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

@@ -0,0 +1,47 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.AmsContractOtherPrice;
+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 AmsContractOtherPriceMapper extends IBaseMapper<AmsContractOtherPrice, BigDecimal> {
+
+    /**
+     * 展示港口装卸费列表
+     * @param mapValue
+     * @return
+     */
+    List<Map<String, Object>> getLoadUnloadPriceList(Map<String, Object> mapValue);
+
+    /**
+     * 查询修改渲染
+     * @param priceId
+     * @return
+     */
+    List<Map<String, Object>> selectLoadUnloadPriceToUpdate(BigDecimal priceId);
+
+    /**
+     * 新增
+     * @param amsContractOtherPrice
+     * @return
+     */
+    int insertSelective(AmsContractOtherPrice amsContractOtherPrice);
+
+    /**
+     * 修改
+     * @param amsContractOtherPrice
+     * @return
+     */
+    int updateByPrimaryKeySelective(AmsContractOtherPrice amsContractOtherPrice);
+
+    /**
+     * 得到最大id
+     * @return
+     */
+    BigDecimal selectMaxId();
+}

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

@@ -58,11 +58,17 @@ public interface AmsContractTransportPriceMapper extends IBaseMapper<AmsContract
     List<Map<String,Object>> getCarrierId();
 
     /**
-     * 得到运力id
+     * 得到船运运力id
      * @return
      */
     List<Map<String,Object>> getCapacityId();
 
+    /**
+     * 得到汽运运力id
+     * @return
+     */
+    List<Map<String,Object>> getTruckCapacityId();
+
     /**
      * 得到物资id
      * @return
@@ -74,4 +80,23 @@ public interface AmsContractTransportPriceMapper extends IBaseMapper<AmsContract
      * @return
      */
     List<Map<String,Object>> getLineId();
+
+    /**
+     * 获取汽运单价信息
+     * @param map
+     * @return
+     */
+    List<Map<String, Object>> getAmsContractTransportPrice(Map<String,Object> map);
+    //获取收货地址
+    List<Map<String, Object>> getAddressDeliveryAddress();
+    //获取要渲染的信息
+    List<Map<String, Object>> selectByPriceId(BigDecimal priceId);
+    //获取所有的油价
+    List<Map<String, Object>> getOriginAndNowOilPrice();
+    //通过油价变动率批量修改油价
+    int batchUpdateTransportPriceByOilPrice(Double updateOilPrice);
+    //获取运价和吨公里数值列表
+    List<Map<String, Object>> getPriceValueAndPriceTonKilometer();
+//    //通过主键修改吨公里数
+//    int updatePriceTonKilometer(BigDecimal priceId);
 }

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

@@ -0,0 +1,168 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="其他单价")
+public class AmsContractOtherPrice implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(PRICE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal priceId;
+
+    /**
+     * 单价类型（0：湿吨单价；1：采购单价；2：港口装卸单价）(PRICE_TYPE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="单价类型（0：湿吨单价；1：采购单价；2：港口装卸单价）",required=false)
+    private String priceType;
+
+    /**
+     * 单价（保留两位小数）(PRICE_VALUE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="单价（保留两位小数）",required=false)
+    private BigDecimal priceValue;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 逻辑删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="逻辑删除",required=false)
+    private BigDecimal deleted;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.priceId;
+    }
+
+    @Override
+    public void setId(BigDecimal priceId) {
+        this.priceId = priceId;
+    }
+
+    public BigDecimal getPriceId() {
+        return priceId;
+    }
+
+    public void setPriceId(BigDecimal priceId) {
+        this.priceId = priceId;
+    }
+
+    public String getPriceType() {
+        return priceType;
+    }
+
+    public void setPriceType(String priceType) {
+        this.priceType = priceType == null ? null : priceType.trim();
+    }
+
+    public BigDecimal getPriceValue() {
+        return priceValue;
+    }
+
+    public void setPriceValue(BigDecimal priceValue) {
+        this.priceValue = priceValue;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", priceId=").append(priceId);
+        sb.append(", priceType=").append(priceType);
+        sb.append(", priceValue=").append(priceValue);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -45,10 +45,10 @@ public class AmsContractTransportPrice implements IBasePO<BigDecimal> {
     private String materialId;
 
     /**
-     * 吨公里（元/吨.km）(PRICE_TON_KILOMETER,CHAR,10)
+     * 吨公里（元/吨.km）(PRICE_TON_KILOMETER,DECIMAL,0)
      */
     @ApiModelProperty(value="吨公里（元/吨.km）",required=false)
-    private String priceTonKilometer;
+    private BigDecimal priceTonKilometer;
 
     /**
      * 运价（保留两位小数）(PRICE_VALUE,DECIMAL,0)
@@ -98,6 +98,12 @@ public class AmsContractTransportPrice implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="逻辑删除",required=false)
     private BigDecimal deleted;
 
+    /**
+     * 收货地址ID(ADDRESS_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="收货地址ID",required=false)
+    private BigDecimal addressId;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -158,12 +164,12 @@ public class AmsContractTransportPrice implements IBasePO<BigDecimal> {
         this.materialId = materialId == null ? null : materialId.trim();
     }
 
-    public String getPriceTonKilometer() {
+    public BigDecimal getPriceTonKilometer() {
         return priceTonKilometer;
     }
 
-    public void setPriceTonKilometer(String priceTonKilometer) {
-        this.priceTonKilometer = priceTonKilometer == null ? null : priceTonKilometer.trim();
+    public void setPriceTonKilometer(BigDecimal priceTonKilometer) {
+        this.priceTonKilometer = priceTonKilometer;
     }
 
     public BigDecimal getPriceValue() {
@@ -230,6 +236,14 @@ public class AmsContractTransportPrice implements IBasePO<BigDecimal> {
         this.deleted = deleted;
     }
 
+    public BigDecimal getAddressId() {
+        return addressId;
+    }
+
+    public void setAddressId(BigDecimal addressId) {
+        this.addressId = addressId;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -251,6 +265,7 @@ public class AmsContractTransportPrice implements IBasePO<BigDecimal> {
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
         sb.append(", deleted=").append(deleted);
+        sb.append(", addressId=").append(addressId);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -0,0 +1,57 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.dil.model.AmsContractOtherPrice;
+import com.steerinfo.dil.model.AmsContractTrainPrice;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/9/27 9:08
+ * @Version:V2.0
+ */
+public interface IAmsContractOtherPriceService {
+    /**
+     * 展示港口装卸费列表
+     * @param mapValue
+     * @return
+     */
+    List<Map<String, Object>> getLoadUnloadPriceList(Map<String, Object> mapValue);
+
+    /**
+     * 新增
+     * @param amsContractOtherPrice
+     * @return
+     */
+    int insert(AmsContractOtherPrice amsContractOtherPrice);
+
+    /**
+     * 逻辑删除
+     * @param priceId
+     * @return
+     */
+    int delete(BigDecimal priceId);
+
+    /**
+     * 修改
+     * @param amsContractOtherPrice
+     * @return
+     */
+    int updateByPrimaryKeySelective(AmsContractOtherPrice amsContractOtherPrice);
+
+    /**
+     * 查询修改渲染
+     * @param priceId
+     * @return
+     */
+    List<Map<String, Object>> selectLoadUnloadPriceToUpdate(BigDecimal priceId);
+
+    /**
+     * 得到最大id
+     * @return
+     */
+    BigDecimal selectMaxId();
+}

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

@@ -73,6 +73,12 @@ public interface IAmsContractTransportPriceService {
      */
     List<Map<String,Object>> getCapacityId();
 
+    /**
+     * 得到汽运运力id
+     * @return
+     */
+    List<Map<String,Object>> getTruckCapacityId();
+
     /**
      * 得到物资id
      * @return
@@ -84,4 +90,21 @@ public interface IAmsContractTransportPriceService {
      * @return
      */
     List<Map<String,Object>> getLineId();
+
+    /**
+     * 获取汽运单价信息
+     * @param map
+     * @return
+     */
+    List<Map<String, Object>> getAmsContractTransportPrice(Map<String,Object> map);
+    //获取收货地址
+    List<Map<String, Object>> getAddressDeliveryAddress();
+    //获取要渲染的信息
+    List<Map<String, Object>> selectByPriceId(BigDecimal priceId);
+    //获取所有的油价
+    List<Map<String, Object>> getOriginAndNowOilPrice();
+    //通过油价变动率批量修改油价
+    int batchUpdateTransportPriceByOilPrice();
+    //获取运价和吨公里数值列表
+    List<Map<String, Object>> getPriceValueAndPriceTonKilometer();
 }

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

@@ -0,0 +1,96 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.AmsContractOtherPriceMapper;
+import com.steerinfo.dil.model.AmsContractOtherPrice;
+import com.steerinfo.dil.service.IAmsContractOtherPriceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/9/27 9:09
+ * @Version:V2.0
+ */
+@Service
+public class AmsContractOtherPriceServiceImpl implements IAmsContractOtherPriceService {
+
+    @Autowired
+    AmsContractOtherPriceMapper amsContractOtherPriceMapper;
+
+    /**
+     * 展示装卸费
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getLoadUnloadPriceList(Map<String, Object> mapValue) {
+        return amsContractOtherPriceMapper.getLoadUnloadPriceList(mapValue);
+    }
+
+    /**
+     * 新增
+     * @param amsContractOtherPrice
+     * @return
+     */
+    @Override
+    public int insert(AmsContractOtherPrice amsContractOtherPrice) {
+        BigDecimal priceId = selectMaxId();
+        amsContractOtherPrice.setPriceId(priceId);
+        amsContractOtherPrice.setInsertTime(new Date());
+        amsContractOtherPrice.setUpdateTime(new Date());
+        amsContractOtherPrice.setInsertUsername("admin");
+        amsContractOtherPrice.setUpdateUsername("admin");
+        amsContractOtherPrice.setDeleted(new BigDecimal(0));
+        amsContractOtherPrice.setInsertUpdateRemark("无");
+        return amsContractOtherPriceMapper.insertSelective(amsContractOtherPrice);
+    }
+
+    /**
+     * 逻辑删除
+     * @param priceId
+     * @return
+     */
+    @Override
+    public int delete(BigDecimal priceId) {
+        AmsContractOtherPrice amsContractOtherPrice = amsContractOtherPriceMapper.selectByPrimaryKey(priceId);
+        amsContractOtherPrice.setDeleted(new BigDecimal(1));
+        return amsContractOtherPriceMapper.updateByPrimaryKeySelective(amsContractOtherPrice);
+    }
+
+    /**
+     * 修改
+     * @param amsContractOtherPrice
+     * @return
+     */
+    @Override
+    public int updateByPrimaryKeySelective(AmsContractOtherPrice amsContractOtherPrice) {
+        amsContractOtherPrice.setUpdateTime(new Date());
+        return amsContractOtherPriceMapper.updateByPrimaryKeySelective(amsContractOtherPrice);
+    }
+
+    /**
+     * 查询修改渲染
+     * @param priceId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectLoadUnloadPriceToUpdate(BigDecimal priceId) {
+        return amsContractOtherPriceMapper.selectLoadUnloadPriceToUpdate(priceId);
+    }
+
+    /**
+     * 查询最大id
+     * @return
+     */
+    @Override
+    public BigDecimal selectMaxId() {
+        BigDecimal priceId = amsContractOtherPriceMapper.selectMaxId();
+        return priceId == null ? new BigDecimal(0) : new BigDecimal(priceId.intValue() + 1);
+    }
+}

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

@@ -102,7 +102,7 @@ public class AmsContractTransportPriceServiceImpl implements IAmsContractTranspo
     }
 
     /**
-     * 获得运力id
+     * 获得船运运力id
      * @return
      */
     @Override
@@ -110,6 +110,15 @@ public class AmsContractTransportPriceServiceImpl implements IAmsContractTranspo
         return amsContractTransportPriceMapper.getCapacityId();
     }
 
+    /**
+     * 获得汽运运力id
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getTruckCapacityId() {
+        return amsContractTransportPriceMapper.getTruckCapacityId();
+    }
+
     /**
      * 获得物资id
      * @return
@@ -128,6 +137,82 @@ public class AmsContractTransportPriceServiceImpl implements IAmsContractTranspo
         return amsContractTransportPriceMapper.getLineId();
     }
 
+    /**
+     * 获取汽运单价信息
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getAmsContractTransportPrice(Map<String, Object> map) {
+        return amsContractTransportPriceMapper.getAmsContractTransportPrice(map);
+    }
+
+    /**
+     * 得到地址下拉框
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getAddressDeliveryAddress() {
+        return amsContractTransportPriceMapper.getAddressDeliveryAddress();
+    }
+
+    /**
+     * 通过主键获取渲染
+     * @param priceId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectByPriceId(BigDecimal priceId) {
+        return amsContractTransportPriceMapper.selectByPriceId(priceId);
+    }
+
+    /**
+     * 得到油价
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getOriginAndNowOilPrice() {
+        return amsContractTransportPriceMapper.getOriginAndNowOilPrice();
+    }
+
+    /**
+     * 通过油价修改汽运单价
+     * @return
+     */
+    @Override
+    public int batchUpdateTransportPriceByOilPrice() {
+        //获取所有油价信息
+        List<Map<String, Object>> originAndNowOilPrice = amsContractTransportPriceMapper.getOriginAndNowOilPrice();
+        //原油价
+        BigDecimal originOilPrice = new BigDecimal("1");
+        //现油价
+        BigDecimal nowOilPrice = new BigDecimal("0");
+        for (int i = 0; i < 2; i++) {
+            if(i==0){
+                nowOilPrice = (BigDecimal) originAndNowOilPrice.get(i).get("priceValue");
+            }else if(i==1){
+                originOilPrice = (BigDecimal) originAndNowOilPrice.get(i).get("priceValue");
+            }
+        }
+        //油价变动率
+        Double updateOilPrice = nowOilPrice.doubleValue()/originOilPrice.doubleValue()-1;
+        //获取原运价和吨公里数
+        List<Map<String, Object>> priceValueAndPriceTonKilometer = amsContractTransportPriceMapper.getPriceValueAndPriceTonKilometer();
+        if(updateOilPrice>0.05||updateOilPrice<-0.05){
+            return amsContractTransportPriceMapper.batchUpdateTransportPriceByOilPrice(updateOilPrice);
+        }
+        return 0;
+    }
+
+    /**
+     * 得到汽运单价
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getPriceValueAndPriceTonKilometer() {
+        return amsContractTransportPriceMapper.getPriceValueAndPriceTonKilometer();
+    }
+
     /**
      * 修改渲染
      * @param priceId

src/main/resources/application-dev.yml

@@ -5,5 +5,5 @@ spring:
     username: DIL0901
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: [name]
+    name: dil-ams-api-dev
 

src/main/resources/application-prod.yml

@@ -5,4 +5,4 @@ spring:
     username: DIL0901
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: [name]
+    name: dil-ams-api-dev

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

@@ -343,15 +343,15 @@
     )
         <where>
             <if test="breachName!= null">
-                and acb.BREACH_NAME in
+                and
                 <foreach collection="breachName" item="item" open="(" separator="," close=")">
-                    #{item}
+                    "breachName" in    #{item}
                 </foreach>
             </if>
             <if test="breachValue!= null">
-                and acb.BREACH_VALUE in
+                and
                 <foreach collection="breachValue" item="item" open="(" separator="," close=")">
-                    #{item}
+                    "breachValue" in    #{item}
                 </foreach>
             </if>
         </where>

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

@@ -0,0 +1,377 @@
+<?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.AmsContractOtherPriceMapper">
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmsContractOtherPrice">
+        <id column="PRICE_ID" jdbcType="DECIMAL" property="priceId" />
+        <result column="PRICE_TYPE" jdbcType="VARCHAR" property="priceType" />
+        <result column="PRICE_VALUE" jdbcType="DECIMAL" property="priceValue" />
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+        <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+    </resultMap>
+    <sql id="columns">
+        PRICE_ID, PRICE_TYPE, PRICE_VALUE, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
+    </sql>
+    <sql id="columns_alias">
+        t.PRICE_ID, t.PRICE_TYPE, t.PRICE_VALUE, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME,
+    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED
+    </sql>
+    <sql id="select">
+        SELECT <include refid="columns"/> FROM AMS_CONTRACT_OTHER_PRICE
+    </sql>
+    <sql id="select_alias">
+        SELECT <include refid="columns_alias"/> FROM AMS_CONTRACT_OTHER_PRICE t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="priceId != null">
+                and PRICE_ID = #{priceId}
+            </if>
+            <if test="priceType != null and priceType != ''">
+                and PRICE_TYPE = #{priceType}
+            </if>
+            <if test="priceValue != null">
+                and PRICE_VALUE = #{priceValue}
+            </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="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="priceId != null">
+                and PRICE_ID = #{priceId}
+            </if>
+            <if test="priceType != null and priceType != ''">
+                and PRICE_TYPE LIKE '%${priceType}%'
+            </if>
+            <if test="priceValue != null">
+                and PRICE_VALUE = #{priceValue}
+            </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="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+        delete from AMS_CONTRACT_OTHER_PRICE
+        where PRICE_ID = #{priceId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from AMS_CONTRACT_OTHER_PRICE
+        where 1!=1
+        <if test="priceType != null and priceType != ''">
+            or PRICE_TYPE = #{priceType}
+        </if>
+        <if test="priceValue != null">
+            or PRICE_VALUE = #{priceValue}
+        </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="deleted != null">
+            or DELETED = #{deleted}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.AmsContractOtherPrice">
+        insert into AMS_CONTRACT_OTHER_PRICE (PRICE_ID, PRICE_TYPE, PRICE_VALUE,
+                                              INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+                                              UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
+        )
+        values (#{priceId,jdbcType=DECIMAL}, #{priceType,jdbcType=VARCHAR}, #{priceValue,jdbcType=DECIMAL},
+                #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
+                #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}
+               )
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsContractOtherPrice">
+        insert into AMS_CONTRACT_OTHER_PRICE
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="priceId != null">
+                PRICE_ID,
+            </if>
+            <if test="priceType != null">
+                PRICE_TYPE,
+            </if>
+            <if test="priceValue != null">
+                PRICE_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>
+            <if test="deleted != null">
+                DELETED,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="priceId != null">
+                #{priceId,jdbcType=DECIMAL},
+            </if>
+            <if test="priceType != null">
+                #{priceType,jdbcType=VARCHAR},
+            </if>
+            <if test="priceValue != null">
+                #{priceValue,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>
+            <if test="deleted != null">
+                #{deleted,jdbcType=DECIMAL},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsContractOtherPrice">
+        update AMS_CONTRACT_OTHER_PRICE
+        set PRICE_TYPE = #{priceType,jdbcType=VARCHAR},
+            PRICE_VALUE = #{priceValue,jdbcType=DECIMAL},
+            INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            DELETED = #{deleted,jdbcType=DECIMAL}
+        where PRICE_ID = #{priceId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsContractOtherPrice">
+        update AMS_CONTRACT_OTHER_PRICE
+        <set>
+            <if test="priceType != null">
+                PRICE_TYPE = #{priceType,jdbcType=VARCHAR},
+            </if>
+            <if test="priceValue != null">
+                PRICE_VALUE = #{priceValue,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>
+            <if test="deleted != null">
+                DELETED = #{deleted,jdbcType=DECIMAL},
+            </if>
+        </set>
+        where PRICE_ID = #{priceId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where PRICE_ID = #{priceId,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 AMS_CONTRACT_OTHER_PRICE
+        (PRICE_ID,
+        PRICE_TYPE, PRICE_VALUE, INSERT_USERNAME,
+        INSERT_TIME, UPDATE_USERNAME,
+        UPDATE_TIME, INSERT_UPDATE_REMARK,
+        DELETED)
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.priceId,jdbcType=DECIMAL},
+        #{item.priceType,jdbcType=VARCHAR}, #{item.priceValue,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR},
+        #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
+        #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
+        #{item.deleted,jdbcType=DECIMAL} from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update AMS_CONTRACT_OTHER_PRICE
+        set
+        PRICE_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRICE_ID" close="end">
+            when #{item.priceId,jdbcType=DECIMAL} then #{item.priceId,jdbcType=DECIMAL}
+        </foreach>
+        ,PRICE_TYPE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRICE_ID" close="end">
+            when #{item.priceId,jdbcType=DECIMAL} then #{item.priceType,jdbcType=VARCHAR}
+        </foreach>
+        ,PRICE_VALUE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRICE_ID" close="end">
+            when #{item.priceId,jdbcType=DECIMAL} then #{item.priceValue,jdbcType=DECIMAL}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRICE_ID" close="end">
+            when #{item.priceId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRICE_ID" close="end">
+            when #{item.priceId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRICE_ID" close="end">
+            when #{item.priceId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRICE_ID" close="end">
+            when #{item.priceId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRICE_ID" close="end">
+            when #{item.priceId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,DELETED=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRICE_ID" close="end">
+            when #{item.priceId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+        </foreach>
+        where PRICE_ID in
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+            #{item.priceId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from AMS_CONTRACT_OTHER_PRICE
+        where PRICE_ID in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    <!-- 得到最大id -->
+    <select id="selectMaxId" resultType="DECIMAL">
+        SELECT MAX(PRICE_ID)
+        FROM AMS_CONTRACT_OTHER_PRICE
+    </select>
+
+    <sql id="orderByInsertTime">
+        <if test="orderField != null and orderField != ''">
+            order by "${orderField}"
+            <if test="orderType != null and orderType != ''">
+                ${orderType}
+            </if>
+        </if>
+        <if test="orderField == null  ">
+            order by "insertTime" desc
+        </if>
+    </sql>
+
+    <!-- 展示港口装卸费列表 -->
+    <select id="getLoadUnloadPriceList" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT *
+        FROM (
+        SELECT acop.INSERT_TIME as "insertTime",
+        acop.PRICE_ID as "priceId",
+        acop.PRICE_TYPE as "priceType",
+        acop.PRICE_VALUE as "priceValue",
+        acop.UPDATE_TIME as "updateTime"
+        FROM AMS_CONTRACT_OTHER_PRICE acop
+        WHERE DELETED = 0
+        )
+        <where>
+            <if test="priceType!= null">
+                and
+                <foreach collection="priceType" item="item" open="(" separator="," close=")">
+                    "priceType" in #{item}
+                </foreach>
+            </if>
+            <if test="priceValue!= null">
+                and
+                <foreach collection="priceValue" item="item" open="(" separator="," close=")">
+                    "priceValue" in #{item}
+                </foreach>
+            </if>
+            <if test="updateTime!= null">
+                and
+                <foreach collection="updateTime" item="item" open="(" separator="," close=")">
+                    "updateTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderByInsertTime"></include>
+    </select>
+
+    <!-- 得到修改渲染 -->
+    <select id="selectLoadUnloadPriceToUpdate" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT PRICE_TYPE  as "priceType",
+               PRICE_VALUE as "priceValue"
+        FROM AMS_CONTRACT_OTHER_PRICE
+        WHERE PRICE_ID = #{priceId}
+    </select>
+</mapper>

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

@@ -2,37 +2,42 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.AmsContractTransportPriceMapper">
     <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmsContractTransportPrice">
-        <id column="PRICE_ID" jdbcType="DECIMAL" property="priceId" />
-        <result column="SHIPPER_ID" jdbcType="DECIMAL" property="shipperId" />
-        <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId" />
-        <result column="LINE_ID" jdbcType="DECIMAL" property="lineId" />
-        <result column="CAPACITY_ID" jdbcType="DECIMAL" property="capacityId" />
-        <result column="MATERIAL_ID" jdbcType="CHAR" property="materialId" />
-        <result column="PRICE_TON_KILOMETER" jdbcType="CHAR" property="priceTonKilometer" />
-        <result column="PRICE_VALUE" jdbcType="DECIMAL" property="priceValue" />
-        <result column="PRICE_DATE" jdbcType="TIMESTAMP" property="priceDate" />
-        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
-        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
-        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
-        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
-        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
-        <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+        <id column="PRICE_ID" jdbcType="DECIMAL" property="priceId"/>
+        <result column="SHIPPER_ID" jdbcType="DECIMAL" property="shipperId"/>
+        <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId"/>
+        <result column="LINE_ID" jdbcType="DECIMAL" property="lineId"/>
+        <result column="CAPACITY_ID" jdbcType="DECIMAL" property="capacityId"/>
+        <result column="MATERIAL_ID" jdbcType="CHAR" property="materialId"/>
+        <result column="PRICE_TON_KILOMETER" jdbcType="DECIMAL" property="priceTonKilometer"/>
+        <result column="PRICE_VALUE" jdbcType="DECIMAL" property="priceValue"/>
+        <result column="PRICE_DATE" jdbcType="TIMESTAMP" property="priceDate"/>
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername"/>
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime"/>
+        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername"/>
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
+        <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
+        <result column="ADDRESS_ID" jdbcType="DECIMAL" property="addressId"/>
     </resultMap>
     <sql id="columns">
-    PRICE_ID, SHIPPER_ID, CARRIER_ID, LINE_ID, CAPACITY_ID, MATERIAL_ID, PRICE_TON_KILOMETER,
+        PRICE_ID, SHIPPER_ID, CARRIER_ID, LINE_ID, CAPACITY_ID, MATERIAL_ID, PRICE_TON_KILOMETER,
     PRICE_VALUE, PRICE_DATE, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
-    INSERT_UPDATE_REMARK, DELETED
-  </sql>
+    INSERT_UPDATE_REMARK, DELETED, ADDRESS_ID
+    </sql>
     <sql id="columns_alias">
-    t.PRICE_ID, t.SHIPPER_ID, t.CARRIER_ID, t.LINE_ID, t.CAPACITY_ID, t.MATERIAL_ID,
+        t.PRICE_ID, t.SHIPPER_ID, t.CARRIER_ID, t.LINE_ID, t.CAPACITY_ID, t.MATERIAL_ID,
     t.PRICE_TON_KILOMETER, t.PRICE_VALUE, t.PRICE_DATE, t.INSERT_USERNAME, t.INSERT_TIME,
-    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED
-  </sql>
+    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, t.ADDRESS_ID
+    </sql>
     <sql id="select">
-        SELECT <include refid="columns"/> FROM AMS_CONTRACT_TRANSPORT_PRICE
+        SELECT
+        <include refid="columns"/>
+        FROM AMS_CONTRACT_TRANSPORT_PRICE
     </sql>
     <sql id="select_alias">
-        SELECT <include refid="columns_alias"/> FROM AMS_CONTRACT_TRANSPORT_PRICE t
+        SELECT
+        <include refid="columns_alias"/>
+        FROM AMS_CONTRACT_TRANSPORT_PRICE t
     </sql>
     <sql id="where">
         <where>
@@ -81,6 +86,9 @@
             <if test="deleted != null">
                 and DELETED = #{deleted}
             </if>
+            <if test="addressId != null">
+                and ADDRESS_ID = #{addressId}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -130,12 +138,16 @@
             <if test="deleted != null">
                 and DELETED = #{deleted}
             </if>
+            <if test="addressId != null">
+                and ADDRESS_ID = #{addressId}
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from AMS_CONTRACT_TRANSPORT_PRICE
-    where PRICE_ID = #{priceId,jdbcType=DECIMAL}
-  </delete>
+        delete
+        from AMS_CONTRACT_TRANSPORT_PRICE
+        where PRICE_ID = #{priceId,jdbcType=DECIMAL}
+    </delete>
     <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
         delete from AMS_CONTRACT_TRANSPORT_PRICE
         where 1!=1
@@ -181,21 +193,25 @@
         <if test="deleted != null">
             or DELETED = #{deleted}
         </if>
+        <if test="addressId != null">
+            or ADDRESS_ID = #{addressId}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.AmsContractTransportPrice">
-    insert into AMS_CONTRACT_TRANSPORT_PRICE (PRICE_ID, SHIPPER_ID, CARRIER_ID,
-      LINE_ID, CAPACITY_ID, MATERIAL_ID,
-      PRICE_TON_KILOMETER, PRICE_VALUE, PRICE_DATE,
-      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-      UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
-      )
-    values (#{priceId,jdbcType=DECIMAL}, #{shipperId,jdbcType=DECIMAL}, #{carrierId,jdbcType=DECIMAL},
-      #{lineId,jdbcType=DECIMAL}, #{capacityId,jdbcType=DECIMAL}, #{materialId,jdbcType=CHAR},
-      #{priceTonKilometer,jdbcType=CHAR}, #{priceValue,jdbcType=DECIMAL}, #{priceDate,jdbcType=TIMESTAMP},
-      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
-      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}
-      )
-  </insert>
+        insert into AMS_CONTRACT_TRANSPORT_PRICE (PRICE_ID, SHIPPER_ID, CARRIER_ID,
+                                                  LINE_ID, CAPACITY_ID, MATERIAL_ID,
+                                                  PRICE_TON_KILOMETER, PRICE_VALUE, PRICE_DATE,
+                                                  INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+                                                  UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED,
+                                                  ADDRESS_ID)
+        values (#{priceId,jdbcType=DECIMAL}, #{shipperId,jdbcType=DECIMAL}, #{carrierId,jdbcType=DECIMAL},
+                #{lineId,jdbcType=DECIMAL}, #{capacityId,jdbcType=DECIMAL}, #{materialId,jdbcType=CHAR},
+                #{priceTonKilometer,jdbcType=DECIMAL}, #{priceValue,jdbcType=DECIMAL}, #{priceDate,jdbcType=TIMESTAMP},
+                #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
+                #{updateUsername,jdbcType=VARCHAR},
+                #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL},
+                #{addressId,jdbcType=DECIMAL})
+    </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsContractTransportPrice">
         insert into AMS_CONTRACT_TRANSPORT_PRICE
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -244,6 +260,9 @@
             <if test="deleted != null">
                 DELETED,
             </if>
+            <if test="addressId != null">
+                ADDRESS_ID,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="priceId != null">
@@ -265,7 +284,7 @@
                 #{materialId,jdbcType=CHAR},
             </if>
             <if test="priceTonKilometer != null">
-                #{priceTonKilometer,jdbcType=CHAR},
+                #{priceTonKilometer,jdbcType=DECIMAL},
             </if>
             <if test="priceValue != null">
                 #{priceValue,jdbcType=DECIMAL},
@@ -291,26 +310,30 @@
             <if test="deleted != null">
                 #{deleted,jdbcType=DECIMAL},
             </if>
+            <if test="addressId != null">
+                #{addressId,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsContractTransportPrice">
-    update AMS_CONTRACT_TRANSPORT_PRICE
-    set SHIPPER_ID = #{shipperId,jdbcType=DECIMAL},
-      CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
-      LINE_ID = #{lineId,jdbcType=DECIMAL},
-      CAPACITY_ID = #{capacityId,jdbcType=DECIMAL},
-      MATERIAL_ID = #{materialId,jdbcType=CHAR},
-      PRICE_TON_KILOMETER = #{priceTonKilometer,jdbcType=CHAR},
-      PRICE_VALUE = #{priceValue,jdbcType=DECIMAL},
-      PRICE_DATE = #{priceDate,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},
-      DELETED = #{deleted,jdbcType=DECIMAL}
-    where PRICE_ID = #{priceId,jdbcType=DECIMAL}
-  </update>
+        update AMS_CONTRACT_TRANSPORT_PRICE
+        set SHIPPER_ID           = #{shipperId,jdbcType=DECIMAL},
+            CARRIER_ID           = #{carrierId,jdbcType=DECIMAL},
+            LINE_ID              = #{lineId,jdbcType=DECIMAL},
+            CAPACITY_ID          = #{capacityId,jdbcType=DECIMAL},
+            MATERIAL_ID          = #{materialId,jdbcType=CHAR},
+            PRICE_TON_KILOMETER  = #{priceTonKilometer,jdbcType=DECIMAL},
+            PRICE_VALUE          = #{priceValue,jdbcType=DECIMAL},
+            PRICE_DATE           = #{priceDate,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},
+            DELETED              = #{deleted,jdbcType=DECIMAL},
+            ADDRESS_ID           = #{addressId,jdbcType=DECIMAL}
+        where PRICE_ID = #{priceId,jdbcType=DECIMAL}
+    </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsContractTransportPrice">
         update AMS_CONTRACT_TRANSPORT_PRICE
         <set>
@@ -330,7 +353,7 @@
                 MATERIAL_ID = #{materialId,jdbcType=CHAR},
             </if>
             <if test="priceTonKilometer != null">
-                PRICE_TON_KILOMETER = #{priceTonKilometer,jdbcType=CHAR},
+                PRICE_TON_KILOMETER = #{priceTonKilometer,jdbcType=DECIMAL},
             </if>
             <if test="priceValue != null">
                 PRICE_VALUE = #{priceValue,jdbcType=DECIMAL},
@@ -356,6 +379,9 @@
             <if test="deleted != null">
                 DELETED = #{deleted,jdbcType=DECIMAL},
             </if>
+            <if test="addressId != null">
+                ADDRESS_ID = #{addressId,jdbcType=DECIMAL},
+            </if>
         </set>
         where PRICE_ID = #{priceId,jdbcType=DECIMAL}
     </update>
@@ -379,16 +405,18 @@
         PRICE_VALUE, PRICE_DATE, INSERT_USERNAME,
         INSERT_TIME, UPDATE_USERNAME,
         UPDATE_TIME, INSERT_UPDATE_REMARK,
-        DELETED)
+        DELETED, ADDRESS_ID)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.priceId,jdbcType=DECIMAL},
         #{item.shipperId,jdbcType=DECIMAL}, #{item.carrierId,jdbcType=DECIMAL}, #{item.lineId,jdbcType=DECIMAL},
-        #{item.capacityId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=CHAR}, #{item.priceTonKilometer,jdbcType=CHAR},
-        #{item.priceValue,jdbcType=DECIMAL}, #{item.priceDate,jdbcType=TIMESTAMP}, #{item.insertUsername,jdbcType=VARCHAR},
+        #{item.capacityId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=CHAR},
+        #{item.priceTonKilometer,jdbcType=DECIMAL},
+        #{item.priceValue,jdbcType=DECIMAL}, #{item.priceDate,jdbcType=TIMESTAMP},
+        #{item.insertUsername,jdbcType=VARCHAR},
         #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
         #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
-        #{item.deleted,jdbcType=DECIMAL} from dual
+        #{item.deleted,jdbcType=DECIMAL}, #{item.addressId,jdbcType=DECIMAL} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -420,7 +448,7 @@
         </foreach>
         ,PRICE_TON_KILOMETER=
         <foreach collection="list" item="item" index="index" separator=" " open="case PRICE_ID" close="end">
-            when #{item.priceId,jdbcType=DECIMAL} then #{item.priceTonKilometer,jdbcType=CHAR}
+            when #{item.priceId,jdbcType=DECIMAL} then #{item.priceTonKilometer,jdbcType=DECIMAL}
         </foreach>
         ,PRICE_VALUE=
         <foreach collection="list" item="item" index="index" separator=" " open="case PRICE_ID" close="end">
@@ -454,6 +482,10 @@
         <foreach collection="list" item="item" index="index" separator=" " open="case PRICE_ID" close="end">
             when #{item.priceId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
         </foreach>
+        ,ADDRESS_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PRICE_ID" close="end">
+            when #{item.priceId,jdbcType=DECIMAL} then #{item.addressId,jdbcType=DECIMAL}
+        </foreach>
         where PRICE_ID in
         <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
             #{item.priceId,jdbcType=DECIMAL}
@@ -469,7 +501,8 @@
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
     <select id="selectMaxId" resultType="DECIMAL">
-        SELECT MAX(PRICE_ID)+1 FROM AMS_CONTRACT_TRANSPORT_PRICE
+        SELECT MAX(PRICE_ID) + 1
+        FROM AMS_CONTRACT_TRANSPORT_PRICE
     </select>
     <!-- 根据插入时间排序 -->
     <sql id="orderByInsertTime">
@@ -501,15 +534,15 @@
         )
         <where>
             <if test="priceValue!= null">
-                and actp.PRICE_VALUE in
+                and
                 <foreach collection="priceValue" item="item" open="(" separator="," close=")">
-                    #{item}
+                    "priceValue" in    #{item}
                 </foreach>
             </if>
             <if test="priceDate!= null">
-                and actp.PRICE_DATE in
+                and
                 <foreach collection="priceDate" item="item" open="(" separator="," close=")">
-                    to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+                    "priceDate" in   to_date('${item}','yyyy-mm-dd hh24:mi:ss')
                 </foreach>
             </if>
         </where>
@@ -518,58 +551,167 @@
 
     <!-- 得到修改渲染 -->
     <select id="selectPriceToUpdate" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT
-        actp.SHIPPER_ID as "shipperId",
-        actp.CARRIER_ID as "carrierId",
-        actp.LINE_ID as "lineId",
-        actp.CAPACITY_ID as "capacityId",
-        actp.MATERIAL_ID as "materialId",
-        actp.PRICE_TON_KILOMETER as "priceTonKilometer",
-        actp.PRICE_VALUE as "priceValue",
-        actp.PRICE_DATE as "priceDate"
+        SELECT actp.SHIPPER_ID          as "shipperId",
+               actp.CARRIER_ID          as "carrierId",
+               actp.LINE_ID             as "lineId",
+               actp.CAPACITY_ID         as "capacityId",
+               actp.MATERIAL_ID         as "materialId",
+               actp.PRICE_TON_KILOMETER as "priceTonKilometer",
+               actp.PRICE_VALUE         as "priceValue",
+               actp.PRICE_DATE          as "priceDate",
+               actp.ADDRESS_ID          as "addressId"
         FROM AMS_CONTRACT_TRANSPORT_PRICE actp
         WHERE actp.PRICE_ID = #{priceId}
     </select>
 
     <select id="getShipperId" resultType="java.util.Map">
-        SELECT
-        SHIPPER_ID "id",
-        SHIPPER_ID "value",
-        SHIPPER_NAME "label"
+        SELECT SHIPPER_ID   "id",
+               SHIPPER_ID   "value",
+               SHIPPER_NAME "label"
         FROM RMS_SHIPPER
         WHERE SHIPPER_ID = 1
     </select>
 
     <select id="getCarrierId" resultType="java.util.Map">
-        SELECT
-        CARRIER_ID "id",
-        CARRIER_ID "value",
-        CARRIER_NAME "label"
+        SELECT CARRIER_ID   "id",
+               CARRIER_ID   "value",
+               CARRIER_NAME "label"
         FROM RMS_CARRIER
     </select>
 
     <select id="getCapacityId" resultType="java.util.Map">
-        SELECT
-        CAPACITY_ID "id",
-        CAPACITY_ID "value",
-        CAPACITY_NUMBER "label"
+        SELECT CAPACITY_ID     "id",
+               CAPACITY_ID     "value",
+               CAPACITY_NUMBER "label"
         FROM RMS_CAPACITY
+        WHERE CAPACITY_TYPE_ID = 3
     </select>
 
-    <select id="getMaterialId" resultType="java.util.Map">
-        SELECT
-        MATERIAL_ID "id",
-        MATERIAL_ID "value",
-        MATERIAL_NAME "label"
-        FROM RMS_MATERIAL
-        WHERE MATERIAL_TYPE_ID = 1
+    <select id="getTruckCapacityId" resultType="java.util.Map">
+        SELECT CAPACITY_ID     "id",
+               CAPACITY_ID     "value",
+               CAPACITY_NUMBER "label"
+        FROM RMS_CAPACITY
+        WHERE CAPACITY_TYPE_ID = 1
+    </select>
+
+    <select id="getMaterialId" resultType="java.util.LinkedHashMap">
+        SELECT RM.MATERIAL_ID   "id",
+               RM.MATERIAL_ID   "value",
+               RM.MATERIAL_NAME "label"
+        FROM RMS_MATERIAL RM
+        WHERE RM.MATERIAL_TYPE_ID = 1
     </select>
 
     <select id="getLineId" resultType="java.util.Map">
-        SELECT
-        LINE_ID "id",
-        LINE_ID "value",
-        LINE_NO "label"
+        SELECT LINE_ID "id",
+               LINE_ID "value",
+               LINE_NO "label"
         FROM RMS_LINE
     </select>
+
+    <select id="getAmsContractTransportPrice" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
+        select * from(
+        select a_t_price.PRICE_ID "priceId",
+        a_t_price.INSERT_TIME as "insertTime",
+        rc.CARRIER_NAME as "carrierName",
+        rm.MATERIAL_NAME as "materialName",
+        r_line.LINE_NO "lineNo",
+        rca.CAPACITY_NUMBER as "capacityNumber",
+        a_t_price.PRICE_VALUE "priceValue",
+        a_t_price.PRICE_DATE "priceDate"
+        from AMS_CONTRACT_TRANSPORT_PRICE a_t_price
+        left join RMS_CARRIER rc
+        on rc.CARRIER_ID = a_t_price.CARRIER_ID
+        left join RMS_MATERIAL rm
+        on rm.MATERIAL_ID = a_t_price.MATERIAL_ID
+        left join RMS_LINE r_line
+        on a_t_price.LINE_ID=r_line.LINE_ID
+        left join RMS_CAPACITY rca
+        on rca.CAPACITY_ID = a_t_price.CAPACITY_ID
+        where a_t_price.DELETED = 0
+        and rca.CAPACITY_TYPE_ID = 1
+        )
+        <where>
+            <if test="carrierName != null">
+                and
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                    "carrierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="lineNo != null">
+                and
+                <foreach collection="lineNo" item="item" open="(" separator="or" close=")">
+                    "lineNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="priceValue != null">
+                and
+                <foreach collection="priceValue" item="item" open="(" separator="or" close=")">
+                    "priceValue" like '%${item}%'
+                </foreach>
+            </if>
+
+            <if test="priceDate != null">
+                and
+                <foreach collection="priceDate" item="item" open="(" separator="or" close=")">
+                    "priceDate" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderByInsertTime"></include>
+    </select>
+
+    <select id="getAddressDeliveryAddress" resultType="java.util.LinkedHashMap">
+        select ADDRESS_ID               "id",
+               ADDRESS_ID               "value",
+               ADDRESS_DELIVERY_ADDRESS "label"
+        from RMS_RECEIVE_ADDRESS
+    </select>
+
+    <select id="selectByPriceId" parameterType="java.math.BigDecimal" resultType="java.util.LinkedHashMap">
+        select a_t_price.SHIPPER_ID  "shipperId",
+               a_t_price.CARRIER_ID  "carrierId",
+               a_t_price.LINE_ID     "lineId",
+               a_t_price.CAPACITY_ID "capacityId",
+               a_t_price.MATERIAL_ID "materialId",
+               a_t_price.ADDRESS_ID  "addressId",
+               a_t_price.PRICE_VALUE "priceValue",
+               a_t_price.PRICE_DATE  "priceDate"
+        from AMS_CONTRACT_TRANSPORT_PRICE a_t_price
+        where a_t_price.PRICE_ID = #{priceId}
+    </select>
+
+    <select id="getOriginAndNowOilPrice" resultType="java.util.LinkedHashMap">
+        select rownum                "rownum",
+               r_o_price.PRICE_VALUE "priceValue"
+        from RMS_OIL_PRICE r_o_price
+        where r_o_price.PRICE_OIL_NAME = '0号柴油'
+        order by r_o_price.PRICE_DATE desc
+    </select>
+
+    <update id="batchUpdateTransportPriceByOilPrice" parameterType="double">
+        update AMS_CONTRACT_TRANSPORT_PRICE
+        set PRICE_VALUE = ROUND(PRICE_VALUE * 0.65 + PRICE_VALUE * 0.35 * (1 + #{updateOilPrice}), 2)
+    </update>
+
+
+    <select id="getPriceValueAndPriceTonKilometer" resultType="java.util.LinkedHashMap">
+        select a_t_price.PRICE_ID            "priceId",
+               a_t_price.PRICE_VALUE         "priceValue",
+               a_t_price.PRICE_TON_KILOMETER "priceTonKilometer"
+        from AMS_CONTRACT_TRANSPORT_PRICE a_t_price
+    </select>
 </mapper>

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

@@ -521,69 +521,69 @@
     )
     <where>
       <if test="purchaseOrderNo!= null">
-        and apo.PURCHASE_ORDER_NO in
+        and
         <foreach collection="purchaseOrderNo" item="item" open="(" separator="," close=")">
-          #{item}
+          "purchaseOrderNo" in  #{item}
         </foreach>
       </if>
       <if test="purchaseOrderDate!= null">
-        and apo.PURCHASE_ORDER_DATE in
+        and
         <foreach collection="purchaseOrderDate" item="item" open="(" separator="," close=")">
-          to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+          "purchaseOrderDate" in  to_date('${item}','yyyy-mm-dd hh24:mi:ss')
         </foreach>
       </if>
       <if test="materialName!= null">
-        and rm.MATERIAL_NAME in
+        and
         <foreach collection="materialName" item="item" open="(" separator="," close=")">
-          #{item}
+          "materialName" in  #{item}
         </foreach>
       </if>
       <if test="resultForeignShipName!= null">
-        and db.RESULT_FOREIGN_SHIP_NAME in
+        and
         <foreach collection="resultForeignShipName" item="item" open="(" separator="," close=")">
-          #{item}
+          "resultForeignShipName" in  #{item}
         </foreach>
       </if>
       <if test="supplierName!= null">
-        and rsu.SUPPLIER_NAME in
+        and
         <foreach collection="supplierName" item="item" open="(" separator="," close=")">
-          #{item}
+          "supplierName" in  #{item}
         </foreach>
       </if>
       <if test="buyerName!= null">
-        and rsb.SHIPPER_NAME in
+        and
         <foreach collection="buyerName" item="item" open="(" separator="," close=")">
-          #{item}
+          "buyerName" in  #{item}
         </foreach>
       </if>
       <if test="purchaseOrderBuyer!= null">
-        and apo.PURCHASE_ORDER_BUYER in
+        and
         <foreach collection="purchaseOrderBuyer" item="item" open="(" separator="," close=")">
-          #{item}
+          "purchaseOrderBuyer" in  #{item}
         </foreach>
       </if>
       <if test="purChaseOrderMaterialNumber!= null">
-        and apo.PUCHASE_ORDER_MATERIAL_NUMBER in
+        and
         <foreach collection="purChaseOrderMaterialNumber" item="item" open="(" separator="," close=")">
-          #{item}
+          "purChaseOrderMaterialNumber" in  #{item}
         </foreach>
       </if>
       <if test="receiverName!= null">
-        and rsr.SHIPPER_NAME in
+        and
         <foreach collection="receiverName" item="item" open="(" separator="," close=")">
-          #{item}
+          "receiverName" in  #{item}
         </foreach>
       </if>
       <if test="purchaseOrderDeliveryDate!= null">
-        and apo.PUCHASE_ORDER_DELIVERY_DATE in
+        and
         <foreach collection="purchaseOrderDeliveryDate" item="item" open="(" separator="," close=")">
-          to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+          "purchaseOrderDeliveryDate" in  to_date('${item}','yyyy-mm-dd hh24:mi:ss')
         </foreach>
       </if>
       <if test="insertUpdateRemark!= null">
-        and apo.INSERT_UPDATE_REMARK in
+        and
         <foreach collection="insertUpdateRemark" item="item" open="(" separator="," close=")">
-          #{item}
+          "insertUpdateRemark" in  #{item}
         </foreach>
       </if>
     </where>