提交代码

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

@@ -79,7 +79,7 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
             //省份
             String  s = (String) stringObjectMap.get("addressProvince");
             if(s!=null){
-                addressProvince= s.replaceAll("省", "");
+                addressProvince= s.replaceAll("省", "").replace("市","");
             }
             //市
             String s1 = (String) stringObjectMap.get("addressDistrict");
@@ -171,7 +171,7 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
                     amsContractTransportPrice.setCarrierId(bigDecimal);
                 }*/
                 //旧单价置为1
-                amsContractTruckPriceMapper.updateForImport(placeId,simpleDateFormat.format(date));
+                amsContractTruckPriceMapper.updateForImport(priceId,simpleDateFormat.format(date));
                 if (carrierName!=null){
                     String[] split = carrierName.split("/");
                     for (String s2 : split) {

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

@@ -32,7 +32,7 @@ public interface AmsContractTruckPriceMapper extends IBaseMapper<AmsContractTran
     //根据单价去查询数据
     List<BigDecimal> getCarrierIdForImport(String address);
     //更新旧单价为1
-    int updateForImport(BigDecimal placeId, String date);
+    int updateForImport(BigDecimal priceId, String date);
     //删除单价
     int deleteSalePrice(Map<String,Object> map);
     //获取全部承运商信息

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

@@ -971,12 +971,15 @@
   <update id="updateForImport">
     update AMS_CONTRACT_TRANSPORT_PRICE ACTP
     set ACTP.DELETED=1
-    WHERE ACTP.PLACE_ID=#{placeId}
-    and to_date(to_char(ACTP.INSERT_TIME,'yyyy-MM-dd hh24:mi:ss'),'yyyy-MM-dd hh24:mi:ss')
-            <![CDATA[<]]>= to_date(#{date},'yyyy-MM-dd hh24:mi:ss')
+    WHERE ACTP.PLACE_ID in
+          (select AC_TP.PLACE_ID from AMS_CONTRACT_TRANSPORT_PRICE AC_TP
+           WHERE AC_TP.PRICE_ID=#{priceId} FETCH NEXT 1 ROW ONLY)
   </update>
-  <!--to_date(to_char(ACTP.INSERT_TIME,'yyyy-MM-dd hh24:mi:ss'),'yyyy-MM-dd hh24:mi:ss')
-            <![CDATA[<]]>= to_date(#{date},'yyyy-MM-dd hh24:mi:ss')-->
+  <!--update AMS_CONTRACT_TRANSPORT_PRICE ACTP
+  set ACTP.DELETED=1
+  WHERE ACTP.PLACE_ID=#{placeId}
+  and to_date(to_char(ACTP.INSERT_TIME,'yyyy-MM-dd hh24:mi:ss'),'yyyy-MM-dd hh24:mi:ss')
+  <![CDATA[<]]>= to_date(#{date},'yyyy-MM-dd hh24:mi:ss')-->
 
   <!--删除单价-->
   <delete id="deleteSalePrice">