预订时间处理bug

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -940,7 +940,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                    if((vehicleBookHourInfos.get(0).getBookedHour() & ~entry.getValue()) == 0) {
                        DateTime dateTime = DateTime.parse(entry.getKey(), DEFAULT_DATE_TIME_FORMATTER);
                        Integer andOperationFactor = 0;
-                       andOperationFactor |= 1<<(dateTime.dayOfMonth().get()-1);
+                       andOperationFactor |= 1<< ( dateTime.dayOfMonth().get()-1);
                        VehicleBookInfo vehicleBookInfo = getByVehicleIdAndYearMonth(vehicleId, dateTime.toString(YEARMONTH_DATE_TIME_FORMATTER));
                        if(vehicleBookInfo != null) {
                           vehicleBookInfo.setBookedDate(vehicleBookInfo.getBookedDate() & ~ andOperationFactor);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookInfoBiz.java

@@ -133,6 +133,6 @@ public class VehicleBookInfoBiz extends BaseBiz<VehicleBookInfoMapper, VehicleBo
     }
 
     public int update(VehicleBookInfo vehicleBookInfo) {
-        return updateSelectiveByIdRe(vehicleBookInfo);
+        return mapper.updateById(vehicleBookInfo);
     }
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleBookInfoMapper.java

@@ -45,4 +45,6 @@ public interface VehicleBookInfoMapper extends Mapper<VehicleBookInfo> {
     public Integer del4YearMoth(Map<String, Object> params);
 
     void insertBatch(@Param("vbfs") List<VehicleBookInfo> bookInfos);
+
+    public Integer updateById(VehicleBookInfo vehicleBookInfo);
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookInfoMapper.xml

@@ -26,7 +26,6 @@
         </foreach>
     </select>
 
-
   <insert id="insertIgnore" parameterType="com.xxfc.platform.vehicle.entity.VehicleBookInfo">
     insert ignore into vehicle_book_info ( vehicle, `year_month`, booked_date)
     values(#{vehicle},#{yearMonth},#{bookedDate})
@@ -47,6 +46,19 @@
           vehicle = #{vehicleId} and `year_month`=#{yearMonth} and
           booked_date &amp; #{andOperationFactor} = #{andOperationRs}
   </update>
+    <update id="updateById" parameterType="com.xxfc.platform.vehicle.entity.VehicleBookInfo">
+         update vehicle_book_info set
+         <if test="vehicle != null and vehicle != ''">
+             vehicle = #{vehicle}
+         </if>
+         <if test="yearMonth != null and yearMonth != ''">
+             'year_month' = #{yearMonth}
+         </if>
+         <if test="bookedDate != null">
+             booked_date = #{bookedDate}
+         </if>
+         where id = #{id}
+    </update>
 
     <select id="getByPage4YearMonth" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.entity.VehicleBookInfo">
         select id, vehicle, `year_month`, booked_date, create_time, update_time from vehicle_book_info where `year_month` = #{yearMonth} order by id limit #{pageStart},#{pageSize}