liyg %!s(int64=2) %!d(string=hai) anos
pai
achega
e9510e3aa1

+ 2 - 2
src/main/java/com/steerinfo/dil/controller/RmsCapacityController.java

@@ -57,7 +57,7 @@ public class RmsCapacityController extends BaseRESTfulController {
     }
 
     /**
-     * 创建运力信息
+     * 新增运力信息
      * @param
      * @return
      */
@@ -76,7 +76,7 @@ public class RmsCapacityController extends BaseRESTfulController {
     }
 
     /**
-     * 根据id更新运力信息
+     * 根据id修改更新运力信息
      * @param map
      * @return
      */

+ 1 - 1
src/main/java/com/steerinfo/dil/mapper/RmsCapacityMapper.java

@@ -42,5 +42,5 @@ public interface RmsCapacityMapper extends IBaseMapper<RmsCapacity, BigDecimal>
 
  List<Map<String, Object>> getCapacityByCapacityId(Integer id);
 
-  int updatecapacityTel(String capacityNumber,String capacityTel,BigDecimal capacityCarrierId,String capacityVip,String capacityGps);
+  int updatecapacityTel(String capacityNumber,String capacityTel,BigDecimal capacityCarrierId,String capacityVip,String capacityGps,String capacityBlackList);
 }

+ 5 - 1
src/main/java/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.java

@@ -124,6 +124,7 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
         String capacityNumber="";
         String capacityVip="否";
         String capacityGps="否";
+        String capacityBlackList="否";
         if (!("".equals(map.get("remark")))&&map.get("remark")!=null){
             remark = (String) map.get("remark");
         }
@@ -139,6 +140,9 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
         if (!("".equals(map.get("capacityGps")))&&map.get("capacityGps")!=null){
             capacityGps = (String) map.get("capacityGps");
         }
+        if (!("".equals(map.get("capacityBlackList")))&&map.get("capacityBlackList")!=null){
+            capacityBlackList = (String) map.get("capacityBlackList");
+        }
         BigDecimal capacityCarrierId =DataChange.dataToBigDecimal(map.get("capacityCarrierId"));
         RmsCapacityCarrier rmsCapacityCarrier=new RmsCapacityCarrier();
         rmsCapacityCarrier.setCapacityCarrierId(capacityCarrierId);
@@ -147,7 +151,7 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
         //更新司机电话
         if (!("".equals(map.get("capacityNumber")))&&map.get("capacityNumber")!=null){
             capacityNumber = (String) map.get("capacityNumber");
-            rmsCapacityMapper.updatecapacityTel(capacityNumber,capacityTel,capacityCarrierId,capacityVip,capacityGps);
+            rmsCapacityMapper.updatecapacityTel(capacityNumber,capacityTel,capacityCarrierId,capacityVip,capacityGps,capacityBlackList);
         }
         return rmsCapacityCarrierMapper.updateByPrimaryKeySelective(rmsCapacityCarrier);
     }

+ 2 - 1
src/main/resources/com/steerinfo/dil/mapper/RmsCapacityMapper.xml

@@ -903,6 +903,7 @@
               RC.CAPACITY_TEL "capacityTel",
               RC.CAPACITY_VIP "capacityVip",
               RC.CAPACITY_GPS "capacityGps",
+              RC.CAPACITY_BLACKLIST "capacityBlackList",
               RC2.CARRIER_NAME "carrierName"
       from RMS_CAPACITY RC
       LEFT JOIN RMS_CAPACITY_CARRIER RCC
@@ -918,7 +919,7 @@
   <update id="updatecapacityTel">
      update RMS_CAPACITY RC
      set RC.CAPACITY_TEL=#{capacityTel},
-         RC.CAPACITY_VIP=#{capacityVip},RC.CAPACITY_GPS=#{capacityGps}
+         RC.CAPACITY_VIP=#{capacityVip},RC.CAPACITY_GPS=#{capacityGps},RC.CAPACITY_BLACKLIST=#{capacityBlackList}
      where RC.CAPACITY_NUMBER=#{capacityNumber} and
            CARRIER_ID in (select RC.CARRIER_ID FROM  RMS_CAPACITY_CARRIER RCC
                           LEFT JOIN RMS_CAPACITY RC