Commit a0df56f3 authored by hanfeng's avatar hanfeng

修改后台车型和标签列表

parent 54567d5f
...@@ -40,6 +40,24 @@ public class QueryVehicleVo { ...@@ -40,6 +40,24 @@ public class QueryVehicleVo {
*/ */
private String subBranchName; private String subBranchName;
/**
* 停靠分支机构(id)
*/
private Integer parkBranchCompanyId;
/**
* 停靠分支机构(名称)
*/
private String parkBranchCompanyName;
/**
* 目的地分支机构(id)
*/
private Integer expectDestinationBranchCompanyId;
/**
* 目的地分支机构(名称)
*/
private String expectDestinationBranchCompanyName;
/** /**
* 用途类型:租赁房车(1)、展车等,对应关系见车辆常量表 * 用途类型:租赁房车(1)、展车等,对应关系见车辆常量表
*/ */
......
package com.xxfc.platform.vehicle.pojo;
import lombok.Data;
import java.util.Date;
@Data
public class ResultVehicleVo {
/**
* 主键(uuid)
*/
private String id;
/**
* 车辆编号,0-没有
*/
private Integer code;
/**
* 车辆状态: 1-正常运行 2-维修 3-报废
*/
private Integer status;
/**
* 车牌号,空字符串-没有
*/
private String numberPlate;
/**
* 品牌(编码,对应关系见相关常量),0-未填写
*/
private Integer brand;
/**
* 所属分支机构(id)
*/
private Integer subordinateBranch;
/**
* 所属分支机构(名称)
*/
private String subBranchName;
/**
* 停靠分支机构(id)
*/
private Integer parkBranchCompanyId;
/**
* 停靠分支机构(名称)
*/
private String parkBranchCompanyName;
/**
* 目的地分支机构(id)
*/
private Integer expectDestinationBranchCompanyId;
/**
* 目的地分支机构(名称)
*/
private String expectDestinationBranchCompanyName;
/**
* 用途类型:租赁房车(1)、展车等,对应关系见车辆常量表
*/
private Integer useType;
/**
* 备注信息
*/
private String remark;
private Date createTime;
private Date updateTime;
/**
* 车架号
*/
private String vin;
/**
* 保险公司,见常量表
*/
private Integer insuranceCompany;
/**
* 保险单号
*/
private String insuranceNo;
/**
* 保险开始时间
*/
private Date insuranceStartDate;
/**
* 保险结束时间
*/
private Date insuranceEndDate;
/**
* 年审时间
*/
private Date annualVerificationDate;
/**
* 保养时间
*/
private Date maintenanceDate;
/**
* 保养公里
*/
private Integer mileage;
/**
* 保养里程数
*/
private Integer maintenanceMileage;
/**
* 车辆所属人-类型
*/
private Integer belongTo;
/**
* 所属人 名称
*/
private String belongToName;
/**
* 行驶证路径
*/
private String drivingLicensePath;
/**
* 发动机号
*/
private String engineNum;
/**
* 生产商
*/
private String manufacturer;
/**
* 收车时间
*/
private Date receiveTime;
}
\ No newline at end of file
...@@ -18,6 +18,7 @@ import com.xxfc.platform.vehicle.mapper.VehiclePlatCataMapper; ...@@ -18,6 +18,7 @@ import com.xxfc.platform.vehicle.mapper.VehiclePlatCataMapper;
import com.xxfc.platform.vehicle.pojo.Cascade; import com.xxfc.platform.vehicle.pojo.Cascade;
import com.xxfc.platform.vehicle.pojo.CataVo; import com.xxfc.platform.vehicle.pojo.CataVo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.assertj.core.util.Arrays; import org.assertj.core.util.Arrays;
import org.springframework.aop.framework.AopContext; import org.springframework.aop.framework.AopContext;
import org.springframework.aop.framework.AopProxyUtils; import org.springframework.aop.framework.AopProxyUtils;
...@@ -109,8 +110,6 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl ...@@ -109,8 +110,6 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
} }
/** /**
* 根据车型获取 * 根据车型获取
* *
...@@ -133,42 +132,43 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl ...@@ -133,42 +132,43 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
} }
/** /**
* 级联添加 * 级联添加
*
* @param cascade * @param cascade
* @return * @return
*/ */
public ObjectRestResponse addCascade(Cascade<VehiclePlatCata> cascade) { public ObjectRestResponse addCascade(Cascade<VehiclePlatCata> cascade) {
//取出一级标签 //取出一级标签
VehiclePlatCata parent = cascade.getParent(); VehiclePlatCata parent = cascade.getParent();
parent.setCrtTime(System.currentTimeMillis()); //取出二级标签
parent.setState(0); List<VehiclePlatCata> childrens = cascade.getChildren();
//插入一级标签获得id
parent.setIsMore(0);
parent.setRank(0);
mapper.insertSelective(parent);
Integer parentId = parent.getId();
//取出二级标签
List<VehiclePlatCata> childrens = cascade.getChildren();
//逐条插入二级标签
for (VehiclePlatCata children : childrens) {
children.setParentId(parentId);
children.setState(0);
children.setCrtTime(System.currentTimeMillis());
}
mapper.addPlatCataList(childrens);
return ObjectRestResponse.succ();
}
if (parent==null||childrens == null) {
throw new BaseException("The tag name cannot be empty!");
}
parent.setCrtTime(System.currentTimeMillis());
//插入一级标签获得id
parent.setIsMore(0);
parent.setRank(0);
mapper.insertSelective(parent);
Integer parentId = parent.getId();
List<VehiclePlatCata> vehiclePlatCatas = childrens.parallelStream().filter(vehiclePlatCata -> {
vehiclePlatCata.setParentId(parentId);
vehiclePlatCata.setCrtTime(System.currentTimeMillis());
return vehiclePlatCata.getState() == 0;
}).filter(vpc -> StringUtils.isNotBlank(vpc.getName())).collect(Collectors.toList());
if (vehiclePlatCatas.size() == 0) {
throw new BaseException("No valid subtag!");
}
mapper.addPlatCataList(vehiclePlatCatas);
return ObjectRestResponse.succ();
}
/** /**
...@@ -193,21 +193,20 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl ...@@ -193,21 +193,20 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
/** /**
* 分页或不分页,获取一级标签及其子标签 * 分页或不分页,获取一级标签及其子标签
* *
*
* @param sort * @param sort
* @param page * @param page
* @param limit * @param limit
* @return * @return
*/ */
public ObjectRestResponse getCascades( Integer page, Integer limit ,Integer sort) { public ObjectRestResponse getCascades(Integer page, Integer limit, Integer sort) {
try { try {
//标签列表页面 //标签列表页面
if (sort==null||sort==0) { if (sort == null || sort == 0) {
return getPage(page, limit); return getPage(page, limit);
} }
//增加车型页面 //增加车型页面
if (sort==1){ if (sort == 1) {
return getList(); return getList();
} }
} catch (Exception e) { } catch (Exception e) {
...@@ -218,13 +217,13 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl ...@@ -218,13 +217,13 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
@Cache(key = RedisKey.BRANCH_COMPANY_CATA_LIST) @Cache(key = RedisKey.BRANCH_COMPANY_CATA_LIST)
private ObjectRestResponse getList() { private ObjectRestResponse getList() {
//获取一级标签 //获取一级标签
Example example = Example.builder(VehiclePlatCata.class) Example example = Example.builder(VehiclePlatCata.class)
.where(WeekendSqls.<VehiclePlatCata>custom() .where(WeekendSqls.<VehiclePlatCata>custom()
.andEqualTo(VehiclePlatCata::getParentId, 0) .andEqualTo(VehiclePlatCata::getParentId, 0)
.andEqualTo(VehiclePlatCata::getState, 0)) .andEqualTo(VehiclePlatCata::getState, 0))
.orderByAsc("isMore","rank") .orderByAsc("isMore", "rank")
.build(); .build();
//分页查询父类 //分页查询父类
List<VehiclePlatCata> parentvpcs = mapper.selectByExample(example); List<VehiclePlatCata> parentvpcs = mapper.selectByExample(example);
...@@ -233,6 +232,7 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl ...@@ -233,6 +232,7 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
return ObjectRestResponse.succ(cascades); return ObjectRestResponse.succ(cascades);
} }
@Cache(key = RedisKey.BRANCH_COMPANY_CATA_PAGE) @Cache(key = RedisKey.BRANCH_COMPANY_CATA_PAGE)
private ObjectRestResponse getPage(Integer page, Integer limit) { private ObjectRestResponse getPage(Integer page, Integer limit) {
//获取一级标签 //获取一级标签
...@@ -299,29 +299,31 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl ...@@ -299,29 +299,31 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
/** /**
* 更新和添加 * 更新和添加
*
* @param cas * @param cas
* @return * @return
*/ */
@Transactional @Transactional
public ObjectRestResponse updateAndAdd( Cascade<VehiclePlatCata> cas) { public ObjectRestResponse updateAndAdd(Cascade<VehiclePlatCata> cas) {
if (cas==null||cas.getParent()==null) { if (cas == null || cas.getParent() == null) {
return ObjectRestResponse.createDefaultFail(); return ObjectRestResponse.createDefaultFail();
} }
//通过判断一级标签是否有id来判断是更新还是添加 //通过判断一级标签是否有id来判断是更新还是添加
if (cas.getParent().getId()==null||cas.getParent().getId()==0) { if (cas.getParent().getId() == null || cas.getParent().getId() == 0) {
return addCascade(cas); return addCascade(cas);
}else{ } else {
return updateCascade(cas); return updateCascade(cas);
} }
} }
/** /**
* 修改 * 修改
*
* @param cas * @param cas
* @return * @return
*/ */
...@@ -330,39 +332,50 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl ...@@ -330,39 +332,50 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
try { try {
VehiclePlatCata parentVPC = cas.getParent(); VehiclePlatCata parentVPC = cas.getParent();
List<VehiclePlatCata> children = cas.getChildren();
if (children == null || parentVPC == null) {
throw new BaseException("The tag name cannot be empty!");
}
//设置更新时间 //设置更新时间
parentVPC.setUpdTime(System.currentTimeMillis()); parentVPC.setUpdTime(System.currentTimeMillis());
//更新一级标签 //更新一级标签
updateSelectiveById(parentVPC); updateSelectiveById(parentVPC);
//获取子标签签 //获取子标签签
List<VehiclePlatCata> children = cas.getChildren();
//判断是否有子标签
if (children==null||children.size()==0) {
return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"无子标签");
}
//过滤无用数据
List<VehiclePlatCata> VehiclePlatCatas = children.parallelStream()
.filter(vpc -> vpc.getId() != null || vpc.getState() == 0)
.filter(vpc -> StringUtils.isNotBlank(vpc.getName()))
.collect(Collectors.toList());
//判断有效数据是否为空
if (VehiclePlatCatas.size() == 0) {
throw new BaseException("No valid subtag!");
}
//遍历 //遍历
for (VehiclePlatCata child : children) { for (VehiclePlatCata VehiclePlatCata : VehiclePlatCatas) {
//判断子标签是更新还是新增 //判断子标签是更新还是新增
if (child.getId()==null||child.getId()==0){ if (VehiclePlatCata.getId() == null || VehiclePlatCata.getId() == 0) {
child.setState(0); VehiclePlatCata.setUpdTime(System.currentTimeMillis());
child.setUpdTime(System.currentTimeMillis()); VehiclePlatCata.setParentId(parentVPC.getParentId());
//添加 //添加
insertSelective(child); insertSelective(VehiclePlatCata);
}else { } else {
//判断是否是删除 //判断是否是删除
if (child.getState()==1) {
Integer id = child.getId(); if (VehiclePlatCata.getState() == 1) {
Integer id = VehiclePlatCata.getId();
VehicleCata vehicleCata = new VehicleCata(); VehicleCata vehicleCata = new VehicleCata();
vehicleCata.setCataId(id); vehicleCata.setCataId(id);
//修改车型和标签的中间表 //修改车型和标签的中间表
vehicleCata.setIsdel(1); vehicleCata.setIsdel(1);
vehicleCataBiz.updateIsdalByVehicleCataId(vehicleCata); vehicleCataBiz.updateIsdalByVehicleCataId(vehicleCata);
} }
//更新 //更新
child.setUpdTime(System.currentTimeMillis()); VehiclePlatCata.setUpdTime(System.currentTimeMillis());
updateSelectiveById(child); updateSelectiveById(VehiclePlatCata);
} }
} }
...@@ -376,34 +389,36 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl ...@@ -376,34 +389,36 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
/** /**
* 修改rank * 修改rank
*
* @param id * @param id
* @param rank * @param rank
* @return * @return
*/ */
public ObjectRestResponse updateParentRank(Integer id, Integer rank){ public ObjectRestResponse updateParentRank(Integer id, Integer rank) {
try { try {
VehiclePlatCata vehiclePlatCata = new VehiclePlatCata(); VehiclePlatCata vehiclePlatCata = new VehiclePlatCata();
vehiclePlatCata.setId(id); vehiclePlatCata.setId(id);
vehiclePlatCata.setRank(rank); vehiclePlatCata.setRank(rank);
updateSelectiveById(vehiclePlatCata); updateSelectiveById(vehiclePlatCata);
return ObjectRestResponse.succ(); return ObjectRestResponse.succ();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return ObjectRestResponse.createDefaultFail(); return ObjectRestResponse.createDefaultFail();
} }
} }
/** /**
* 查询当前车型拥有的标签 * 查询当前车型拥有的标签
*
* @param ids * @param ids
* @return * @return
*/ */
public ObjectRestResponse getCatasByIds( String ids){ public ObjectRestResponse getCatasByIds(String ids) {
Example exa = Example.builder(VehiclePlatCata.class).where( Example exa = Example.builder(VehiclePlatCata.class).where(
WeekendSqls.<VehiclePlatCata>custom() WeekendSqls.<VehiclePlatCata>custom()
.andIn(VehiclePlatCata::getId, Arrays.asList(ids.split(","))) .andIn(VehiclePlatCata::getId, Arrays.asList(ids.split(",")))
.andEqualTo(VehiclePlatCata::getState,0) .andEqualTo(VehiclePlatCata::getState, 0)
).build(); ).build();
List<VehiclePlatCata> vehiclePlatCatas = selectByExample(exa); List<VehiclePlatCata> vehiclePlatCatas = selectByExample(exa);
return ObjectRestResponse.succ(vehiclePlatCatas); return ObjectRestResponse.succ(vehiclePlatCatas);
...@@ -411,55 +426,58 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl ...@@ -411,55 +426,58 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
/** /**
* 删除一级标签及其子标签 * 删除一级标签及其子标签
*
* @param id * @param id
* @return * @return
*/ */
@Transactional @Transactional
public ObjectRestResponse deleteCascadeById(Integer id){ public ObjectRestResponse deleteCascadeById(Integer id) {
//修改一级标签 //修改一级标签
VehiclePlatCata vehiclePlatCata = new VehiclePlatCata(); VehiclePlatCata vehiclePlatCata = new VehiclePlatCata();
vehiclePlatCata.setId(id); vehiclePlatCata.setId(id);
vehiclePlatCata.setState(1); vehiclePlatCata.setState(1);
updateSelectiveById(vehiclePlatCata); updateSelectiveById(vehiclePlatCata);
//修改子标签 //修改子标签
VehiclePlatCata vpc = new VehiclePlatCata(); VehiclePlatCata vpc = new VehiclePlatCata();
vpc.setState(1); vpc.setState(1);
mapper.updateByExampleSelective(vpc,Example.builder(VehiclePlatCata.class) mapper.updateByExampleSelective(vpc, Example.builder(VehiclePlatCata.class)
.andWhere(WeekendSqls.<VehiclePlatCata>custom() .andWhere(WeekendSqls.<VehiclePlatCata>custom()
.andEqualTo(VehiclePlatCata::getParentId,id)).build()); .andEqualTo(VehiclePlatCata::getParentId, id)).build());
return ObjectRestResponse.succ(); return ObjectRestResponse.succ();
} }
/** /**
* 修改客户端查询条件 * 修改客户端查询条件
*
* @param id * @param id
* @param startUsing * @param startUsing
* @return * @return
*/ */
@Transactional @Transactional
public ObjectRestResponse setStartUsingById(Integer id, Integer startUsing){ public ObjectRestResponse setStartUsingById(Integer id, Integer startUsing) {
VehiclePlatCata vehiclePlatCata = new VehiclePlatCata(); VehiclePlatCata vehiclePlatCata = new VehiclePlatCata();
vehiclePlatCata.setId(id); vehiclePlatCata.setId(id);
vehiclePlatCata.setStartUsing(startUsing); vehiclePlatCata.setStartUsing(startUsing);
updateSelectiveById(vehiclePlatCata); updateSelectiveById(vehiclePlatCata);
return ObjectRestResponse.succ(); return ObjectRestResponse.succ();
} }
/** /**
* 修改单选还是多选 * 修改单选还是多选
*
* @param id * @param id
* @param isMore * @param isMore
* @return * @return
*/ */
@Transactional @Transactional
public ObjectRestResponse setIsore(Integer id, Integer isMore){ public ObjectRestResponse setIsore(Integer id, Integer isMore) {
VehiclePlatCata vehiclePlatCata = new VehiclePlatCata(); VehiclePlatCata vehiclePlatCata = new VehiclePlatCata();
vehiclePlatCata.setId(id); vehiclePlatCata.setId(id);
vehiclePlatCata.setIsMore(isMore); vehiclePlatCata.setIsMore(isMore);
updateSelectiveById(vehiclePlatCata); updateSelectiveById(vehiclePlatCata);
return ObjectRestResponse.succ(); return ObjectRestResponse.succ();
} }
} }
...@@ -11,9 +11,9 @@ import java.util.Map; ...@@ -11,9 +11,9 @@ import java.util.Map;
public interface VehicleMapper extends Mapper<Vehicle> { public interface VehicleMapper extends Mapper<Vehicle> {
public List<QueryVehicleVo> getByPage(Map<String, Object> params); public List<ResultVehicleVo> getByPage(Map<String, Object> params);
public List<QueryVehicleVo> getByPageNotAllData(Map<String, Object> params); public List<ResultVehicleVo> getByPageNotAllData(Map<String, Object> params);
public int updateStatusById(Map<String, Object> params); public int updateStatusById(Map<String, Object> params);
......
...@@ -30,15 +30,21 @@ ...@@ -30,15 +30,21 @@
<select id="getByPage" parameterType="java.util.Map" <select id="getByPage" parameterType="java.util.Map"
resultType="com.xxfc.platform.vehicle.pojo.QueryVehicleVo"> resultType="com.xxfc.platform.vehicle.pojo.ResultVehicleVo">
SELECT r.* FROM ( SELECT r.* FROM (
select DISTINCT v.`id`, select DISTINCT v.`id`,
v.`code`, v.`code`,
v.`status`, v.`status`,
v.number_plate, v.number_plate,
v.brand, v.brand,
IFNULL(v.park_branch_company_id,v.expect_destination_branch_company_id) AS subordinate_branch, -- IFNULL(v.park_branch_company_id,v.expect_destination_branch_company_id) AS subordinate_branch,
IFNULL(bc.name,bc1.name) AS subBranchName, -- IFNULL(bc.name,bc1.name) AS subBranchName,
v.park_branch_company_id,
bc.name as parkBranchCompanyName,
v.expect_destination_branch_company_id,
bc1.name as expectDestinationBranchCompanyName,
v.subordinate_branch,
bc2.name as subBranchName,
v.use_type, v.use_type,
v.remark, v.remark,
v.create_time, v.create_time,
...@@ -66,8 +72,14 @@ ...@@ -66,8 +72,14 @@
left join left join
vehicle_book_info vbi on v.`id` = vbi.vehicle vehicle_book_info vbi on v.`id` = vbi.vehicle
</if> </if>
-- LEFT JOIN branch_company bc ON v.park_branch_company_id = bc.id
-- LEFT JOIN branch_company bc1 ON v.expect_destination_branch_company_id = bc1.id
-- 停车分公司
LEFT JOIN branch_company bc ON v.park_branch_company_id = bc.id LEFT JOIN branch_company bc ON v.park_branch_company_id = bc.id
-- 目的地分公司
LEFT JOIN branch_company bc1 ON v.expect_destination_branch_company_id = bc1.id LEFT JOIN branch_company bc1 ON v.expect_destination_branch_company_id = bc1.id
-- 所属分公司
LEFT JOIN branch_company bc2 ON v.subordinate_branch = bc2.id
where where
v.is_del=0 v.is_del=0
<if test="mRangeDateEnd !=null"> <if test="mRangeDateEnd !=null">
...@@ -127,11 +139,12 @@ ...@@ -127,11 +139,12 @@
</foreach> </foreach>
</if> </if>
<if test="subordinateBranch !=null "> <if test="subordinateBranch !=null ">
and ( v.park_branch_company_id = #{subordinateBranch} or v.expect_destination_branch_company_id=#{subordinateBranch} ) and ( v.park_branch_company_id = #{subordinateBranch} or
v.expect_destination_branch_company_id=#{subordinateBranch} )
</if> </if>
<if test=" addrProvince !=null or addrCity !=null or zoneId !=null "> <if test=" addrProvince !=null or addrCity !=null or zoneId !=null ">
and ( and (
<trim suffixOverrides="OR"> <trim suffixOverrides="OR">
<if test="addrProvince !=null"> <if test="addrProvince !=null">
(bc.addr_province=#{addrProvince} or bc1.addr_province=#{addrProvince}) OR (bc.addr_province=#{addrProvince} or bc1.addr_province=#{addrProvince}) OR
</if> </if>
...@@ -141,23 +154,29 @@ ...@@ -141,23 +154,29 @@
<if test="zoneId !=null"> <if test="zoneId !=null">
(bc.zone_id=#{zoneId} or bc1.zone_id=#{zoneId}) OR (bc.zone_id=#{zoneId} or bc1.zone_id=#{zoneId}) OR
</if> </if>
</trim> </trim>
) )
</if> </if>
order by v.code order by v.code
) r ORDER BY r.subBranchName ) r ORDER BY r.subBranchName
</select> </select>
<select id="getByPageNotAllData" parameterType="java.util.Map" <select id="getByPageNotAllData" parameterType="java.util.Map"
resultType="com.xxfc.platform.vehicle.pojo.QueryVehicleVo"> resultType="com.xxfc.platform.vehicle.pojo.ResultVehicleVo">
SELECT r.* FROM ( SELECT r.* FROM (
select DISTINCT v.`id`, select DISTINCT v.`id`,
v.`code`, v.`code`,
v.`status`, v.`status`,
v.number_plate, v.number_plate,
v.brand, v.brand,
IFNULL(v.park_branch_company_id,v.expect_destination_branch_company_id) AS subordinate_branch, -- IFNULL(v.park_branch_company_id,v.expect_destination_branch_company_id) AS subordinate_branch,
IFNULL(bc.name,bc1.name) AS subBranchName, -- IFNULL(bc.name,bc1.name) AS subBranchName,
v.park_branch_company_id,
bc.name as parkBranchCompanyName,
v.expect_destination_branch_company_id,
bc1.name as expectDestinationBranchCompanyName,
v.subordinate_branch,
bc2.name as subBranchName,
v.use_type, v.use_type,
v.remark, v.remark,
v.create_time, v.create_time,
...@@ -185,24 +204,36 @@ ...@@ -185,24 +204,36 @@
left join left join
vehicle_book_info vbi on v.`id` = vbi.vehicle vehicle_book_info vbi on v.`id` = vbi.vehicle
</if> </if>
-- 停车分公司
LEFT JOIN branch_company bc ON v.park_branch_company_id = bc.id LEFT JOIN branch_company bc ON v.park_branch_company_id = bc.id
-- 目的地分公司
LEFT JOIN branch_company bc1 ON v.expect_destination_branch_company_id = bc1.id LEFT JOIN branch_company bc1 ON v.expect_destination_branch_company_id = bc1.id
-- 所属分公司
LEFT JOIN branch_company bc2 ON v.subordinate_branch = bc2.id
where where
v.is_del=0 v.is_del=0
<if test="companyList != null"> <if test="companyList != null">
and ( v.park_branch_company_id in ( and ( v.park_branch_company_id in (
<trim suffixOverrides=","> <trim suffixOverrides=",">
<foreach collection="companyList" item="companyId"> <foreach collection="companyList" item="companyId">
#{companyId}, #{companyId},
</foreach> </foreach>
</trim> </trim>
) )
or v.expect_destination_branch_company_id in ( or v.expect_destination_branch_company_id in (
<trim suffixOverrides=","> <trim suffixOverrides=",">
<foreach collection="companyList" item="companyId"> <foreach collection="companyList" item="companyId">
#{companyId},
</foreach>
</trim>
)
or v.subordinate_branch in (
<trim suffixOverrides=",">
<foreach collection="companyList" item="companyId">
#{companyId}, #{companyId},
</foreach> </foreach>
</trim> </trim>
)
) )
) )
</if> </if>
...@@ -262,7 +293,8 @@ ...@@ -262,7 +293,8 @@
</foreach> </foreach>
</if> </if>
<if test="subordinateBranch !=null "> <if test="subordinateBranch !=null ">
and ( v.park_branch_company_id = #{subordinateBranch} or v.expect_destination_branch_company_id=#{subordinateBranch} ) and ( v.park_branch_company_id = #{subordinateBranch} or
v.expect_destination_branch_company_id=#{subordinateBranch} )
</if> </if>
<if test=" addrProvince !=null or addrCity !=null or zoneId !=null "> <if test=" addrProvince !=null or addrCity !=null or zoneId !=null ">
and ( and (
...@@ -274,7 +306,7 @@ ...@@ -274,7 +306,7 @@
(bc.addr_city=#{addrProvince} or bc1.addr_city=#{addrProvince}) OR (bc.addr_city=#{addrProvince} or bc1.addr_city=#{addrProvince}) OR
</if> </if>
<if test="zoneId !=null"> <if test="zoneId !=null">
(bc.zone_id=#{zoneId} or bc1.zone_id=#{zoneId}) OR (bc.zone_id=#{zoneId} or bc1.zone_id=#{zoneId}) OR
</if> </if>
</trim> </trim>
) )
......
...@@ -10,9 +10,11 @@ ...@@ -10,9 +10,11 @@
parent_id,name,icon,depict,rank,level,state,crt_time,upd_time,isMore,start_using parent_id,name,icon,depict,rank,level,state,crt_time,upd_time,isMore,start_using
) VALUES ) VALUES
<foreach collection ="vpclist" item="vpc" index="index" separator =","> <foreach collection ="vpclist" item="vpc" index="index" separator =",">
<if test="vpc.state == 0" >
(#{vpc.parentId},#{vpc.name},#{vpc.icon},#{vpc.depict} (#{vpc.parentId},#{vpc.name},#{vpc.icon},#{vpc.depict}
,#{vpc.rank},#{vpc.level},#{vpc.state},#{vpc.crtTime} ,#{vpc.rank},#{vpc.level},#{vpc.state},#{vpc.crtTime}
,#{vpc.updTime},#{vpc.isMore},#{vpc.startUsing}) ,#{vpc.updTime},#{vpc.isMore},#{vpc.startUsing})
</if>
</foreach> </foreach>
</insert> </insert>
......
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