12.25rms合并

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

@@ -183,5 +183,11 @@ public class RmsCarDriverController extends BaseRESTfulController {
         return success(result);
     }
 
+    //根据司机id查询承运商
+    @PostMapping(value = "/getCarrierNameByDriverId/{id}")
+    public RESTfulResult getCarrierNameByDriverId(@PathVariable("id") BigDecimal id){
+        Map<String,Object> map = rmsCarDriverService.getCarrierNameByDriverId(id);
+        return success(map);
+    }
 
  }

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

@@ -301,6 +301,11 @@ public class RmsCarrierController extends BaseRESTfulController {
         }
         return success(result);
     }
-
+    //根据运力id查询承运商名称
+    @PostMapping(value = "/getCarrierNameById/{id}")
+    public RESTfulResult getCarrierNameById(@PathVariable("id") BigDecimal id){
+        Map<String,Object> map = rmsCarrierService.getCarrierNameById(id);
+        return success(map);
+    }
 
 }

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

@@ -25,4 +25,5 @@ public interface RmsCapacityMapper extends IBaseMapper<RmsCapacity, BigDecimal>
     List<Map<String, Object>> getCarrierId();
     //通过车牌号查询是否存在重复值
     int selectBycapacityNumber(String number);
+
 }

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

@@ -35,4 +35,8 @@ public interface RmsCarDriverMapper extends IBaseMapper<RmsCarDriver,BigDecimal>
     int selectByIdentityCard(String driverIdentityCardId);
     //查询最大的司机id
     BigDecimal getMaxDriveId();
+
+    //根据司机id查询承运商
+    Map<String, Object> getCarrierNameByDriverId(BigDecimal id);
+
 }

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

@@ -24,4 +24,6 @@ public interface RmsCarrierMapper extends IBaseMapper<RmsCarrier, BigDecimal> {
     int selectParameterCarrierName(String carrierName);
 //    获得当前表中的最大id
     BigDecimal getMaxCarrierId();
+
+    Map<String,Object> getCarrierNameById(BigDecimal id);
 }

src/main/java/com/steerinfo/dil/model/RmsCapacity.java

@@ -147,6 +147,20 @@ public class RmsCapacity implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="逻辑删除",required=false)
     private BigDecimal deleted;
 
+    /**
+     * SSO主键(CAPACITY_SSO_ID,VARCHAR,100)
+     */
+    @ApiModelProperty(value="SSO主键",required=false)
+    private String capacitySsoId;
+
+    public String getCapacitySsoId() {
+        return capacitySsoId;
+    }
+
+    public void setCapacitySsoId(String capacitySsoId) {
+        this.capacitySsoId = capacitySsoId;
+    }
+
     private static final long serialVersionUID = 1L;
 
     @Override

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

@@ -32,4 +32,6 @@ public interface IRmsCarDriverService  {
     List<Map<String, Object>> getCarrierName(String state);
 
     int uploadPhoto(MultipartFile file, String str);
+
+    Map<String, Object> getCarrierNameByDriverId(BigDecimal id);
 }

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

@@ -36,4 +36,6 @@ public interface IRmsCarrierService {
     List<Map<String, Object>> getCarrierBidAreaList(Map<String, Object> mapVal);
 //    处理承运商照片
     int uploadCarrier(MultipartFile multipartFile, String str);
+    //根据id查询承运商名称
+    Map<String,Object> getCarrierNameById(BigDecimal id);
 }

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

@@ -43,6 +43,7 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
         String  capacityOwneris=(String)mapValue.get("capacityOwneris");
         String  capacityVip=(String)mapValue.get("capacityVip");
         String  capacityBlacklist=(String)mapValue.get("capacityBlacklist");
+        String ssoId=(String) mapValue.get("ssoId");
         int i=0;
         //返回没有逻辑删除，且存在该车牌号的数量
         int isrmsCapacitie = rmsCapacityMapper.selectBycapacityNumber(number);
@@ -55,6 +56,7 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
             rmsCapacity.setCapacityOwneris(capacityOwneris);
             rmsCapacity.setCapacityVip(capacityVip);
             rmsCapacity.setCapacityBlacklist(capacityBlacklist);
+            rmsCapacity.setCapacitySsoId(ssoId);
             rmsCapacity.setCapacityStatus(new BigDecimal(0));
             rmsCapacity.setDeleted(new BigDecimal(0));
             rmsCapacity.setInsertTime(new Date());

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

@@ -164,6 +164,10 @@ public class RmsCarDriverServiceImpl implements IRmsCarDriverService {
         return result;
     }
 
-
+    //根据司机id查询承运商
+    @Override
+    public Map<String, Object> getCarrierNameByDriverId(BigDecimal id) {
+        return rmsCarDriverMapper.getCarrierNameByDriverId(id);
+    }
 }
 

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

@@ -252,6 +252,11 @@ public class RmsCarrierServiceImpl implements IRmsCarrierService {
          }
          return result;
      }
+
+    @Override
+    public Map<String,Object> getCarrierNameById(BigDecimal id) {
+        return rmsCarrierMapper.getCarrierNameById(id);
+    }
 }
 
 

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

@@ -44,7 +44,6 @@ public class RmsWarehouseServiceImpl  implements IRmsWarehouseService {
     * */
     @Override
     public int insertWarehouse(RmsWarehouse rmsWarehouse) {
-            rmsWarehouse.setWarehouseTypeId(new BigDecimal(3));
             rmsWarehouse.setDeleted(new BigDecimal(0));
             rmsWarehouse.setInsertUsername("admin");
             rmsWarehouse.setInsertTime(new Date());

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

@@ -25,20 +25,21 @@
     <result column="CAPACITY_CORLOR" jdbcType="VARCHAR" property="capacityCorlor" />
     <result column="CAPACITY_VIP" jdbcType="VARCHAR" property="capacityVip" />
     <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+    <result column="CAPACITY_SSO_ID" jdbcType="VARCHAR" property="capacitySsoId" />
   </resultMap>
   <sql id="columns">
     CAPACITY_ID, CAPACITY_NUMBER, CAPACITY_MAX_LOAD, CAPACITY_TYPE_ID, CAPACITY_STATUS, 
     CARRIER_ID, CAPACITY_ENERGY_ID, CAPACITY_LEN_VAL, CAPACITY_WID_VAL, CAPACITY_HIG_VAL, 
     CAPACITY_OIL_ID, CAPACITY_FUEL_CONSUMPTION, CAPACITY_OWNERIS, CAPACITY_BLACKLIST, 
     MEMO, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-    CAPACITY_CORLOR, CAPACITY_VIP, DELETED
+    CAPACITY_CORLOR, CAPACITY_VIP, DELETED, CAPACITY_SSO_ID
   </sql>
   <sql id="columns_alias">
     t.CAPACITY_ID, t.CAPACITY_NUMBER, t.CAPACITY_MAX_LOAD, t.CAPACITY_TYPE_ID, t.CAPACITY_STATUS, 
     t.CARRIER_ID, t.CAPACITY_ENERGY_ID, t.CAPACITY_LEN_VAL, t.CAPACITY_WID_VAL, t.CAPACITY_HIG_VAL, 
     t.CAPACITY_OIL_ID, t.CAPACITY_FUEL_CONSUMPTION, t.CAPACITY_OWNERIS, t.CAPACITY_BLACKLIST, 
     t.MEMO, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
-    t.CAPACITY_CORLOR, t.CAPACITY_VIP, t.DELETED
+    t.CAPACITY_CORLOR, t.CAPACITY_VIP, t.DELETED, t.CAPACITY_SSO_ID
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM RMS_CAPACITY
@@ -60,7 +61,7 @@
       <if test="capacityTypeId != null">
         and CAPACITY_TYPE_ID = #{capacityTypeId}
       </if>
-      <if test="capacityStatus != null and capacityStatus != ''">
+      <if test="capacityStatus != null">
         and CAPACITY_STATUS = #{capacityStatus}
       </if>
       <if test="carrierId != null">
@@ -117,6 +118,9 @@
       <if test="deleted != null">
         and DELETED = #{deleted}
       </if>
+      <if test="capacitySsoId != null and capacitySsoId != ''">
+        and CAPACITY_SSO_ID = #{capacitySsoId}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -133,8 +137,8 @@
       <if test="capacityTypeId != null">
         and CAPACITY_TYPE_ID = #{capacityTypeId}
       </if>
-      <if test="capacityStatus != null and capacityStatus != ''">
-        and CAPACITY_STATUS LIKE '%${capacityStatus}%'
+      <if test="capacityStatus != null">
+        and CAPACITY_STATUS = #{capacityStatus}
       </if>
       <if test="carrierId != null">
         and CARRIER_ID = #{carrierId}
@@ -190,9 +194,12 @@
       <if test="deleted != null">
         and DELETED = #{deleted}
       </if>
+      <if test="capacitySsoId != null and capacitySsoId != ''">
+        and CAPACITY_SSO_ID LIKE '%${capacitySsoId}%'
+      </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
     delete from RMS_CAPACITY
     where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
   </delete>
@@ -208,7 +215,7 @@
       <if test="capacityTypeId != null">
         or CAPACITY_TYPE_ID = #{capacityTypeId}
       </if>
-      <if test="capacityStatus != null and capacityStatus != ''">
+      <if test="capacityStatus != null">
         or CAPACITY_STATUS = #{capacityStatus}
       </if>
       <if test="carrierId != null">
@@ -265,6 +272,9 @@
       <if test="deleted != null">
         or DELETED = #{deleted}
       </if>
+      <if test="capacitySsoId != null and capacitySsoId != ''">
+        or CAPACITY_SSO_ID = #{capacitySsoId}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.RmsCapacity">
     insert into RMS_CAPACITY (CAPACITY_ID, CAPACITY_NUMBER, CAPACITY_MAX_LOAD, 
@@ -274,15 +284,17 @@
       CAPACITY_OWNERIS, CAPACITY_BLACKLIST, MEMO, 
       INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
       UPDATE_TIME, INSERT_UPDATE_REMARK, CAPACITY_CORLOR, 
-      CAPACITY_VIP, DELETED)
+      CAPACITY_VIP, DELETED, CAPACITY_SSO_ID
+      )
     values (#{capacityId,jdbcType=DECIMAL}, #{capacityNumber,jdbcType=VARCHAR}, #{capacityMaxLoad,jdbcType=DECIMAL}, 
-      #{capacityTypeId,jdbcType=DECIMAL}, #{capacityStatus,jdbcType=DECIMAL}, #{carrierId,jdbcType=DECIMAL},
+      #{capacityTypeId,jdbcType=DECIMAL}, #{capacityStatus,jdbcType=DECIMAL}, #{carrierId,jdbcType=DECIMAL}, 
       #{capacityEnergyId,jdbcType=VARCHAR}, #{capacityLenVal,jdbcType=DECIMAL}, #{capacityWidVal,jdbcType=DECIMAL}, 
       #{capacityHigVal,jdbcType=DECIMAL}, #{capacityOilId,jdbcType=DECIMAL}, #{capacityFuelConsumption,jdbcType=VARCHAR}, 
       #{capacityOwneris,jdbcType=VARCHAR}, #{capacityBlacklist,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, 
       #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{capacityCorlor,jdbcType=VARCHAR}, 
-      #{capacityVip,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL})
+      #{capacityVip,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{capacitySsoId,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsCapacity">
     insert into RMS_CAPACITY
@@ -356,6 +368,9 @@
       <if test="deleted != null">
         DELETED,
       </if>
+      <if test="capacitySsoId != null">
+        CAPACITY_SSO_ID,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="capacityId != null">
@@ -427,6 +442,9 @@
       <if test="deleted != null">
         #{deleted,jdbcType=DECIMAL},
       </if>
+      <if test="capacitySsoId != null">
+        #{capacitySsoId,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsCapacity">
@@ -452,7 +470,8 @@
       INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
       CAPACITY_CORLOR = #{capacityCorlor,jdbcType=VARCHAR},
       CAPACITY_VIP = #{capacityVip,jdbcType=VARCHAR},
-      DELETED = #{deleted,jdbcType=DECIMAL}
+      DELETED = #{deleted,jdbcType=DECIMAL},
+      CAPACITY_SSO_ID = #{capacitySsoId,jdbcType=VARCHAR}
     where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsCapacity">
@@ -524,10 +543,13 @@
       <if test="deleted != null">
         DELETED = #{deleted,jdbcType=DECIMAL},
       </if>
+      <if test="capacitySsoId != null">
+        CAPACITY_SSO_ID = #{capacitySsoId,jdbcType=VARCHAR},
+      </if>
     </set>
     where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
     <include refid="select" />
     where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
   </select>
@@ -552,12 +574,12 @@
       INSERT_TIME, UPDATE_USERNAME, 
       UPDATE_TIME, INSERT_UPDATE_REMARK, 
       CAPACITY_CORLOR, CAPACITY_VIP, 
-      DELETED)
+      DELETED, CAPACITY_SSO_ID)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.capacityId,jdbcType=DECIMAL}, 
       #{item.capacityNumber,jdbcType=VARCHAR}, #{item.capacityMaxLoad,jdbcType=DECIMAL}, 
-      #{item.capacityTypeId,jdbcType=DECIMAL}, #{item.capacityStatus,jdbcType=DECIMAL},
+      #{item.capacityTypeId,jdbcType=DECIMAL}, #{item.capacityStatus,jdbcType=DECIMAL}, 
       #{item.carrierId,jdbcType=DECIMAL}, #{item.capacityEnergyId,jdbcType=VARCHAR}, 
       #{item.capacityLenVal,jdbcType=DECIMAL}, #{item.capacityWidVal,jdbcType=DECIMAL}, 
       #{item.capacityHigVal,jdbcType=DECIMAL}, #{item.capacityOilId,jdbcType=DECIMAL}, 
@@ -566,7 +588,7 @@
       #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
       #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}, 
       #{item.capacityCorlor,jdbcType=VARCHAR}, #{item.capacityVip,jdbcType=VARCHAR}, 
-      #{item.deleted,jdbcType=DECIMAL} from dual  
+      #{item.deleted,jdbcType=DECIMAL}, #{item.capacitySsoId,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -664,6 +686,10 @@
        <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
           when #{item.capacityId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
        </foreach>
+       ,CAPACITY_SSO_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacitySsoId,jdbcType=VARCHAR}
+       </foreach>
      where CAPACITY_ID in 
      <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.capacityId,jdbcType=DECIMAL}
@@ -754,7 +780,7 @@
         </foreach>
       </if>
     </where>
-   <include refid="orderBy"></include>
+    <include refid="orderBy"></include>
   </select>
   <sql id="orderBy">
     <if test="orderField!=null and orderField !=''">
@@ -764,42 +790,42 @@
       </if>
     </if>
   </sql>
-  
+
 
   <select id="getCapacityById" resultType="java.util.LinkedHashMap" >
-         SELECT
-            RC.CAPACITY_ID AS "capacityId",
-            RC.CAPACITY_TYPE_ID AS "capacityTypeId",
-            RC.CAPACITY_NUMBER AS "capacityNumber",
-            RC.CAPACITY_CORLOR AS "capacityCorlor",
-            RC.CAPACITY_OWNERIS AS "capacityOwneris",
-            RC.CAPACITY_VIP AS "capacityVip",
-            RC.CAPACITY_BLACKLIST AS "capacityBlacklist",
-            RC.CARRIER_ID AS "carrierId"
-            FROM RMS_CAPACITY RC
-            WHERE RC.CAPACITY_ID=#{id}
+    SELECT
+      RC.CAPACITY_ID AS "capacityId",
+      RC.CAPACITY_TYPE_ID AS "capacityTypeId",
+      RC.CAPACITY_NUMBER AS "capacityNumber",
+      RC.CAPACITY_CORLOR AS "capacityCorlor",
+      RC.CAPACITY_OWNERIS AS "capacityOwneris",
+      RC.CAPACITY_VIP AS "capacityVip",
+      RC.CAPACITY_BLACKLIST AS "capacityBlacklist",
+      RC.CARRIER_ID AS "carrierId"
+    FROM RMS_CAPACITY RC
+    WHERE RC.CAPACITY_ID=#{id}
 
   </select>
 
   <select id="getCapacityTypeId" resultType="java.util.LinkedHashMap">
     SELECT
-        RCT.CAPACITY_TYPE_ID AS "id",
-        RCT.CAPACITY_TYPE_ID AS "value",
-        RCT.CAPACITY_TYPE_NAME AS "label"
-        FROM RMS_CAPACITY_TYPE RCT
+      RCT.CAPACITY_TYPE_ID AS "id",
+      RCT.CAPACITY_TYPE_ID AS "value",
+      RCT.CAPACITY_TYPE_NAME AS "label"
+    FROM RMS_CAPACITY_TYPE RCT
   </select>
 
   <select id="getCarrierId" resultType="java.util.LinkedHashMap">
     SELECT
-    RC.CARRIER_ID AS "id",
-    RC.CARRIER_ID AS "value",
-    RC.CARRIER_NAME AS "label"
+      RC.CARRIER_ID AS "id",
+      RC.CARRIER_ID AS "value",
+      RC.CARRIER_NAME AS "label"
     FROM RMS_CARRIER RC
     WHERE RC.DELETED!=1
   </select>
 
   <select id="selectBycapacityNumber" parameterType="java.lang.String" resultType="int">
     select count(*) from RMS_CAPACITY RC where RC.CAPACITY_NUMBER=#{number}
-    and RC.DELETED=0
+                                           and RC.DELETED=0
   </select>
 </mapper>

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

@@ -1097,5 +1097,15 @@
   <select id="getMaxDriveId" resultType="DECIMAL">
     select max(RCD.DRIVER_ID+1) from RMS_CAR_DRIVER RCD
   </select>
+
+  <select id="getCarrierNameByDriverId" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+    select
+      RC.CARRIER_ID as "carrierId",
+      RC.CARRIER_NAME as "carrierName"
+    from RMS_CARRIER RC
+    left join RMS_CAR_DRIVER RCD
+    on RCD.CARRIER_ID=RC.CARRIER_ID
+    where RCD.DRIVER_ID=#{id}
+  </select>
 </mapper>
 

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

@@ -1291,5 +1291,12 @@
     SELECT MAX(RC.CARRIER_ID)
     FROM RMS_CARRIER RC
   </select>
-  
+  <select id="getCarrierNameById" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+    select RC.CARRIER_NAME as "carrierName",
+           RC.CARRIER_ID as "carrierId"
+    from RMS_CARRIER RC
+    left join  RMS_CAPACITY RCA
+    on RC.CARRIER_ID=RCA.CARRIER_ID
+    where RCA.CAPACITY_ID=#{id}
+  </select>
 </mapper>

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

@@ -453,7 +453,7 @@
     FROM RMS_WAREHOUSE RW
     LEFT JOIN RMS_SHIPPER RS
     ON RW.SHIPPER_ID=RS.SHIPPER_ID
-    WHERE RW.WAREHOUSE_TYPE_ID=3 AND RW.DELETED!=1
+    WHERE RW.DELETED!=1
     ORDER BY RW.INSERT_TIME DESC
     )
     <where>