Skip to content

C
cloud-platform
Commit 05633fad authored by unset's avatar unset
Browse files
Options

修改车辆价格权限问题

parent 82f91614
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 28 deletions
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleCommonPriceInfo.java
View file @ 05633fad
package com.xxfc.platform.vehicle.entity;
import com.github.wxiaoqi.security.common.vo.DataInter;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.*;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
......@@ -21,7 +20,7 @@ import java.util.Date;
*/
@Data
@Table(name = "vehicle_common_price_info")
public class VehicleCommonPriceInfo implements Serializable {
public class VehicleCommonPriceInfo implements Serializable, DataInter {
private static final long serialVersionUID = 1L;
/**
......@@ -112,4 +111,9 @@ public class VehicleCommonPriceInfo implements Serializable {
@Column(name = "is_del")
private Integer isDel;
@Transient
List<Integer> dataCompanyIds;
@Transient
List<Integer> dataCorporationIds;
}
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleHolidayPriceInfo.java
View file @ 05633fad
package com.xxfc.platform.vehicle.entity;
import com.github.wxiaoqi.security.common.vo.DataInter;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -7,6 +8,7 @@ import javax.persistence.*;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
......@@ -18,7 +20,7 @@ import java.util.Date;
*/
@Data
@Table(name = "vehicle_holiday_price_info")
public class VehicleHolidayPriceInfo implements Serializable {
public class VehicleHolidayPriceInfo implements Serializable, DataInter {
private static final long serialVersionUID = 1L;
/**
......@@ -121,4 +123,10 @@ public class VehicleHolidayPriceInfo implements Serializable {
@Transient
private String endTime;
@Transient
List<Integer> dataCompanyIds;
@Transient
List<Integer> dataCorporationIds;
}
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java
View file @ 05633fad
......@@ -1398,13 +1398,13 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
/**
* 获取所属公司所有车辆
* @param companyId
* @param companyIds
* @return
*/
public List<Vehicle> getAllVehicleByCompanyId(Integer companyId, Integer modelId) {
public List<Vehicle> getAllVehicleByCompanyId(List<Integer> companyIds, Integer modelId) {
Map<String, Object> param = new HashMap<>();
if (companyId != null) {
param.put("companyId", companyId);
if (companyIds != null) {
param.put("companyIds", companyIds);
}
if (modelId != null) {
param.put("modelId", modelId);
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleCommonPriceInfoBiz.java
View file @ 05633fad
......@@ -3,7 +3,6 @@ package com.xxfc.platform.vehicle.biz;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import com.github.wxiaoqi.security.admin.feign.UserFeign;
import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
......@@ -42,6 +41,7 @@ public class VehicleCommonPriceInfoBiz extends BaseBiz<VehicleCommonPriceInfoMap
public UserFeign getUserFeign() {
return userFeign;
}
public ObjectRestResponse<VehicleCommonPriceInfo> addOrUpdate(VehicleCommonPriceInfo vehicleCommonPriceInfo) {
if (vehicleCommonPriceInfo == null) {
return ObjectRestResponse.paramIsEmpty();
......@@ -50,17 +50,14 @@ public class VehicleCommonPriceInfoBiz extends BaseBiz<VehicleCommonPriceInfoMap
if (vehicle == null) {
return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "车辆不存在！");
}
UserDTO userDTO = getAdminUserInfo();
if (userDTO == null) {
return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
}
setPowerData(vehicleCommonPriceInfo);
vehicleCommonPriceInfo.setCompanyId(vehicle.getSubordinateBranch());
List<Vehicle> vehicleList = null;
if (vehicleCommonPriceInfo.getAllVehicleUse() != null && vehicleCommonPriceInfo.getAllVehicleUse() == 1) {//所有车辆可用
vehicleList = vehicleBiz.getAllVehicleByCompanyId(userDTO.getCompanyId(), null);
vehicleList = vehicleBiz.getAllVehicleByCompanyId(vehicleCommonPriceInfo.getDataCompanyIds(), null);
}
if (vehicleCommonPriceInfo.getAllModelUse() != null && vehicleCommonPriceInfo.getAllModelUse() == 1) {//同车型可用
vehicleList = vehicleBiz.getAllVehicleByCompanyId(userDTO.getCompanyId(), vehicle.getModelId());
vehicleList = vehicleBiz.getAllVehicleByCompanyId(vehicleCommonPriceInfo.getDataCompanyIds(), vehicle.getModelId());
}
if (vehicleList == null || vehicleList.size() <= 0) { //单个车辆可用
VehicleCommonPriceInfo oldValue = getByVehicleId(vehicleCommonPriceInfo.getVehicleId());
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleHolidayPriceInfoBiz.java
View file @ 05633fad
......@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
import com.github.wxiaoqi.security.admin.feign.UserFeign;
import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
......@@ -71,17 +70,14 @@ public class VehicleHolidayPriceInfoBiz extends BaseBiz<VehicleHolidayPriceInfoM
if (vehicle == null) {
return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "车辆不存在！");
}
UserDTO userDTO = getAdminUserInfo();
if (userDTO == null) {
return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
}
setPowerData(vehicleHolidayPriceInfo);
vehicleHolidayPriceInfo.setCompanyId(vehicle.getSubordinateBranch());
List<Vehicle> vehicleList = null;
if (vehicleHolidayPriceInfo.getAllVehicleUse() != null && vehicleHolidayPriceInfo.getAllVehicleUse() == 1) {//所有车辆可用
vehicleList = vehicleBiz.getAllVehicleByCompanyId(userDTO.getCompanyId(), null);
vehicleList = vehicleBiz.getAllVehicleByCompanyId(vehicleHolidayPriceInfo.getDataCompanyIds(), null);
}
if (vehicleHolidayPriceInfo.getAllModelUse() != null && vehicleHolidayPriceInfo.getAllModelUse() == 1) {//同车型可用
vehicleList = vehicleBiz.getAllVehicleByCompanyId(userDTO.getCompanyId(), vehicle.getModelId());
vehicleList = vehicleBiz.getAllVehicleByCompanyId(vehicleHolidayPriceInfo.getDataCompanyIds(), vehicle.getModelId());
}
if (vehicleList == null || vehicleList.size() <= 0) { //单个车辆可用
deleteAllVehiclePrice(vehicleHolidayPriceInfo.getVehicleId(), vehicleHolidayPriceInfo.getFestivalId());
......
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml
View file @ 05633fad
......@@ -764,14 +764,15 @@
<select id="getAllVehicleByParam" resultType="com.xxfc.platform.vehicle.entity.Vehicle">
select * from vehicle v
LEFT JOIN branch_company bc2 ON v1.subordinate_branch = bc2.id
LEFT JOIN company_info ci on ci.id = bc2.company_id
where v.is_del != 1
<if test="modelId != null and modelId != ''">
and v.model_id = #{modelId}
</if>
<if test="companyId != null and companyId != ''">
and ci.id = #{companyId}
<if test="companyIds != null and companyIds.size > 0">
and v.subordinate_branch in
<foreach collection="companyIds" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
</select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment