Merge remote-tracking branch 'origin/dev' into dev

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/MQSenderController.java

@@ -14,7 +14,7 @@ public class MQSenderController {
     private MQServiceBiZ mqServiceBiZ;
 
     @GetMapping(value = "/sendMessage")
-    public ObjectRestResponse sendMessage(@RequestParam(value = "exchange") String exchange, @RequestParam(value = "routKey") String routKey, @RequestParam(value = "json") String json) {
+    public ObjectRestResponse sendMessage(String exchange, String routKey, String json) {
         return mqServiceBiZ.sendMessage(exchange, routKey, json);
     }
 

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

@@ -180,12 +180,26 @@ public class VehicleBookRecord {
      */
     private String orderNo;
 
+    /**
+     * 使用人姓名
+     */
     @Column(name = "vehicle_username")
     private String vehicleUsername;
-
+    /**
+     * 使用人电话
+     */
     @Column(name = "vehicle_user_phone")
     private String vehicleUserPhone;
 
+    /**
+     * 保养项id
+     */
     @Column(name = "upkeep_ids")
     private String upkeepIds;
+
+    /**
+     * 驳回理由
+     */
+    @Column(name = "reject_remark")
+    private String rejectRemark;
 }
\ No newline at end of file

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

@@ -108,4 +108,9 @@ public class BookVehicleVO {
      * book_record状态
      */
     private Integer status;
+
+    /**
+     * 驳回理由
+     */
+    private String rejectRemark;
 }
\ No newline at end of file

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

@@ -34,5 +34,9 @@ public class VehiclePlanDto extends PageParam {
     private Integer zoneId;
 
     private List<Integer> companyIds;
+    /**
+     * 车辆用途 1、租赁，2、自用
+     */
+    private Integer useType;
 
 }

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

@@ -526,7 +526,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
      * @return
      */
     @Transactional
-    public RestResponse<Integer> reviewVehicleBooking(Integer operatorId, Long bookRecordId,Integer rsStatus,String userName) throws Exception{
+    public RestResponse<Integer> reviewVehicleBooking(Integer operatorId, Long bookRecordId,Integer rsStatus,String userName, String rejectRemark) throws Exception{
         try {
         //获取相关申请记录
         VehicleBookRecord vehicleBookRecord = vehicleBookRecordBiz.selectById(bookRecordId);
@@ -550,6 +550,9 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             updateParam.put("reviewerApply",operatorId);
             updateParam.put("reviewerNameApply",userName);
             updateParam.put("statusCondition",VehicleBookRecordStatus.APPLY.getCode());
+            if(StringUtils.isNotBlank(rejectRemark)) {
+                updateParam.put("rejectRemark",rejectRemark);
+            }
             Integer effected = vehicleBookRecordBiz.changeRecordStatus(updateParam);
             if(effected == 0){//修改失败，手动回滚
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//手动回滚
@@ -575,7 +578,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
      * @return
      */
     @Transactional
-    public RestResponse unbookVehicle4Employee(Integer operatorId,Long bookRecordId,String userName) throws Exception{
+    public RestResponse unbookVehicle4Employee(Integer operatorId,Long bookRecordId,String userName, String rejectRemark) throws Exception{
         //获取相关申请记录
         VehicleBookRecord vehicleBookRecord = vehicleBookRecordBiz.selectById(bookRecordId);
         //申请记录验证
@@ -605,6 +608,9 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         updateParam.put("reviewerCancel",operatorId);
         updateParam.put("reviewerNameCancel",userName);
         updateParam.put("statusCondition",VehicleBookRecordStatus.APPROVE.getCode());
+        if(StringUtils.isNotBlank(rejectRemark)) {
+            updateParam.put("rejectRemark",rejectRemark);
+        }
         Integer effected = vehicleBookRecordBiz.changeRecordStatus(updateParam);
         if(effected == 0){//修改失败，手动回滚
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//手动回滚

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

@@ -70,7 +70,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
         //默认USER_APP 预约
         Integer operatorId = USER_APP;
         String userName = USER_APP_NAME;
-        return baseBiz.reviewVehicleBooking(operatorId, bookRecordId, VehicleBookRecordStatus.REJECTED.getCode(), userName);
+        return baseBiz.reviewVehicleBooking(operatorId, bookRecordId, VehicleBookRecordStatus.REJECTED.getCode(), userName, "租车订单取消");
     }
 
     /**
@@ -86,7 +86,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
         //默认USER_APP 预约
         Integer operatorId = USER_APP;
         String userName = USER_APP_NAME;
-        return baseBiz.unbookVehicle4Employee(operatorId, bookRecordId, userName);
+        return baseBiz.unbookVehicle4Employee(operatorId, bookRecordId, userName,null);
     }
 
     /**
@@ -102,7 +102,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
         //默认USER_APP 预约
         Integer operatorId = USER_APP;
         String userName = USER_APP_NAME;
-        return baseBiz.reviewVehicleBooking(operatorId, bookRecordId, VehicleBookRecordStatus.APPROVE.getCode(), userName);
+        return baseBiz.reviewVehicleBooking(operatorId, bookRecordId, VehicleBookRecordStatus.APPROVE.getCode(), userName, "");
     }
 
     /**

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

 package com.xxfc.platform.vehicle.rest;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONException;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
@@ -10,7 +9,6 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.context.BaseContextHandler;
-import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
@@ -20,20 +18,17 @@ import com.xxfc.platform.vehicle.biz.*;
 import com.xxfc.platform.vehicle.common.BaseController;
 import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
 import com.xxfc.platform.vehicle.common.RestResponse;
-import com.xxfc.platform.vehicle.constant.BookType;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleBookInfo;
-import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
 import com.xxfc.platform.vehicle.jobhandler.VehicleJobHandler;
 import com.xxfc.platform.vehicle.pojo.*;
 import com.xxfc.platform.vehicle.pojo.dto.VehiclePlanDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -43,14 +38,10 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static com.xxfc.platform.vehicle.constant.VehicleConstant.USER_APP;
-import static com.xxfc.platform.vehicle.constant.VehicleConstant.USER_APP_NAME;
-
 @RestController
 @RequestMapping("/vehicleInfo")
 @Slf4j
@@ -141,7 +132,6 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
                     return RestResponse.data(baseBiz.getByPageNotAllData(vehiclePageQueryVo, companyList));
                 }
             }
-
             return RestResponse.data(baseBiz.getByPage(vehiclePageQueryVo));
         } catch (JSONException ex) {
             return RestResponse.code(ResCode.INVALID_REST_REQ_PARAM.getCode());
@@ -218,7 +208,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     public RestResponse<Integer> applyVehicle(@RequestBody  BookVehicleVO bookVehicleVo) throws Exception {
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();
-        bookVehicleVo.setStatus(VehicleBookRecordStatus.APPLY.getCode());
+        bookVehicleVo.setStatus(VehicleBookRecordStatus.APPROVE.getCode());
         baseBiz.applyVehicle(operatorId, bookVehicleVo, userName);
         return RestResponse.suc();
     }
@@ -250,7 +240,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     public RestResponse<Integer> proveVehicleBooking(@PathVariable Long bookRecordId) throws Exception {
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();
-        return baseBiz.reviewVehicleBooking(operatorId, bookRecordId, VehicleBookRecordStatus.APPROVE.getCode(), userName);
+        return baseBiz.reviewVehicleBooking(operatorId, bookRecordId, VehicleBookRecordStatus.APPROVE.getCode(), userName, "");
     }
 
     /**
@@ -259,12 +249,12 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
      * @param bookRecordId
      * @return
      */
-    @RequestMapping(value = "/book/4employee/reject/{bookRecordId}", method = RequestMethod.PUT)
+    @RequestMapping(value = "/book/4employee/reject", method = RequestMethod.PUT)
     @ApiOperation(value = "拒绝预定车辆")
-    public RestResponse<Integer> rejectVehicleBooking(@PathVariable Long bookRecordId) throws Exception {
+    public RestResponse<Integer> rejectVehicleBooking(Long bookRecordId, String rejectRemark) throws Exception {
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();
-        return baseBiz.reviewVehicleBooking(operatorId, bookRecordId, VehicleBookRecordStatus.REJECTED.getCode(), userName);
+        return baseBiz.reviewVehicleBooking(operatorId, bookRecordId, VehicleBookRecordStatus.REJECTED.getCode(), userName, rejectRemark);
     }
 
 //    /**
@@ -287,12 +277,12 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
      * @param bookRecordId
      * @return
      */
-    @RequestMapping(value = "/unbook/4employee/{bookRecordId}", method = RequestMethod.DELETE)
+    @RequestMapping(value = "/unbook/4employee", method = RequestMethod.DELETE)
     @ApiOperation(value = "取消预定车辆")
-    public RestResponse<Integer> unbookVehicle(@PathVariable Long bookRecordId) throws Exception {
+    public RestResponse<Integer> unbookVehicle(Long bookRecordId,  String rejectRemark) throws Exception {
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();
-        return baseBiz.unbookVehicle4Employee(operatorId, bookRecordId, userName);
+        return baseBiz.unbookVehicle4Employee(operatorId, bookRecordId, userName, rejectRemark);
     }
 
     @RequestMapping(value = "/bookedRecord/{bookEndDate}/{id}", method = RequestMethod.GET)

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

@@ -47,6 +47,9 @@
         <if test="haveViolation != null">
             have_violation =#{haveViolation},
         </if>
+        <if test="rejectRemark != null">
+            reject_remark = #{rejectRemark}
+        </if>
 
         `status` = #{status}
         where id = #{id} and `status` = #{statusCondition}

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

@@ -389,6 +389,9 @@
             <if test="zoneId !=null">
                 and bc2.zone_id = #{zoneId}
             </if>
+            <if test="useType != null">
+                and v1.use_type = #{useType}
+            </if>
             and v1.is_del != 1
         </where>
     </select>