123

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

@@ -24,6 +24,13 @@ public class VehicleVO extends Vehicle {
     @ApiModelProperty("所属店铺名称")
     private String companyName;
 
+    @ApiModelProperty("所属店铺联系人")
+    private  String companyLeader;
+
+
+    @ApiModelProperty("所属店铺联系电话")
+    private  String companyLeaderContact;
+
     @ApiModelProperty("经营店铺名称")
     private String manageCompanyName;
 

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

@@ -1777,6 +1777,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         return  mapper.countByCompamyId(companyId);
     }
 
+    public  int setState(String vehicleId,Integer state){
+       return mapper.setState(vehicleId,state);
+    }
+
 
 
 

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

@@ -6,6 +6,7 @@ import com.xxfc.platform.vehicle.entity.Area;
 import com.xxfc.platform.vehicle.entity.VehicleManageApply;
 import com.xxfc.platform.vehicle.mapper.VehicleManageApplyMapper;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
 
@@ -15,6 +16,10 @@ import java.util.List;
 public class VehicleManageApplyBiz extends BaseBiz<VehicleManageApplyMapper, VehicleManageApply> {
 
 
+    @Autowired
+    VehicleBiz vehicleBiz;
+
+
 
 
     public List<VehicleManageApply>  getManageApply(VehicleManageApply vehicleManageApply){
@@ -40,4 +45,15 @@ public class VehicleManageApplyBiz extends BaseBiz<VehicleManageApplyMapper, Veh
     }
 
 
+    public  void  applyManage(VehicleManageApply vehicleManageApply){
+        Integer type = vehicleManageApply.getType() == null ? 1 : vehicleManageApply.getType();
+
+        if (type == 2){
+            vehicleBiz.setState(vehicleManageApply.getVehicleId(),2);
+        }
+
+
+    }
+
+
 }

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

@@ -8,6 +8,7 @@ import com.xxfc.platform.vehicle.pojo.dto.VehiclePlanDto;
 import com.xxfc.platform.vehicle.pojo.vo.UsableVeicleVO;
 import com.xxfc.platform.vehicle.pojo.vo.VehicleVO;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 import org.springframework.data.repository.query.Param;
 import tk.mybatis.mapper.common.Mapper;
 
@@ -72,4 +73,8 @@ public interface VehicleMapper extends Mapper<Vehicle> {
 
     @Select("SELECT goods_type FROM vehicle WHERE subordinate_branch=#{commpanyId} AND is_del=0  GROUP BY goods_type")
     List<Integer> goodTypes(@Param("commpanyId") Integer commpanyId);
+
+
+    @Update("update vehicle set state=#{state} WHERE  id=#{vehicleId} ")
+    int  setState(@Param("vehicleId")String vehicleId,@Param("state")Integer state);
 }
\ No newline at end of file

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

@@ -1297,7 +1297,8 @@
         v.*,
         b.cn_name as brandName,
         c.`name` categoryName,
-        bc.`name` as companyName,
+        bc.`leader` as companyLeader,
+        bc.`leader_contact_info` as companyLeaderContact,
         bc1.`name` as manageCompanyName,
         bc2.`name` as parkCompanyName
         FROM  vehicle v