Merge remote-tracking branch 'origin/master'

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
      */

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

@@ -71,6 +71,7 @@ public class RmsPersonnelController extends BaseRESTfulController {
 
 
         PageHelper.startPage(pageNum, pageSize);
+        mapValue.put("con",con);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsPersonnelService.getPersonnelList(mapValue);
         PageListAdd data = columnDataUtil.tableColumnData(apiId,null,columnList);

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

@@ -109,7 +109,7 @@ public class RmsPierController extends BaseRESTfulController {
                                  Integer pageSize,
                                  Integer apiId,
                                  String con){
-
+        mapVal.put("con",con);
         List<Map<String,Object>>   pierList = rmsPierService.getPier(mapVal);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据

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

@@ -110,6 +110,7 @@ public class RmsPortController extends BaseRESTfulController {
                                          String con){
 
         PageHelper.startPage(pageNum, pageSize);
+        mapVal.put("con",con);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsPortService.getPort(mapVal);
         PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);

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);
 }

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

@@ -26,4 +26,7 @@ public interface RmsPortMapper extends IBaseMapper<RmsPort, BigDecimal> {
 
     //边输边查码头名称
     List<Map<String, Object>> getPierName(@Param("index")String index);
+
+    //查询港口是否已存在（仅根据名字查询）
+    int countPortByName(@Param("port") RmsPort port);
 }

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);
     }

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

@@ -37,6 +37,14 @@ public class RmsPortServiceImpl implements IRmsPortService {
 
     @Override
     public int insertPort(RmsPort rmsPort) {
+        try{
+            //校验名称是否重复
+           if(rmsPortMapper.countPortByName(rmsPort)>0){
+               return -1;
+           }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
         rmsPort.setId(rmsPortMapper.getPortId());
         rmsPort.setInsertUsername("admin");
         rmsPort.setInsertTime(new Date());

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

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

@@ -597,6 +597,9 @@
     ORDER BY RP.INSERT_TIME DESC
     )
     <where>
+      <if test="con!= null and con !=''.toString()">
+        and "personnelJobNumber" || "personnelName" || "shipperName" LIKE CONCAT('%',CONCAT(#{con},'%'))
+      </if>
       <if test="personnelJobNumber!= null">
         and
         <foreach collection="personnelJobNumber" item="item" open="(" separator="," close=")">

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

@@ -401,6 +401,9 @@
     on rpt.PORT_ID=rp.PORT_ID
     where rp.DELETED=0)
     <where>
+      <if test="con != null and con != ''.toString()">
+        and "pierName" || "portName" like concat('%',concat(#{con},'%'))
+      </if>
       <if test="pierName != null">
         and "pierName" in
         <foreach collection="pierName" item="item" open="(" separator="," close=")">

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

@@ -402,6 +402,9 @@
     on rpt.PORT_TYPE_ID=rp.PORT_TYPE_ID
     where rp.DELETED=0)
     <where>
+      <if test="con != null and con != ''.toString()">
+        and "portName" || "portAllName" || "portTypeName" like concat('%',concat(#{con},'%'))
+      </if>
       <if test="portName != null">
         and "portName" in
         <foreach collection="portName" item="item" open="(" separator="," close=")">
@@ -461,6 +464,14 @@
     </if>
     order by "value"
   </select>
-
+  <select id="countPortByName" resultType="java.lang.Integer">
+    select
+    count(rp.PORT_ID)
+    from RMS_PORT rp
+    left join RMS_PORT_TYPE rpt
+    on rpt.PORT_TYPE_ID=rp.PORT_TYPE_ID
+    where rp.DELETED=0 AND
+    (rp.PORT_NAME  = #{port.portName} or rp.PORT_ALL_NAME = #{port.portAllName})
+  </select>
 
 </mapper>

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

@@ -530,16 +530,16 @@
       from RMS_WAREHOUSE rw
       join RMS_PORT rp
       on rp.PORT_ID=rw.PORT_ID
-      WHERE RW.DELETED=0
     <where>
+        RW.DELETED=0
       <if test="warehouseName != null">
-        and "warehouseName" in
+        and RW.WAREHOUSE_NAME in
         <foreach collection="warehouseName" item="item" open="(" separator="," close=")">
           #{item}
         </foreach>
       </if>
       <if test="portName != null">
-        and "portName" in
+        and rp.PORT_NAME in
         <foreach collection="portName" item="item" open="(" separator="," close=")">
           #{item}
         </foreach>