问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@@ -52,6 +52,16 @@ public interface BaseVehicleFeign {
     @PostMapping("/pagerList")
     public ResultBean<PagerVo<BaseVehicleVo>> pagerList(@RequestBody PagerQuery<BaseVehicleQuery> pq);
 
+    /**
+     * 按照组织层级分页查询
+     *
+     * @param pq
+     * @return
+     */
+    @ApiOperation("车辆信息按照组织层级分页查询")
+    @PostMapping("/pagerListByOrgSidPath")
+    public ResultBean<PagerVo<BaseVehicleVo>> pagerListByOrgSidPath(@RequestBody PagerQuery<BaseVehicleQuery> pq);
+
     /**
      * 新增保存
      *

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@@ -38,6 +38,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return rb.setMsg("接口anrui-base/basevehicle/pagerList无法访问");
     }
 
+    @Override
+    public ResultBean<PagerVo<BaseVehicleVo>> pagerListByOrgSidPath(PagerQuery<BaseVehicleQuery> pq) {
+        return null;
+    }
+
     @Override
     public ResultBean save(BaseVehicleDto dto) {
         return ResultBean.fireFail().setMsg("接口anrui-base/basevehicle/save无法访问");

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java

@@ -26,6 +26,8 @@ public class BaseVehicleQuery implements Query {
 
     @ApiModelProperty(value = "分公司sid")
     private String createOrgSid;
+    @ApiModelProperty(value = "组织全路径")
+    private String orgSidPath;
     @ApiModelProperty(value = "车架号")
     private String vinNo;
     @ApiModelProperty(value = "车型名称")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java

@@ -26,6 +26,8 @@ import java.util.Date;
 @Data
 public class BaseVehicleVo implements Vo {
 
+    @ApiModelProperty("组织全路径")
+    private String orgSidPath;
     @ApiModelProperty("发动机号")
     private String engineNo;
     @ApiModelProperty(value = "备注")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -13,6 +13,7 @@
     <!--分页列表-->
     <select id="pagerList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
         SELECT distinct
+        so.orgSidPath,
         bv.sid,
         bv.modelSid,
         bv.engineNo,
@@ -106,6 +107,7 @@
         LEFT JOIN base_model_config bmc ON bv.`modelConfigSid` = bmc.`sid`
         LEFT JOIN base_vehicle_certificate bvcf ON bv.`sid` = bvcf.`vehicleSid`
         LEFT JOIN base_vehmodel_config bvc ON bvm.`sid` = bvc.`modelSid`
+        LEFT JOIN anrui_portal.sys_organization so ON bv.createOrgSid = so.sid
         <where>
             ${ew.sqlSegment}
         </where>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -176,6 +176,54 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return rb.success().setData(pv1);
     }
 
+    @Override
+    public ResultBean<PagerVo<BaseVehicleVo>> pagerListByOrgSidPath(PagerQuery<BaseVehicleQuery> pq) {
+        ResultBean<PagerVo<BaseVehicleVo>> rb = ResultBean.fireFail();
+        IPage<BaseVehicleVo> page = baseVehicleService.pagerListByOrgSidPath(pq);
+        List<BaseVehicleVo> records = page.getRecords();
+        for (BaseVehicleVo record : records) {
+            //厂家库龄
+            if (record.getPriceDate() != null) {
+                Date priceDate = record.getPriceDate();
+                String today = DateUtil.today();
+                DateTime currentDate = DateUtil.parse(today);
+                int i = priceDate.compareTo(currentDate);
+                long betweenDay = DateUtil.between(priceDate, currentDate, DateUnit.DAY);
+                record.setLibraryAge(betweenDay * i * -1);
+            }
+            //公司库龄
+            if (record.getArrivalDate() != null) {
+                Date arrivalDate = record.getArrivalDate();
+                String today = DateUtil.today();
+                DateTime currentDate = DateUtil.parse(today);
+                int i = arrivalDate.compareTo(currentDate);
+                long betweenDay = DateUtil.between(arrivalDate, currentDate, DateUnit.DAY);
+                record.setOrgLibraryAge(betweenDay * i * -1);
+            }
+            //买断库龄
+            if (record.getSolidDate() != null) {
+                Date solidDate = record.getSolidDate();
+                String today = DateUtil.today();
+                DateTime currentDate = DateUtil.parse(today);
+                int i = solidDate.compareTo(currentDate);
+                long betweenDay = DateUtil.between(solidDate, currentDate, DateUnit.DAY);
+                record.setSettlementLibraryAge(betweenDay * i * -1);
+            }
+            String vinNo = record.getVinNo();
+            if (StringUtils.isNotBlank(vinNo)) {
+                record.setLastVinNo(vinNo.substring(vinNo.length() - 8));
+            }
+            String modelSid = record.getModelSid();
+            String modelConfigSid = record.getModelConfigSid();
+            String createOrgSid = record.getCreateOrgSid();
+            BaseVehmodelVo data = baseVehmodelConfigService.selectOne(modelSid, modelConfigSid, createOrgSid).getData();
+            record.setManufactorSettlementPrice(data.getManufactorSettlementPrice());
+        }
+        PagerVo<BaseVehicleVo> pv = new PagerVo<>();
+        PagerVo<BaseVehicleVo> pv1 = PagerUtil.pageToVo(page, pv);
+        return rb.success().setData(pv1);
+    }
+
     @Override
     public ResultBean save(BaseVehicleDto dto) {
         ResultBean rb = ResultBean.fireFail();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -121,6 +121,153 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         return baseMapper.pagerList(page, qw);
     }
 
+    public IPage<BaseVehicleVo> pagerListByOrgSidPath(PagerQuery<BaseVehicleQuery> pq) {
+        IPage<BaseVehicleQuery> page = PagerUtil.queryToPage(pq);
+        BaseVehicleQuery pagerQuery = pq.getParams();
+        QueryWrapper<BaseVehicleVo> qw = new QueryWrapper<>();
+        String orgSidPath = pagerQuery.getOrgSidPath();
+        SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
+        String orgLevelKey = data.getOrgLevelKey();
+        if ("2".equals(orgLevelKey)){
+            orgSidPath = orgSidPath.substring(0,73);
+            qw.like("so.orgSidPath",orgSidPath);
+        }else if ("3".equals(orgLevelKey)){
+            qw.eq("bv.createOrgSid",pagerQuery.getCreateOrgSid());
+        }
+        qw.eq("bv.isDelete", "0");
+        if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {//车架号
+            qw.like("bv.vinNo", pagerQuery.getVinNo());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getModelName())) {//车型名称
+            qw.like("bv.modelName", pagerQuery.getModelName());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getLocation())) {//存放地点
+            qw.like("bv.location", pagerQuery.getLocation());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getVehicleState())) {//库存状态
+            qw.eq("bv.vehicleState", pagerQuery.getVehicleState());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getCertificateStateValue())) {//合格证状态value
+            qw.eq("bvcf.certificateStateValue", pagerQuery.getCertificateStateValue());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getInsideCode())) {//内部编码
+            qw.like("bv.insideCode", pagerQuery.getInsideCode());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getManPurOrderTypeKey())) {//采购类型
+            qw.eq("bv.manPurOrderTypeKey", pagerQuery.getManPurOrderTypeKey());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getPriceDate())) {//厂家入库日期
+            qw.eq("bv.priceDate", pagerQuery.getPriceDate());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getSettlementStatus())) {//买断状态
+            qw.eq("bv.settlementStatus", pagerQuery.getSettlementStatus());
+        }
+        //车型字段
+        if (StringUtils.isNotBlank(pagerQuery.getCarBrand())) {//品牌
+            qw.eq("bvm.carBrand", pagerQuery.getCarBrand());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getVehicleType())) {//功能
+            qw.eq("bvm.vehicleType", pagerQuery.getVehicleType());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getProductLine())) {//系列
+            qw.eq("bvm.productLine", pagerQuery.getProductLine());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getDriveForm())) {//驱动
+            qw.eq("bvm.driveForm", pagerQuery.getDriveForm());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getPower())) {//马力
+            qw.eq("bvm.power", pagerQuery.getPower());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getVehicleVersion())) {//版本
+            qw.eq("bvm.vehicleVersion", pagerQuery.getVehicleVersion());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getFuelType())) {//燃料
+            qw.eq("bvm.fuelType", pagerQuery.getFuelType());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getVehicleTypeCode())) {//车型编码
+            qw.like("bvm.vehicleTypeCode", pagerQuery.getVehicleTypeCode());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getGearboxType())) {//变速箱
+            qw.eq("bvm.gearboxType", pagerQuery.getGearboxType());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getEmissionStandard())) {//排放标准
+            qw.eq("bvm.emissionStandard", pagerQuery.getEmissionStandard());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getEngineType())) {//发动机型号
+            qw.eq("bvm.engineType", pagerQuery.getEngineType());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getMarketSegments())) {//细分市场
+            qw.eq("bvm.marketSegments", pagerQuery.getMarketSegments());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getSpecifications())) {//规格型号
+            qw.like("bvm.specifications", pagerQuery.getSpecifications());
+        }
+        //车型配置字段
+        if (StringUtils.isNotBlank(pagerQuery.getCarColorKey())) {//颜色
+            qw.eq("bmc.carColorKey", pagerQuery.getCarColorKey());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getSlowMachineKey())) {//缓速器
+            qw.eq("bmc.slowMachineKey", pagerQuery.getSlowMachineKey());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getRearViewMirrorKey())) {//后视镜
+            qw.eq("bmc.rearViewMirrorKey", pagerQuery.getRearViewMirrorKey());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getSpecificationKey())) {//驾驶室
+            qw.eq("bmc.specificationKey", pagerQuery.getSpecificationKey());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getRearAxleKey())) {//后桥
+            qw.eq("bmc.rearAxleKey", pagerQuery.getRearAxleKey());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getRearAxleRatioKey())) {//速比
+            qw.eq("bmc.rearAxleRatioKey", pagerQuery.getRearAxleRatioKey());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getAirConditionerKey())) {//空调
+            qw.eq("bmc.airConditionerKey", pagerQuery.getAirConditionerKey());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getHubMaterialKey())) {//轮毂材质
+            qw.eq("bmc.hubMaterialKey", pagerQuery.getHubMaterialKey());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getBaffleModelKey())) {//导流罩
+            qw.eq("bmc.baffleModelKey", pagerQuery.getBaffleModelKey());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getSuspensionKey())) {//悬架
+            qw.eq("bmc.suspensionKey", pagerQuery.getSuspensionKey());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getSeatKey())) {//座椅
+            qw.eq("bmc.seatKey", pagerQuery.getSeatKey());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getTireCoverKey())) {//护轮罩
+            qw.eq("bmc.tireCoverKey", pagerQuery.getTireCoverKey());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getSaddleKey())) {//鞍座
+            qw.eq("bmc.saddleKey", pagerQuery.getSaddleKey());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getWheelbaseKey())) {//轴距
+            qw.eq("bmc.wheelbaseKey", pagerQuery.getWheelbaseKey());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getBumperKey())) {//保险杠
+            qw.eq("bmc.bumperKey", pagerQuery.getBumperKey());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getConfiguringBaoKey())) {//配置包
+            qw.eq("bmc.configuringBaoKey", pagerQuery.getConfiguringBaoKey());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getIndependentSourcesKey())) {//独立热源
+            qw.eq("bmc.independentSourcesKey", pagerQuery.getIndependentSourcesKey());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getFuelTankKey())) {//燃料箱
+            qw.eq("bmc.fuelTankKey", pagerQuery.getFuelTankKey());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getMultimediaKey())) {//多媒体
+            qw.eq("bmc.multimediaKey", pagerQuery.getMultimediaKey());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getConfigName())) {//常用配置名称
+            qw.eq("bmc.configName", pagerQuery.getConfigName());
+        }
+        qw.orderByDesc("bv.createOrgSid");
+        qw.orderByDesc("bv.priceDate");
+        return baseMapper.pagerList(page, qw);
+    }
+
     /**
      * 构造条件
      *
@@ -2866,4 +3013,6 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         PagerVo<PayBaseVehicleVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganization.java

@@ -25,13 +25,13 @@ import lombok.Data;
 public class SysOrganization extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    
+
 	@ApiModelProperty("部门/组织名称")
     private String name;
-    
+
 	@ApiModelProperty("父(部门/组织) sid")
     private String psid;
-    
+
 	@ApiModelProperty("联系电话")
     private String linkPhone;
 	@ApiModelProperty("联系人")
@@ -39,22 +39,22 @@ public class SysOrganization extends BaseEntity {
 
 	@ApiModelProperty("部门sid全路径")
     private String orgSidPath;
-    
+
 	@ApiModelProperty("排序")
     private Integer sort;
-    
+
 	@ApiModelProperty("地址")
     private String addrs;
-    
+
 	@ApiModelProperty("地理位置经纬度")
     private String jwd;
-    
+
 	@ApiModelProperty("二维码")
     private String qrText;
-    
+
 	@ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己")
     private Integer limitOrgMember;
-    
+
 	@ApiModelProperty("部门编码")
     private String orgCode;
 
@@ -75,4 +75,13 @@ public class SysOrganization extends BaseEntity {
 
     @ApiModelProperty("组织属性value")
     private String orgAttributeValue;
+
+    @ApiModelProperty("管理层级key")
+    private String orgLevelKey;
+
+    @ApiModelProperty("管理层级value")
+    private String orgLevelValue;
+
+    @ApiModelProperty("其他编码")
+    private String otherCode;
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationDto.java

@@ -79,4 +79,13 @@ public class SysOrganizationDto implements Dto {
 
     @ApiModelProperty("组织属性value")
     private String orgAttributeValue;
+
+    @ApiModelProperty("管理层级key")
+    private String orgLevelKey;
+
+    @ApiModelProperty("管理层级value")
+    private String orgLevelValue;
+
+    @ApiModelProperty("其他编码")
+    private String otherCode;
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@@ -154,4 +154,9 @@ public interface SysOrganizationFeign {
     @ResponseBody
     @ApiOperation("所有分公司sid")
     ResultBean<List<SysOrganizationVo>> selectOrgSidList();
+
+    @GetMapping("/selectByOrgSidPath")
+    @ResponseBody
+    @ApiOperation("组织层级分页查询")
+    ResultBean<SysOrganizationVo> selectByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath);
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@@ -157,4 +157,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
     public ResultBean<List<SysOrganizationVo>> selectOrgSidList() {
         return null;
     }
+
+    @Override
+    public ResultBean<SysOrganizationVo> selectByOrgSidPath(String orgSidPath) {
+        return null;
+    }
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationVo.java

@@ -77,4 +77,10 @@ public class SysOrganizationVo implements Vo {
     private String orgAttributeKey;
     @ApiModelProperty("组织属性value")
     private String orgAttributeValue;
+    @ApiModelProperty("管理层级key")
+    private String orgLevelKey;
+    @ApiModelProperty("管理层级value")
+    private String orgLevelValue;
+    @ApiModelProperty("其他编码")
+    private String otherCode;
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java

@@ -113,4 +113,7 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
     SysOrganizationVo selectByPSid(@Param("sid") String sid, @Param("name") String name);
 
     List<SysOrganizationVo> selectOrgSidList();
+
+    @Select("select * from sys_organization where orgSidPath = #{orgSidPath}")
+    SysOrganizationVo selectByOrgSidPath(String orgSidPath);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -380,4 +380,9 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         List<SysOrganizationVo> stringList = sysOrganizationService.selectOrgSidList();
         return rb.success().setData(stringList);
     }
+
+    @Override
+    public ResultBean<SysOrganizationVo> selectByOrgSidPath(String orgSidPath) {
+        return sysOrganizationService.selectByOrgSidPath(orgSidPath);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -519,4 +519,10 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
     public List<SysOrganizationVo> selectOrgSidList() {
         return baseMapper.selectOrgSidList();
     }
+
+    public ResultBean<SysOrganizationVo> selectByOrgSidPath(String orgSidPath) {
+        ResultBean<SysOrganizationVo> rb = ResultBean.fireFail();
+        SysOrganizationVo sysOrganizationVo = baseMapper.selectByOrgSidPath(orgSidPath);
+        return rb.success().setData(sysOrganizationVo);
+    }
 }