Merge branch 'master-chw' into dev-chw

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

@@ -32,6 +32,9 @@ public class VehicleApplyFindDTO extends PageParam implements DataInter {
     private Integer  applyStatus;
 
 
+    private  Integer id;
+
+
     @ApiModelProperty("店铺id")
     private Integer  branchId;
 

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

@@ -9,6 +9,7 @@ import com.xxfc.platform.vehicle.biz.VehicleApplyBiz;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleApply;
 import com.xxfc.platform.vehicle.pojo.dto.VehicleApplyFindDTO;
+import com.xxfc.platform.vehicle.pojo.vo.VehicleApplyVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.extern.slf4j.Slf4j;
@@ -56,8 +57,16 @@ public class AdminVehicleApplyController extends BaseController<VehicleApplyBiz,
 
     @GetMapping("info/{id}")
     @ApiModelProperty("商家信息")
-    public  ObjectRestResponse info(@PathVariable("id") Long id ) {
-        return ObjectRestResponse.succ(baseBiz.selectById(id));
+    public  ObjectRestResponse info(@PathVariable("id") Integer id ) {
+        VehicleApplyFindDTO vehicleApplyFindDTO = new VehicleApplyFindDTO();
+        vehicleApplyFindDTO.setId(id);
+
+        List<VehicleApplyVo> list = baseBiz.getList(vehicleApplyFindDTO);
+        VehicleApplyVo vehicleApplyVo = null ;
+        if (list.size() > 0){
+            vehicleApplyVo = list.get(0);
+        }
+        return ObjectRestResponse.succ(vehicleApplyVo);
     }
 
 

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

@@ -24,6 +24,9 @@
             <if test="branchId != null and branchId > 0">
                 AND  a.`subordinate_branch`= #{branchId}
             </if>
+            <if test="id != null and id > 0 ">
+                AND  a.`id`= #{id}
+            </if>
             <if test="applyStatus != null ">
                 AND  a.`apply_status`= #{applyStatus}
             </if>