提交代码

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

@@ -189,21 +189,21 @@ public class RmsCapacityController extends BaseRESTfulController {
             if (i==1){
                 columnData.put("min-width","128px");
             }else if (i==2){
-                columnData.put("min-width","129px");
+                columnData.put("min-width","152px");
             }else if (i==3){
                 columnData.put("min-width","139px");
             }else if (i==4){
                 columnData.put("min-width","125px");
             }else if (i==5){
-                columnData.put("min-width","135px");
+                columnData.put("min-width","120px");
             }else if (i==6){
                 columnData.put("min-width","149px");
             }else if (i==7){
                 columnData.put("min-width","109px");
             }else if (i==8){
-                columnData.put("min-width","125px");
+                columnData.put("min-width","100px");
             }else if (i==9){
-                columnData.put("min-width","89px");
+                columnData.put("min-width","100px");
             }
             i++;
         }

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);
+  int updatecapacityTel(String capacityNumber,String capacityTel,BigDecimal capacityCarrierId,String capacityVip,String capacityGps);
 }

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

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

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

@@ -749,6 +749,7 @@
     RC.CAPACITY_OWNERIS AS "capacityOwneris",
     RC.CAPACITY_VIP AS "capacityVip",
     RC.CAPACITY_BLACKLIST AS "capacityBlacklist",
+    RC.CAPACITY_GPS AS "capacityGps",
     RCA.CARRIER_NAME AS "carrierName",
     RCC.INSERT_UPDATE_REMARK "insertRemark",
     RCC.CAPACITY_CARRIER_ID "capacityCarrierId",
@@ -899,6 +900,8 @@
               RCC.CAPACITY_USER_DEP "userDep",
               RC.CAPACITY_NUMBER "capacityNumber",
               RC.CAPACITY_ID "capacityId",
+              RC.CAPACITY_VIP "capacityVip",
+              RC.CAPACITY_GPS "capacityGps",
               RC2.CARRIER_NAME "carrierName"
       from RMS_CAPACITY RC
       LEFT JOIN RMS_CAPACITY_CARRIER RCC
@@ -913,7 +916,12 @@
 
   <update id="updatecapacityTel">
      update RMS_CAPACITY RC
-     set RC.CAPACITY_TEL=#{capacityTel}
-     where RC.CAPACITY_NUMBER=#{capacityNumber}
+     set RC.CAPACITY_TEL=#{capacityTel},
+         RC.CAPACITY_VIP=#{capacityVip},RC.CAPACITY_GPS=#{capacityGps}
+     where RC.CAPACITY_NUMBER=#{capacityNumber} and
+           CARRIER_ID in (select RC.CARRIER_ID FROM  RMS_CAPACITY_CARRIER RCC
+                          LEFT JOIN RMS_CAPACITY RC
+                        ON  RC.CAPACITY_ID = RCC.CAPACITY_ID
+                        where RCC.CAPACITY_CARRIER_ID=#{capacityCarrierId})
   </update>
 </mapper>