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

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

@@ -74,10 +74,112 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
         }
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsContractTransportPrice1 = amsContractTruckPriceService.getAmsContractTransportPrice(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsContractTransportPrice1);
+        //PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsContractTransportPrice1);
+        List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
+        int i=0;
+        for (Map<String, Object> columnData : columnDataList) {
+            //每个表头字段的过滤条件
+            if(columnData.get("isFilter") == null || DataChange.dataToBigDecimal(columnData.get("isFilter")).intValue() == 1) {
+                columnData.put("filters", setListMap(amsContractTransportPrice1, columnData.get("prop").toString()));
+                if (i==0){
+                    columnData.put("min-width",62);
+                }else if (i==1){
+                    columnData.put("min-width",69);
+                }else if (i==3){
+                    columnData.put("min-width",130);
+                }else if (i==4){
+                    columnData.put("min-width",138);
+                }else if (i==5){
+                    columnData.put("min-width",82);
+                }else if (i==6){
+                    columnData.put("min-width",154);
+                }else if (i==7){
+                    columnData.put("min-width",324);
+                }
+                i++;
+            }
+        }
+        PageListAdd pageList = new PageListAdd(amsContractTransportPrice1);
+        pageList.setColumnData(columnDataList);
         return success(pageList);
     }
 
+    @ApiOperation(value="删除单价信息")
+    @PostMapping("/deleteSalelPrice")
+    public RESTfulResult deleteSalelPrice(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = amsContractTruckPriceService.deleteSalePrice(mapValue);
+        if (i>0){
+            return success("删除成功");
+        }else{
+            return failed("删除失败");
+        }
+    }
+
+    @ApiModelProperty(value = "更新卸货地址")
+    @PostMapping("/updateaddressDeliveryAddress")
+    public RESTfulResult updateaddressDeliveryAddress(@RequestBody(required = false) Map<String,Object> mapValue) {
+        int i = amsContractTruckPriceService.updateaddressDeliveryAddress(mapValue);
+        if (i>0){
+            return success("更新卸货地址成功");
+        }else {
+            return failed("更新卸货地址失败");
+        }
+    }
+
+    @ApiModelProperty(value = "更新单价")
+    @PostMapping("/updatePriceValue")
+    public RESTfulResult updatePriceValue(@RequestBody(required = false) Map<String,Object> mapValue) {
+        int i = amsContractTruckPriceService.updatePriceValue(mapValue);
+        if (i>0){
+            return success("更新单价成功");
+        }else {
+            return failed("更新单价失败");
+        }
+    }
+
+    @ApiModelProperty(value = "查询承运商")
+    @PostMapping("/getCarrierListByAddress")
+    public RESTfulResult getCarrierListByAddress(@RequestBody(required = false) Map<String,Object> mapValue){
+        List<Map<String, Object>> carrierListByAddress = amsContractTruckPriceService.getCarrierListByAddress(mapValue);
+        return success(carrierListByAddress);
+    }
+
+    @ApiModelProperty(value = "修改承运商")
+    @PostMapping("/updateCarrierName")
+    public RESTfulResult updateCarrierName(@RequestBody(required = false) Map<String,Object> mapValue) throws ParseException {
+        int i = amsContractTruckPriceService.updateCarrierName(mapValue);
+        if (i>0){
+            return success("修改承运商成功");
+        }else {
+            return failed("修改承运商失败");
+        }
+    }
+
+    @ApiModelProperty(value = "模糊查询承运商")
+    @PostMapping("/getCarrierListByPrice")
+    public RESTfulResult getCarrierListByPrice(@RequestBody(required = false) Map<String,Object> mapValue) {
+        String index = (String) mapValue.get("index");
+        if(index != null){
+            if(index.length() == 0){
+                index = null;
+            }else {
+                index = "%" + index + "%";
+            }
+        }
+        mapValue.put("index",index);
+        /*Integer pageNum = (Integer) mapValue.get("pageNum");
+        Integer pageSize = (Integer) mapValue.get("pageSize");
+        if (pageNum==null){
+            mapValue.put("pageNum",1);
+        }
+        if (pageSize==null){
+            mapValue.put("pageSize",10);
+        }*/
+        List<Map<String, Object>> carrierListByPrice = amsContractTruckPriceService.getCarrierListByPrice(mapValue);
+        return success(carrierListByPrice);
+    }
+
+
     @ApiOperation(value="查询汽运单价信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId(519)", value = "表头", required = false, dataType = "Interger")

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

@@ -199,6 +199,12 @@ public class DilNoticeController extends BaseRESTfulController {
         return success(result);
     }
 
+    @PostMapping(value = "/readAll")
+    public RESTfulResult readAll(@RequestBody(required = false) Map<String, Object> map){
+        int result = dilNoticeService.readAll(map);
+        return success(result);
+    }
+
     /**
      * 根据id删除通知信息
      * @param id
@@ -298,5 +304,21 @@ public class DilNoticeController extends BaseRESTfulController {
         //return null;
     }
 
+    /**
+     * @author:zyf
+     * @version:2.0
+     * @Date:2022-10-14
+     * @Description:获取通知数据
+     */
+    @ApiOperation(value = "查询通知信息", notes = "根据传过来的orgcode查询")
+    @PostMapping(value = "/getNoticeAll")
+    public RESTfulResult getNoticeAll(@RequestBody(required = false) Map<String, Object> mapValue){
+        if (mapValue==null ||mapValue.get("userId")==null){
+            return failed();
+        }
+        List<Map<String, Object>> noticeData = dilNoticeService.getNoticeAll(mapValue);
+        return success(noticeData);
+    }
+
 
 }

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

@@ -20,8 +20,30 @@ public interface AmsContractTruckPriceMapper extends IBaseMapper<AmsContractTran
     BigDecimal selectPriceMaterialMaxId();
     //获取汽运单价信息
     List<Map<String, Object>> getAmsContractTransportPrice(Map<String,Object> map);
+    //删除单价
+    int deleteSalePrice(Map<String,Object> map);
+    //获取全部承运商信息
+    List<Map<String,Object>> getCarrierListByPrice(Map<String,Object> map);
+    //获取全部承运商信息(根据单价地址获得的具体的承运商)
+    List<Map<String,Object>> getCarrierListByAddress(Map<String,Object> map);
+    //获取全部承运商信息(根据单价地址获得的具体的承运商)
+    List<Map<String,Object>> getCarrierListByAddressNew(Integer addressId,String addressDeliveryAddress);
+    //新增是刷新旧数据
+    int updateOldDate(Map<String,Object> map);
+    //删除单价信息
+    int deleteSomeOneSalePrice(Map<String,Object> map);
+    //修改单价信息
+    int updateSomeOneSalePrice(Map<String,Object> map);
+    //更新卸货地址
+    int updateaddressDeliveryAddress(Map<String,Object> map);
+    //更新单价
+    int updatePriceValue(Map<String,Object> map);
+    //更新单价
+    int updateHaulDistance(Map<String,Object> map);
     //获取承运商信息
     String getCarrierNameForDetail(String userId);
+    //获取已经计算出的单价值
+    AmsContractTransportPrice getOnePriceMap(Map<String,Object> map);
     //获取汽运单价信息
     List<Map<String, Object>> getAmsContractTransportPriceForDetail(Map<String,Object> map);
     //获取承运商名称

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

@@ -156,4 +156,12 @@ public interface DilNoticeMapper extends IBaseMapper<DilNotice, BigDecimal> {
      * @Description:修改数据
     */
     int modifyData(DilNotice dilNotice);
+
+    List<Map<String, Object>> getNoticeAll(Map<String, Object> mapValue);
+
+    /**
+     * 已读所有通知,针对特定插入用户
+     * @return
+     */
+    int readAll(Map<String, Object> map);
 }

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

@@ -25,6 +25,18 @@ public interface IAmsContractTruckPriceService {
     int addAmsContractTransportPrice(Map<String,Object> mapValue);
     //获取汽运单价信息
     List<Map<String, Object>> getAmsContractTransportPrice(Map<String,Object> map);
+    //删除单价
+    int deleteSalePrice(Map<String,Object> map);
+    // 所有承运商
+    List<Map<String, Object>> getCarrierListByPrice(Map<String,Object> map);
+    //查询
+    int updateCarrierName(Map<String,Object> map) throws ParseException;
+    //跟据地址获取到的承运商
+    List<Map<String, Object>> getCarrierListByAddress(Map<String,Object> map);
+    //更新卸货地址
+    int updateaddressDeliveryAddress(Map<String,Object> map);
+    //更新卸货地址
+    int updatePriceValue(Map<String,Object> map);
     //获取汽运单价信息(计费详单专用)
     List<Map<String, Object>> getAmsContractTransportPriceForDetail(Map<String,Object> map);
     //获取承运商

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

@@ -47,6 +47,10 @@ public interface IDilNoticeService {
 
     public List<Map<String,Object>> getNoticeData(String orgcode);
 
+    List<Map<String,Object>> getNoticeAll(Map<String, Object> mapValue);
+
+    int readAll(Map<String,Object> map);
+
 /*    List<Map<String,Object>> getCapacityTypeId();
 
     List<Map<String,Object>> getCarrierId();*/

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

@@ -7,11 +7,14 @@ import com.steerinfo.dil.model.AmsContractTransportPrice;
 import com.steerinfo.dil.model.RmsReceivePlace;
 import com.steerinfo.dil.service.IAmsContractTransportPriceService;
 import com.steerinfo.dil.util.DataChange;
+import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -85,6 +88,7 @@ public class AmsContractTransportPriceServiceImpl implements IAmsContractTranspo
 //        BigDecimal carrierId = DataChange.dataToBigDecimal(mapValue.get("carrierId"));
         String carrierId = mapValue.get("carrierId").toString().replace("[","").replace("]","").replace(" ","");
         String[] split = carrierId.split(",");
+        Date date1=new Date();
         if (split.length>1) {
             for (int i = 0; i < split.length; i++) {
                 BigDecimal addressId = DataChange.dataToBigDecimal(mapValue.get("addressId"));
@@ -133,7 +137,7 @@ public class AmsContractTransportPriceServiceImpl implements IAmsContractTranspo
                 }
                 amsContractTransportPrice.setType(new BigDecimal(1));
                 amsContractTransportPrice.setInsertUsername("admin");
-                amsContractTransportPrice.setInsertTime(new Date());
+                amsContractTransportPrice.setInsertTime(date1);
                 amsContractTransportPrice.setUpdateUsername("admin");
                 amsContractTransportPrice.setUpdateTime(new Date());
                 amsContractTransportPrice.setInsertUpdateRemark("无");
@@ -189,7 +193,7 @@ public class AmsContractTransportPriceServiceImpl implements IAmsContractTranspo
             }
             amsContractTransportPrice.setType(new BigDecimal(1));
             amsContractTransportPrice.setInsertUsername("admin");
-            amsContractTransportPrice.setInsertTime(new Date());
+            amsContractTransportPrice.setInsertTime(date1);
             amsContractTransportPrice.setUpdateUsername("admin");
             amsContractTransportPrice.setUpdateTime(new Date());
             amsContractTransportPrice.setInsertUpdateRemark("无");

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

@@ -139,6 +139,107 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
         return amsContractTruckPriceMapper.getAmsContractTransportPrice(map);
     }
 
+    @Override
+    public int deleteSalePrice(Map<String, Object> map) {
+        return amsContractTruckPriceMapper.deleteSalePrice(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> getCarrierListByPrice(Map<String,Object> map) {
+        return amsContractTruckPriceMapper.getCarrierListByPrice(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> getCarrierListByAddress(Map<String,Object> map) {
+        return amsContractTruckPriceMapper.getCarrierListByAddress(map);
+    }
+
+    @Override
+    public int updateCarrierName(Map<String, Object> map) throws ParseException {
+        String carrierIdArray = map.get("carrierIdArray").toString().replace("[","").replace("]","").replace(" ","");
+        String[] split = carrierIdArray.split(",");
+        //修改地址
+        amsContractTruckPriceMapper.updateaddressDeliveryAddress(map);
+        //修改运价
+        amsContractTruckPriceMapper.updatePriceValue(map);
+        //修改运输距离
+        amsContractTruckPriceMapper.updateHaulDistance(map);
+        //根据地址查询出单价表大部分值
+        AmsContractTransportPrice amsContractTransportPrice = amsContractTruckPriceMapper.getOnePriceMap(map);
+        //修改的时间
+        Date date=new Date();
+        int result=0;
+        //根据地址查询出承运商ID
+        List<Map<String, Object>> carrierListByAddress = amsContractTruckPriceMapper.getCarrierListByAddress(map);
+        //判断传过来的承运商是否有值
+        if(carrierIdArray.equals("")){
+            //删除所有的单价
+            amsContractTruckPriceMapper.deleteSalePrice(map);
+            //获取主键
+            amsContractTransportPrice.setPriceId(amsContractTruckPriceMapper.selectMaxId());
+            amsContractTransportPrice.setInsertTime(date);
+            if (map.get("priceDate")!=null){
+                amsContractTransportPrice.setPriceDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse((String) map.get("priceDate")));
+            }else {
+                amsContractTransportPrice.setPriceDate(date);
+            }
+            result+=amsContractTruckPriceMapper.insertSelective(amsContractTransportPrice);
+        }else if (!(carrierIdArray.equals(""))){
+            amsContractTruckPriceMapper.deleteSalePrice(map);
+            //判断查询出来的承运商ID是否存在于更改的承运商ID中
+            /*for (Map<String, Object> listByAddress : carrierListByAddress) {
+                BigDecimal carrierId = (BigDecimal) listByAddress.get("carrierId");
+                int flag=0;
+                for(int j=0;j<split.length;j++){
+                    if (carrierId.compareTo(DataChange.dataToBigDecimal(split[j]))==0){
+                        flag+=1;
+                        //修改时间
+                        Map<String,Object> map2=map;
+                        if (map.get("priceDate")!=null){
+                            map2.put("priceDate",map.get("priceDate"));
+                        }
+                        SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+                        map2.put("insertTime",simpleDateFormat.format(date));
+                        map2.put("carrierId",split[j]);
+                        amsContractTruckPriceMapper.updateSomeOneSalePrice(map2);
+                        //删除数据
+                        carrierIdArray.split(split[j]);
+                        break;
+                    }
+                }
+                if (flag==0){
+                    //就把单价表中该单价删掉
+                    Map<String,Object> map1=map;
+                    map1.put("carrierId",carrierId);
+                    amsContractTruckPriceMapper.deleteSomeOneSalePrice(map1);
+                }
+            }*/
+            for (int i = 0; i < split.length; i++) {
+                //获取主键
+                amsContractTransportPrice.setPriceId(amsContractTruckPriceMapper.selectMaxId());
+                amsContractTransportPrice.setCarrierId(DataChange.dataToBigDecimal(split[i]));
+                amsContractTransportPrice.setInsertTime(date);
+//                SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
+//                SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//                Date datenew = sdf1.parse((String) map.get("priceDate"));
+//                String format = sdf2.format(datenew);
+                amsContractTransportPrice.setPriceDate(new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").parse((String) map.get("priceDate")));
+                result+=amsContractTruckPriceMapper.insertSelective(amsContractTransportPrice);
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public int updateaddressDeliveryAddress(Map<String,Object> map) {
+        return amsContractTruckPriceMapper.updateaddressDeliveryAddress(map);
+    }
+
+    @Override
+    public int updatePriceValue(Map<String,Object> map) {
+        return amsContractTruckPriceMapper.updatePriceValue(map);
+    }
+
     @Override
     public List<Map<String, Object>> getAmsContractTransportPriceForDetail(Map<String, Object> map) {
         //amsContractTruckPriceMapper.getAmsContractTransportPriceForDetail(map);

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

@@ -321,7 +321,13 @@ public class DilNoticeServiceImpl  implements IDilNoticeService {
     }
 */
 
+    @Override
+    public List<Map<String, Object>> getNoticeAll(Map<String, Object> mapValue) {
+        return dilNoticeMapper.getNoticeAll(mapValue);
+    }
 
-
-
+    @Override
+    public int readAll(Map<String, Object> map) {
+        return dilNoticeMapper.readAll(map);
+    }
 }

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

@@ -760,13 +760,48 @@
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 
   <select id="getAmsContractTransportPrice" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
-    select * from(
-    select a_t_price.PRICE_ID "priceId",
+    select p0.* from(
+    select distinct
     r_r_address.ADDRESS_PROVINCE "addressProvince",
     r_r_address.ADDRESS_DISTRICT "addressDistrict",
     r_r_address.ADDRESS_TOWN "addressTown",
-    rrp.ADDRESS_DELIVERY_ADDRESS "addressDeliveryAddress",
-    r_carrier.CARRIER_NAME "carrierName",
+    r_r_place.ADDRESS_DELIVERY_ADDRESS "addressDeliveryAddress",
+    case
+        when (SELECT COUNT(P."carrierName") FROM(select DISTINCT RC.CARRIER_NAME "carrierName"
+    from RMS_RECEIVE_PLACE RRP
+    LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+    ON RRA.ADDRESS_ID = RRP.ADDRESS_ID
+    LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
+    ON ACTP.PLACE_ID = RRP.PLACE_ID
+    LEFT JOIN RMS_CARRIER RC
+    ON RC.CARRIER_ID = ACTP.CARRIER_ID
+    WHERE RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
+    RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS =
+    r_r_address.ADDRESS_PROVINCE || r_r_address.ADDRESS_DISTRICT ||
+    r_r_address.ADDRESS_TOWN || r_r_place.ADDRESS_DELIVERY_ADDRESS
+    AND ACTP.PRICE_ID IS NOT NULL
+    AND ACTP.DELETED = 0
+    AND ACTP.TYPE = 1
+    AND ACTP.ISSTANDARD is null)P) >1
+    THEN (SELECT LISTAGG(P."carrierName",',') FROM(select DISTINCT RC.CARRIER_NAME "carrierName"
+    from RMS_RECEIVE_PLACE RRP
+    LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+    ON RRA.ADDRESS_ID = RRP.ADDRESS_ID
+    LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
+    ON ACTP.PLACE_ID = RRP.PLACE_ID
+    LEFT JOIN RMS_CARRIER RC
+    ON RC.CARRIER_ID = ACTP.CARRIER_ID
+    WHERE RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
+    RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS =
+    r_r_address.ADDRESS_PROVINCE || r_r_address.ADDRESS_DISTRICT ||
+    r_r_address.ADDRESS_TOWN || r_r_place.ADDRESS_DELIVERY_ADDRESS
+    AND ACTP.PRICE_ID IS NOT NULL
+    AND ACTP.DELETED = 0
+    AND ACTP.TYPE = 1
+    AND ACTP.ISSTANDARD is null)P)
+    else r_carrier.CARRIER_NAME
+    end
+    "carrierName",
     r_line.LINE_PATH_LENGTH "linePathLength",
     r_o_type.OIL_TYPE_NAME "oilTypeName",
     r_c_type.CAPACITY_TYPE_NAME "capacityTypeName",
@@ -777,12 +812,13 @@
     a_t_price.INSERT_TIME "insertTime",
     rs.SHIPPER_NAME "shipperName",
     a_t_price.OILPRICE_CHANGE_THRESHOLD "oilpriceChangeThreshold",
-    a_t_price.haul_distance "haulDistance"
+    a_t_price.haul_distance "haulDistance",
+    r_r_place.place_id "placeId"
     from AMS_CONTRACT_TRANSPORT_PRICE a_t_price
-    left join RMS_RECEIVE_PLACE rrp
-    on a_t_price.PLACE_ID=rrp.PLACE_ID
+    left join RMS_RECEIVE_PLACE r_r_place
+    on a_t_price.PLACE_ID=r_r_place.PLACE_ID
     left join RMS_RECEIVE_ADDRESS r_r_address
-    on rrp.ADDRESS_ID = r_r_address.ADDRESS_ID
+    on r_r_place.ADDRESS_ID = r_r_address.ADDRESS_ID
     left join RMS_CAPACITY_TYPE r_c_type
     on a_t_price.CAPACITY_TYPE_ID=r_c_type.CAPACITY_TYPE_ID
     left join RMS_CARRIER r_carrier
@@ -793,8 +829,6 @@
     on a_t_price.OIL_TYPE_ID = r_o_type.OIL_TYPE_ID
     left join RMS_SHIPPER rs
     on rs.SHIPPER_ID = a_t_price.SHIPPER_ID
---     where a_t_price.DELETED = 0
---     and a_t_price.TYPE = 1 and a_t_price.DEPARTMENT = 2
     <where>
         TYPE=1
         and a_t_price.ISSTANDARD is null
@@ -804,11 +838,11 @@
         <if test="con !=null and con != ''.toString()">
           and
           r_r_address.ADDRESS_PROVINCE || r_r_address.ADDRESS_DISTRICT  || r_r_address.ADDRESS_TOWN
-          || rrp.ADDRESS_DELIVERY_ADDRESS ||  r_carrier.CARRIER_NAME || r_c_type.CAPACITY_TYPE_NAME
+          || r_r_place.ADDRESS_DELIVERY_ADDRESS ||  r_carrier.CARRIER_NAME || r_c_type.CAPACITY_TYPE_NAME
           like CONCAT('%',CONCAT(#{con},'%'))
         </if>
     </where>
-        )
+        )p0
 
     <where>
       <if test="addressProvince != null">
@@ -885,6 +919,57 @@
     </if>
   </select>
 
+  <!--删除单价-->
+  <delete id="deleteSalePrice">
+    DELETE AMS_CONTRACT_TRANSPORT_PRICE ACTP
+    where ACTP.PRICE_ID IN(
+    select
+    ACTP.PRICE_ID from RMS_RECEIVE_PLACE RRP
+    LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+    ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
+    LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
+    ON ACTP.PLACE_ID=RRP.PLACE_ID
+    LEFT JOIN RMS_CARRIER RC
+    ON RC.CARRIER_ID=ACTP.CARRIER_ID
+    WHERE RRA.ADDRESS_PROVINCE||RRA.ADDRESS_DISTRICT||RRA.ADDRESS_TOWN||
+    RRP.ADDRESS_DELIVERY_ADDRESS = #{addressProvince}||#{addressDistrict}||#{addressTown}||#{addressDeliveryAddress}
+    AND ACTP.PRICE_ID IS NOT NULL
+    AND ACTP.DELETED=0
+    AND ACTP.TYPE=1
+    AND ACTP.ISSTANDARD is null)
+  </delete>
+
+  <!--查询出其中的值-->
+  <select id="getOnePriceMap" resultType="com.steerinfo.dil.model.AmsContractTransportPrice">
+    select
+      ACTP.SHIPPER_ID "shipperId",
+      ACTP.CAPACITY_TYPE_ID "capacityTypeId",
+      ACTP.CARGONAME_ID "cargonameId",
+      ACTP.PRICE_TON_KILOMETER "priceTonKilometer",
+      ACTP.PRICE_VALUE "priceValue",
+      ACTP.INSERT_USERNAME "insertUsername",
+      ACTP.DELETED "deleted",
+      ACTP.HAUL_DISTANCE "haulDistance",
+      ACTP.OLD_DATE "oldDate",
+      ACTP.OILPRICE_CHANGE_THRESHOLD "oilpriceChangeThreshold",
+      ACTP.OILPRICE_BASE "oilpriceBase",
+      ACTP.OIL_TYPE_ID "oilTypeId",
+      ACTP.TYPE "type",
+      ACTP.PLACE_ID "placeId",
+      ACTP.DELETED "deleted"
+    from RMS_RECEIVE_PLACE RRP
+                           LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                                     ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
+                           LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
+                                     ON ACTP.PLACE_ID=RRP.PLACE_ID
+                           LEFT JOIN RMS_CARRIER RC
+                                     ON RC.CARRIER_ID=ACTP.CARRIER_ID
+    WHERE RRA.ADDRESS_PROVINCE||RRA.ADDRESS_DISTRICT||RRA.ADDRESS_TOWN||
+          RRP.ADDRESS_DELIVERY_ADDRESS = #{addressProvince}||#{addressDistrict}||#{addressTown}||#{addressDeliveryAddress}
+          and rownum=1
+         order by ACTP.PRICE_ID DESC
+  </select>
+
   <!--获取承运商名字-->
   <select id="getCarrierNameForDetail" resultType="java.lang.String">
     select SU.USER_NAME from
@@ -892,6 +977,132 @@
     WHERE SU.USER_ID=#{userId}
   </select>
 
+  <!--获取全部承运商的信息-->
+  <select id="getCarrierListByPrice" resultType="java.util.LinkedHashMap">
+    select p0.*,(SELECT COUNT(*) "total" FROM RMS_CARRIER RC) "total" from (select RC.CARRIER_NAME "carrierName",RC.CARRIER_ID "carrierId",ROWNUM r
+    from RMS_CARRIER RC
+    <where>
+      <if test="index!=null">
+        RC.CARRIER_NAME LIKE #{index}
+      </if>
+    </where>)p0 where p0.r between ((#{pageNum} - 1) * #{pageSize} + 1) AND (#{pageNum}*#{pageSize})
+  </select>
+
+  <!--获取全部承运商的信息-->
+  <select id="getCarrierListByAddress" resultType="java.util.LinkedHashMap">
+    select
+    DISTINCT
+    NVL(RC.CARRIER_ID,0) "carrierId",RC.CARRIER_NAME "carrierName" from RMS_RECEIVE_PLACE RRP
+    LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+    ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
+    LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
+    ON ACTP.PLACE_ID=RRP.PLACE_ID
+    LEFT JOIN RMS_CARRIER RC
+    ON RC.CARRIER_ID=ACTP.CARRIER_ID
+    WHERE RRA.ADDRESS_PROVINCE||RRA.ADDRESS_DISTRICT||RRA.ADDRESS_TOWN||
+    RRP.ADDRESS_DELIVERY_ADDRESS
+    =#{addressProvince}||#{addressDistrict}||#{addressTown}||#{addressDeliveryAddress}
+  </select>
+
+  <!--获取全部承运商的信息-->
+  <select id="getCarrierListByAddressNew" resultType="java.util.LinkedHashMap">
+    select
+      DISTINCT
+      NVL(ACTP.PRICE_ID,0) "priceId" from RMS_RECEIVE_PLACE RRP
+      LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
+      LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
+                ON ACTP.PLACE_ID=RRP.PLACE_ID
+      LEFT JOIN RMS_CARRIER RC
+                ON RC.CARRIER_ID=ACTP.CARRIER_ID
+    WHERE RRP.ADDRESS_DELIVERY_ADDRESS=#{addressDeliveryAddress} and RRA.ADDRESS_ID=#{addressId}
+  </select>
+
+  <!--更新旧数据-->
+  <update id="updateOldDate">
+    update AMS_CONTRACT_TRANSPORT_PRICE ACTP
+    set ACTP.PRICE_DATE =TO_DATE(#{priceDate},'yyyy-mm-dd hh24:mi:ss'),
+        ACTP.INSERT_TIME=TO_DATE(#{insertTime},'yyyy-mm-dd hh24:mi:ss')
+    where ACTP.PRICE_ID=#{priceId}
+  </update>
+
+  <!--删除单价信息-->
+  <delete id="deleteSomeOneSalePrice">
+    delete AMS_CONTRACT_TRANSPORT_PRICE ACTP
+    where ACTP.PRICE_ID IN
+    (select ACTP.PRICE_ID from RMS_RECEIVE_PLACE RRP
+    LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+    ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
+    LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
+    ON ACTP.PLACE_ID=RRP.PLACE_ID
+    LEFT JOIN RMS_CARRIER RC
+    ON RC.CARRIER_ID=ACTP.CARRIER_ID
+    WHERE RRA.ADDRESS_PROVINCE||RRA.ADDRESS_DISTRICT||RRA.ADDRESS_TOWN||
+    RRP.ADDRESS_DELIVERY_ADDRESS
+    =#{addressProvince}||#{addressDistrict}||#{addressTown}||#{addressDeliveryAddress}
+    AND RC.CARRIER_ID=#{carrierId})
+  </delete>
+
+  <!--修改单价信息-->
+  <update id="updateSomeOneSalePrice">
+    update AMS_CONTRACT_TRANSPORT_PRICE ACTP
+    set ACTP.PRICE_DATE =to_date(#{priceDate},'yyyy-mm-dd hh24:mi:ss'),
+        ACTP.INSERT_TIME=to_date(#{insertTime},'yyyy-mm-dd hh24:mi:ss')
+    where ACTP.PRICE_ID IN
+    (select ACTP.PRICE_ID from RMS_RECEIVE_PLACE RRP
+    LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+    ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
+    LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
+    ON ACTP.PLACE_ID=RRP.PLACE_ID
+    LEFT JOIN RMS_CARRIER RC
+    ON RC.CARRIER_ID=ACTP.CARRIER_ID
+    WHERE RRA.ADDRESS_PROVINCE||RRA.ADDRESS_DISTRICT||RRA.ADDRESS_TOWN||
+    RRP.ADDRESS_DELIVERY_ADDRESS
+    =#{addressProvince}||#{addressDistrict}||#{addressTown}||#{addressDeliveryAddress}
+    AND RC.CARRIER_ID=#{carrierId})
+  </update>
+
+  <!--更新卸货地址-->
+  <update id="updateaddressDeliveryAddress">
+    update RMS_RECEIVE_PLACE RRP
+    SET RRP.ADDRESS_DELIVERY_ADDRESS=#{addressDeliveryAddress}
+    WHERE RRP.PLACE_ID=#{placeId}
+  </update>
+
+  <!--更新运价-->
+  <update id="updatePriceValue">
+    UPDATE AMS_CONTRACT_TRANSPORT_PRICE ACTP
+    SET ACTP.PRICE_VALUE=#{priceValue}
+    where ACTP.PRICE_ID IN(
+    select
+    DISTINCT
+    ACTP.PRICE_ID  from RMS_RECEIVE_PLACE RRP
+    LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+    ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
+    LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
+    ON ACTP.PLACE_ID=RRP.PLACE_ID
+    WHERE RRA.ADDRESS_PROVINCE||RRA.ADDRESS_DISTRICT||RRA.ADDRESS_TOWN||
+    RRP.ADDRESS_DELIVERY_ADDRESS
+    =#{addressProvince}||#{addressDistrict}||#{addressTown}||#{addressDeliveryAddress})
+  </update>
+
+  <!--更新距离-->
+  <update id="updateHaulDistance">
+    UPDATE AMS_CONTRACT_TRANSPORT_PRICE ACTP
+    SET ACTP.HAUL_DISTANCE=#{haulDistance}
+    where ACTP.PRICE_ID IN(
+      select
+        DISTINCT
+        ACTP.PRICE_ID  from RMS_RECEIVE_PLACE RRP
+                              LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                                        ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
+                              LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
+                                        ON ACTP.PLACE_ID=RRP.PLACE_ID
+      WHERE RRA.ADDRESS_PROVINCE||RRA.ADDRESS_DISTRICT||RRA.ADDRESS_TOWN||
+            RRP.ADDRESS_DELIVERY_ADDRESS
+              =#{addressProvince}||#{addressDistrict}||#{addressTown}||#{addressDeliveryAddress})
+  </update>
+
   <select id="getAmsContractTransportPriceForDetail" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
     select p0.*,ROWNUM "ROW_ID" from(
     select a_t_price.PRICE_ID "priceId",

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

@@ -787,4 +787,26 @@
     from DIL_NOTICE DN
     where  DN.NOTICE_ID=#{id}
   </select>
+  <select id="getNoticeAll" resultType="java.util.Map">
+    SELECT DN.NOTICE_TITLE AS "noticetitle",
+           DN.NOTICE_CONTENT AS "noticecontent",
+           DN.INSERT_USERNAME AS "insertusername",
+           DN.INSERT_TIME AS "inserttime",
+           DN.NOTICE_ID AS "noticeId",
+           DNU.STATUS "status"
+    FROM DIL_NOTICE	DN
+           LEFT JOIN DIL_NOTICE_USERS DNU ON DNU .NOTICE_ID=DN .NOTICE_ID
+    WHERE DNU.USER_ID=#{userId}
+    AND SYSDATE > DN.INSERT_TIME
+  </select>
+
+  <update id="readAll">
+    update DIL_NOTICE_USERS
+    SET STATUS=1
+    WHERE USER_ID=#{userId}
+      and NOTICE_ID IN(
+      SELECT NOTICE_ID FROM DIL_NOTICE
+      WHERE INSERT_USERNAME = #{insertUserName}
+    )
+  </update>
 </mapper>