Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -434,6 +434,42 @@ public class AMScontroller{
         return amsFeign.getAmsContractTransportPrice1(mapValue, pageNum, pageSize, apiId, con,deleted);
     }
 
+    @PostMapping("/deleteSalelPrice")
+    @ApiOperation(value = "删除单价")
+    public Map<String,Object> deleteSalelPrice(@RequestBody(required=false) Map<String,Object> mapValue){
+        return amsFeign.deleteSalelPrice(mapValue);
+    }
+
+    @PostMapping("/getCarrierListByPrice")
+    @ApiOperation(value = "获取所有承运商")
+    public Map<String,Object> getCarrierListByPrice(@RequestBody(required=false) Map<String,Object> mapValue){
+        return amsFeign.getCarrierListByPrice(mapValue);
+    }
+
+    @PostMapping("/updatePriceValue")
+    @ApiOperation(value = "更新单价")
+    public Map<String,Object> updatePriceValue(@RequestBody(required=false) Map<String,Object> mapValue){
+        return amsFeign.updatePriceValue(mapValue);
+    }
+
+    @PostMapping("/updateaddressDeliveryAddress")
+    @ApiOperation(value = "更新卸货地址")
+    public Map<String,Object> updateaddressDeliveryAddress(@RequestBody(required=false) Map<String,Object> mapValue){
+        return amsFeign.updateaddressDeliveryAddress(mapValue);
+    }
+
+    @PostMapping("/getCarrierListByAddress")
+    @ApiOperation(value = "获取数据")
+    public Map<String,Object> getCarrierListByAddress(@RequestBody(required=false) Map<String,Object> mapValue){
+        return amsFeign.getCarrierListByAddress(mapValue);
+    }
+
+    @PostMapping("/updateCarrierName")
+    @ApiOperation(value = "批量更新或者新增承运商")
+    public Map<String,Object> updateCarrierName(@RequestBody(required=false) Map<String,Object> mapValue){
+        return amsFeign.updateCarrierName(mapValue);
+    }
+
     @PostMapping("/getAmsContractTransportPriceForDetail")
     @ApiOperation(value = "查询汽运单价信息(计费详单专用)")
     public Map<String, Object> getAmsContractTransportPriceForDetail(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -1718,6 +1754,16 @@ public class AMScontroller{
         return amsFeign.updateNoticeStatus(map);
     }
 
+    @PostMapping(value = "/getNoticeAll", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> getNoticeAll(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.getNoticeAll(map);
+    }
+
+    @PostMapping(value = "/readAll", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> readAll(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.readAll(map);
+    }
+
     @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
     @PostMapping(value = "/deleteNotice/{id}")//BigDecimal

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

@@ -4,6 +4,7 @@ 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 io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -341,6 +342,24 @@ public interface AmsFeign {
 
     );
 
+    @PostMapping("/api/v1/ams/amscontracttruckprices/deleteSalelPrice")
+    Map<String,Object> deleteSalelPrice(@RequestBody(required=false) Map<String,Object> mapValue);
+
+    @PostMapping("/api/v1/ams/amscontracttruckprices/getCarrierListByPrice")
+    Map<String,Object> getCarrierListByPrice(@RequestBody(required=false) Map<String,Object> mapValue);
+
+    @PostMapping("/api/v1/ams/amscontracttruckprices/updatePriceValue")
+    Map<String,Object> updatePriceValue(@RequestBody(required = false) Map<String,Object> mapValue);
+
+    @PostMapping("/api/v1/ams/amscontracttruckprices/getCarrierListByAddress")
+    Map<String,Object> getCarrierListByAddress(@RequestBody(required = false) Map<String,Object> mapValue);
+
+    @PostMapping("/api/v1/ams/amscontracttruckprices/updateCarrierName")
+    Map<String,Object> updateCarrierName(@RequestBody(required = false) Map<String,Object> mapValue);
+
+    @PostMapping("/api/v1/ams/amscontracttruckprices/updateaddressDeliveryAddress")
+    Map<String,Object> updateaddressDeliveryAddress(@RequestBody(required = false) Map<String,Object> mapValue);
+
     @ApiOperation(value="查询汽运单价信息（计费详单专用）")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId(519)", value = "表头", required = false, dataType = "Interger")
@@ -1514,6 +1533,12 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/dilnotices/updateNoticeStatus")
     Map<String, Object> updateNoticeStatus(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/ams/dilnotices/getNoticeAll")
+    Map<String, Object> getNoticeAll(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/dilnotices/readAll")
+    Map<String, Object> readAll(@RequestBody(required = false) Map<String, Object> map);
+
     //根据id获取公告
     @PostMapping(value = "api/v1/ams/dilnotices/getNoticeById/{id}")
     Map<String, Object> getNoticeById(@PathVariable("id") BigDecimal id);

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

@@ -483,7 +483,7 @@
         RC.CONSIGNEE_ID "consigneeId",
         RC.CONSIGNEE_COMPANY_NAME "value",
         RC.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
-        from   RMS_CONSIGNEE   RC
+        from  RMS_CONSIGNEE RC
         where instr(RC.CONSIGNEE_COMPANY_NAME, #{index}) > 0 and rownum < 10
         order by "value"
     </select>