Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleDepartureLog.java

@@ -86,4 +86,8 @@ public class VehicleDepartureLog {
      * 预约记录id
      */
     Integer bookRecordId;
+
+    private String illegalPic;
+
+    private Integer illegalAmount;
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleBookRecordQueryVo.java

@@ -53,4 +53,5 @@ public class VehicleBookRecordQueryVo {
 
     private String[] companyIds;
     private String upkeepIds;
+    private Integer userCompany;
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleBookRecordVo.java

@@ -28,4 +28,8 @@ public class VehicleBookRecordVo extends VehicleBookRecord {
     private VehicleDepartureLogVo vehicleDepartureLogVo;
 
     private String  numberPlate;
+
+    private Integer liftStatus;
+
+    private Integer retStatus;
 }

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

@@ -382,8 +382,16 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         return vehicleBookRecord;
     }
 
+    /**
+     * 需要审核
+     * @param userId
+     * @param bookVehicleVo
+     * @param userName
+     * @return
+     * @throws Exception
+     */
     @Transactional
-    public VehicleBookRecord applyVehicle(Integer userId, BookVehicleVO bookVehicleVo, String userName) throws Exception{
+    public VehicleBookRecord applyForVehicle(Integer userId, BookVehicleVO bookVehicleVo, String userName) throws Exception{
         log.info("预定车辆参数：userId = {}, bookVehicleVo = {},username = {}", userId, bookVehicleVo, userName);
         //检查车辆信息是否合法
         checkIfVehicleExists(bookVehicleVo.getVehicleId());
@@ -396,7 +404,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         //转换日期范围为列表，并检查是否合法
         fillDateList4DatePeriod(yearMonthAndDate,startDay,endDay);
         if(yearMonthAndDate.size()>3){//连续的日期最多夸3个月
-            throw new CustomIllegalParamException(" you can only within 2 month");
+            throw new CustomIllegalParamException(" 只可以预约两个月内的车辆");
         }
         //检查车辆是否可以预定
         for(Map.Entry<String,List<String>> entry:yearMonthAndDate.entrySet()){
@@ -412,7 +420,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
             vehicleBookRecord = new VehicleBookRecord();
             vehicleBookRecord.setVehicleId(bookVehicleVo.getVehicleId());
             vehicleBookRecord.setBookType(bookVehicleVo.getBookType());
-            vehicleBookRecord.setStatus(VehicleBookRecordStatus.APPROVE.getCode());
+            vehicleBookRecord.setStatus(VehicleBookRecordStatus.APPLY.getCode());
             vehicleBookRecord.setBookUser(userId);
             vehicleBookRecord.setBookUserName(userName);
             vehicleBookRecord.setBookStartDate(startDay.toDate());
@@ -467,6 +475,98 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         return vehicleBookRecord;
     }
 
+    /**
+     * 不需要审核
+     * @param userId
+     * @param bookVehicleVo
+     * @param userName
+     * @return
+     * @throws Exception
+     */
+    @Transactional
+    public VehicleBookRecord applyVehicle(Integer userId, BookVehicleVO bookVehicleVo, String userName) throws Exception{
+        log.info("预定车辆参数：userId = {}, bookVehicleVo = {},username = {}", userId, bookVehicleVo, userName);
+        //检查车辆信息是否合法
+        checkIfVehicleExists(bookVehicleVo.getVehicleId());
+        //提取日期和相应的预定目标日期
+        Map<String,List<String>> yearMonthAndDate = Maps.newHashMap();
+        DateTime startDay =DateTime.parse(bookVehicleVo.getBookStartDate(),DATE_TIME_FORMATTER);
+        DateTime endDay =DateTime.parse(bookVehicleVo.getBookEndDate(), DATE_TIME_FORMATTER);
+
+
+        //转换日期范围为列表，并检查是否合法
+        fillDateList4DatePeriod(yearMonthAndDate,startDay,endDay);
+        if(yearMonthAndDate.size()>3){//连续的日期最多夸3个月
+            throw new CustomIllegalParamException(" 只可以预约两个月内的车辆");
+        }
+        //检查车辆是否可以预定
+        for(Map.Entry<String,List<String>> entry:yearMonthAndDate.entrySet()){
+            Boolean rsEach = applyVehicle4EmployeePerMonth(bookVehicleVo.getVehicleId(),entry.getValue(),entry.getKey());
+            if(Boolean.FALSE.equals(rsEach)){
+                throw new BaseException(ResultCode.FAILED_CODE);
+            }
+        }
+
+        //加入预定申请记录
+        VehicleBookRecord vehicleBookRecord = null;
+        if(bookVehicleVo.getVehicleBookRecordId() == null) {
+            vehicleBookRecord = new VehicleBookRecord();
+            vehicleBookRecord.setVehicleId(bookVehicleVo.getVehicleId());
+            vehicleBookRecord.setBookType(bookVehicleVo.getBookType());
+            vehicleBookRecord.setStatus(VehicleBookRecordStatus.APPROVE.getCode());
+            vehicleBookRecord.setBookUser(userId);
+            vehicleBookRecord.setBookUserName(userName);
+            vehicleBookRecord.setBookStartDate(startDay.toDate());
+            vehicleBookRecord.setBookEndDate(endDay.toDate());
+            vehicleBookRecord.setLiftAddr(bookVehicleVo.getLiftAddr());
+            vehicleBookRecord.setRemark(bookVehicleVo.getRemark());
+            vehicleBookRecord.setDestination(bookVehicleVo.getDestination());
+            vehicleBookRecord.setLiftCompany(bookVehicleVo.getLiftCompany());
+            vehicleBookRecord.setRetCompany(bookVehicleVo.getRetCompany());
+            vehicleBookRecord.setVehicleUsername(bookVehicleVo.getVehicleUsername());
+            vehicleBookRecord.setVehicleUserPhone(bookVehicleVo.getVehicleUserPhone());
+            vehicleBookRecord.setUpkeepIds(bookVehicleVo.getUpkeepIds());
+            vehicleBookRecordBiz.save(vehicleBookRecord);
+        } else {
+            vehicleBookRecord = vehicleBookRecordBiz.selectById(bookVehicleVo.getVehicleBookRecordId());
+            vehicleBookRecord.setBookStartDate(startDay.toDate());
+            vehicleBookRecord.setBookEndDate(endDay.toDate());
+            vehicleBookRecordBiz.updateSelectiveByIdRe(vehicleBookRecord);
+        }
+
+//        //添加预定时间记录
+        VehicleBookRecord newValue = vehicleBookRecordBiz.selectOne(vehicleBookRecord);
+        Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours(bookVehicleVo.getBookStartDate(), bookVehicleVo.getBookEndDate());
+        for(Map.Entry<String, Integer> entry : map.entrySet()) {
+            VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
+            vehicleBookHourInfoDto.setVehicleId(bookVehicleVo.getVehicleId());
+            vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
+            vehicleBookHourInfoDto.setBookedHour(entry.getValue());
+            vehicleBookHourInfoDto.setBookRecordId(newValue.getId());
+            vehicleBookHourInfoBiz.save(vehicleBookHourInfoDto);
+        }
+
+        //修改相关车辆预定记录
+        Boolean hasSuc = bookedVehicle(bookVehicleVo);
+        if(!hasSuc){
+            throw new BaseException(ResultCode.FAILED_CODE);
+        }
+
+        //添加随车物品
+        List<Map<String,Object>> params = Lists.newArrayList();
+        if(MapUtils.isNotEmpty(bookVehicleVo.getSelectedAccItem())){
+            for(Map.Entry<Integer,Integer> idAndAmount : bookVehicleVo.getSelectedAccItem().entrySet()){
+                Map<String,Object> row = Maps.newHashMap();
+                row.put("id",idAndAmount.getKey());
+                row.put("amount",idAndAmount.getValue());
+                row.put("bookRecordId",vehicleBookRecord.getId());
+                params.add(row);
+            }
+            bookRecordAccItemMapper.batchAdd(params);
+        }
+
+        return vehicleBookRecord;
+    }
 
 
     @Transactional
@@ -647,7 +747,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         //转换日期范围为列表，并检查是否合法
         fillDateList4DatePeriod(yearMonthAndDate,startDay,endDay);
         if(yearMonthAndDate.size()>3){//连续的日期最多夸3个月
-            throw new CustomIllegalParamException(" you can only within 2 month");
+            throw new CustomIllegalParamException(" 只可以预约两个月内的车辆");
         }
         Boolean rs = Boolean.TRUE;
         for(Map.Entry<String,List<String>> entry:yearMonthAndDate.entrySet()){
@@ -726,7 +826,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         for( DateTime curDate = startDay;curDate.compareTo(endDay)<=0;curDate=curDate.plusDays(1)){
             String curDateStr = curDate.toString(DEFAULT_DATE_TIME_FORMATTER);
             if(curDateStr.compareTo(DateTime.now().toString(DEFAULT_DATE_TIME_FORMATTER))<0){
-                throw new CustomIllegalParamException("you can only unbook from today");
+                throw new CustomIllegalParamException("只可以取消当前时间之后的车辆");
             }
             String curYearMonth = curDate.toString(YEARMONTH_DATE_TIME_FORMATTER);
             if(!yearMonthAndDate.containsKey(curYearMonth)){
@@ -737,7 +837,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         }
 
         if(yearMonthAndDate.size()>3){//连续的日期最多夸3个月
-            throw new CustomIllegalParamException(" you can only within 2 month");
+            throw new CustomIllegalParamException(" 只可以预约两个月内的车辆");
         }
     }
 
@@ -756,7 +856,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         fillDateList4DatePeriod(yearMonthAndDate,startDay,endDay);
 
         if(yearMonthAndDate.size()>3){//连续的日期最多夸3个月
-            throw new CustomIllegalParamException(" you can only within 2 month");
+            throw new CustomIllegalParamException(" 只可以预约两个月内的车辆");
         }
         Boolean rs = Boolean.TRUE;
         for(Map.Entry<String,List<String>> entry:yearMonthAndDate.entrySet()){
@@ -777,7 +877,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         params.put("yearMonth",yearMonth);
         //加入更新条件
         if(CollectionUtils.isEmpty(unbookDates)){
-            throw new CustomIllegalParamException(" there are no day to unbook ");
+            throw new CustomIllegalParamException(" 车辆不可预定");
         }
         Map<String,List<String>> yearMonthAndDate = new HashMap<>();
         yearMonthAndDate.put(yearMonth,unbookDates);
@@ -804,7 +904,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
     public void fillBookedDateSearchParam(Map<String, Object> params,
                                           Map<String,List<String>> yearMonthAndDate,Map<String,List<String>> yearMonthAndDateNotBooked){
         if(MapUtils.isEmpty(yearMonthAndDate)&&MapUtils.isEmpty(yearMonthAndDateNotBooked)){//没有预定信息查询条件
-            throw new CustomIllegalParamException(" at least apply one book info condition.");
+            throw new CustomIllegalParamException("没有预订信息！");
         }
 
         Map<String,Map<String,Integer>> yearMonthAndParam = new HashMap<>();
@@ -849,7 +949,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
                 }
                 for (String dateStr:entry.getValue()) {//已预定作为条件，该位与1作与运算必定为1
                     if(bookedYearMonth.contains(dateStr)){
-                        throw new CustomIllegalParamException(" 同一天既作为未预定查询条件又作为已预定查询条件");
+                        throw new CustomIllegalParamException("同一天既作为未预定查询条件又作为已预定查询条件");
                     }
                     DateTime dateTime = DateTime.parse(dateStr, DEFAULT_DATE_TIME_FORMATTER);
                     //仅对应位为1的整形值

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

@@ -122,6 +122,9 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
                 }
                 vehicleBookRecordQueryVo.setCompanyIds(companyId.split(","));
             }
+        } else {
+            vehicleBookRecordQueryVo.setZoneIds((vehicleBookRecordQueryVo.getZoneId() + "").split(","));
+            vehicleBookRecordQueryVo.setCompanyIds((vehicleBookRecordQueryVo.getLiftCompany() + "").split(","));
         }
         List<VehicleBookRecordVo> list = mapper.getBookRecord(vehicleBookRecordQueryVo);
         PageHelper.startPage(pageNo,pageSize);
@@ -137,6 +140,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         if(userDTO == null) {
             return RestResponse.codeAndMessage(235, "token失效");
         }
+        vehicleBookRecordQueryVo.setUserCompany(userDTO.getCompanyId());
         if(vehicleBookRecordQueryVo.getZoneId() == null) { //默认查出所有权限内的数据
             if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据
                 String zoneId = null;
@@ -162,6 +166,9 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
                 }
                 vehicleBookRecordQueryVo.setCompanyIds(companyId.split(","));
             }
+        } else {
+            vehicleBookRecordQueryVo.setZoneIds((vehicleBookRecordQueryVo.getZoneId() + ",").split(","));
+            vehicleBookRecordQueryVo.setCompanyIds((vehicleBookRecordQueryVo.getLiftCompany() + ",").split(","));
         }
         List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(vehicleBookRecordQueryVo);
         PageHelper.startPage(pageNo,pageSize);

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

 package com.xxfc.platform.vehicle.biz;
 
-import com.github.pagehelper.Page;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
@@ -26,15 +27,12 @@ import java.util.List;
 @Service
 public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper, VehicleDepartureLog> {
 
-    @Autowired
-    VehicleDepartureLogMapper vehicleDepartureLogMapper;
-
     @Autowired
     VehicleMapper vehicleMapper;
 
     public PageInfo<VehicleDepartureLogVo> page(String numberPlate, String time, Integer page, Integer limit) {
         PageHelper.startPage(page, limit);
-        return new PageInfo<>(vehicleDepartureLogMapper.selectVoAll(numberPlate, time));
+        return new PageInfo<>(mapper.selectVoAll(numberPlate, time));
     }
 
     public PageInfo<VehicleDepartureLogVo> pageNotAllData(String numberPlate, String time, Integer page, Integer limit, List<Integer> companyList) {
@@ -42,12 +40,12 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
         if (companyList == null || companyList.size() == 0) {
             companyList = Arrays.asList(-1);
         }
-        return new PageInfo<>(vehicleDepartureLogMapper.selectVoAllNotAllData(numberPlate, time, companyList));
+        return new PageInfo<>(mapper.selectVoAllNotAllData(numberPlate, time, companyList));
     }
 
     public PageInfo<VehicleDepartureLogVo> findByVehicle(String vehicleId, Integer page, Integer limit) {
         PageHelper.startPage(page, limit);
-        return new PageInfo<>(vehicleDepartureLogMapper.selectByVehicleId(vehicleId));
+        return new PageInfo<>(mapper.selectByVehicleId(vehicleId));
     }
 
     public VehicleDepartureStatisticDataVo statistic(String numberPlate) {
@@ -61,28 +59,32 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
         // 出行次数
         VehicleDepartureLog departureLog = new VehicleDepartureLog();
         departureLog.setVehicleId(vehicle.getId());
-        statisticData.setDepartureCount(vehicleDepartureLogMapper.selectCount(departureLog));
+        statisticData.setDepartureCount(mapper.selectCount(departureLog));
         // 出行天数
-        statisticData.setDepartureDay(vehicleDepartureLogMapper.selectDayByVehicleId(vehicle.getId()));
+        statisticData.setDepartureDay(mapper.selectDayByVehicleId(vehicle.getId()));
         // 出行公里数
-        statisticData.setDepartureMileage(vehicleDepartureLogMapper.selectMileageByVehicleId(vehicle.getId()));
+        statisticData.setDepartureMileage(mapper.selectMileageByVehicleId(vehicle.getId()));
         return statisticData;
     }
 
 
     @Transactional
     public ObjectRestResponse save(VehicleDepartureLog vehicleDepartureLog) {
-
         Integer id = vehicleDepartureLog.getId();
         if (id == null || id == 0) {
             vehicleDepartureLog.setCreateTime(new Date());
             vehicleDepartureLog.setState(0);
             insertSelective(vehicleDepartureLog);
         } else {
-             vehicleDepartureLog.setUpdateTime(new Date());
-            updateSelectiveById(vehicleDepartureLog);
-        }
+            vehicleDepartureLog.setUpdateTime(new Date());
+            VehicleDepartureLog oldValue = mapper.selectByPrimaryKey(vehicleDepartureLog);
+            if(oldValue != null) {
+                BeanUtil.copyProperties(oldValue, vehicleDepartureLog, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+                oldValue.setUpdateTime(new Date());
+                updateSelectiveById(oldValue);
+            }
 
+        }
         return ObjectRestResponse.succ();
     }
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -199,7 +199,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
     }
 
     /**
-     * 申请预定车辆
+     * 申请预定车辆 不需要审核
      *
      * @param bookVehicleVo
      * @return
@@ -213,6 +213,21 @@ public class VehicleController extends BaseController<VehicleBiz> {
         return RestResponse.suc();
     }
 
+    /**
+     * 申请预定车辆 需要审核
+     *
+     * @param bookVehicleVo
+     * @return
+     */
+    @RequestMapping(value = "/apply/book/vehicle", method = RequestMethod.POST)
+    @ApiOperation(value = "申请预定车辆信息")
+    public RestResponse<Integer> applyForVehicle(@RequestBody  BookVehicleVO bookVehicleVo) throws Exception {
+        Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
+        String userName = BaseContextHandler.getName();
+        baseBiz.applyForVehicle(operatorId, bookVehicleVo, userName);
+        return RestResponse.suc();
+    }
+
     /**
      * 批准预定车辆预定
      *
@@ -446,13 +461,13 @@ public class VehicleController extends BaseController<VehicleBiz> {
     }
 
     @GetMapping(value = "/app/unauth/getBookRecord")
-    @ApiOperation(value = "获取排班记录")
+    @ApiOperation(value = "获取预定记录")
     public RestResponse<PageDataVO> getRecord(VehicleBookRecordQueryVo vehicleBookRecordQueryVo) {
         return vehicleBookRecordBiz.getBookRecord(vehicleBookRecordQueryVo);
     }
 
     @GetMapping(value = "/app/unauth/getBookRecordInfo")
-    @ApiOperation(value = "获取排班记录信息")
+    @ApiOperation(value = "获取预定记录信息")
     public RestResponse<PageDataVO> getBookRecordInfo(VehicleBookRecordQueryVo vehicleBookRecordQueryVo) {
         return vehicleBookRecordBiz.getBookRecordInfo(vehicleBookRecordQueryVo);
     }

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

@@ -417,7 +417,7 @@
 
 
     <select id="getBookRecordInfo" resultMap="searchBookRecord" parameterType="com.xxfc.platform.vehicle.pojo.VehicleBookRecordQueryVo">
-        select bc3.name parkCompanyName,bc4.name subordinateBranchName, conv(v2.booked_date,10,2) book_date, conv(v4.booked_hour,10,2) startHour,conv(v5.booked_hour,10,2) endHour, bc1.`name` lift_company_name, bc2.`name` ret_company_name, v3.number_plate,v1.*
+        select (CASE v1.lift_company WHEN #{userCompany} THEN 1 ELSE 0 end) liftStatus,(CASE v1.ret_company WHEN #{userCompany} THEN 1 ELSE 0 end) retStatus,bc3.name parkCompanyName,bc4.name subordinateBranchName, conv(v2.booked_date,10,2) book_date, conv(v4.booked_hour,10,2) startHour,conv(v5.booked_hour,10,2) endHour, bc1.`name` lift_company_name, bc2.`name` ret_company_name, v3.number_plate,v1.*
         from vehicle_book_record v1
         LEFT JOIN vehicle_book_info v2 on v1.vehicle_id = v2.vehicle and  v2.year_month = CONCAT(YEAR(v1.book_start_date),"-",IF(MONTH(v1.book_start_date) > 10,MONTH(v1.book_start_date),CONCAT("0",MONTH(v1.book_start_date))))
         LEFT JOIN vehicle_book_hour_info v4 on v4.book_record_id = v1.id and YEAR(v4.year_month_day) = YEAR(v1.book_start_date) AND MONTH(v4.year_month_day) = MONTH(v1.book_start_date) AND DAY(v4.year_month_day) =DAY(v1.book_start_date)
@@ -442,7 +442,6 @@
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">
                     #{id}
                 </foreach>
-
             </if>
             <if test="zoneIds != null">
                 and bc1.zone_id in

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

@@ -20,7 +20,6 @@
     <select id="selectByBookRecordId" parameterType="java.lang.Integer" resultType="com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo">
         select vehicle_departure_log.*
         from vehicle_departure_log
-        left join vehicle on vehicle_departure_log.vehicle_id = vehicle.id
         where vehicle_departure_log.book_record_id = #{id}
         order by create_time desc
     </select>