问题修改

3 years ago · 08a3d82bff
5 changed files with 175 additions and 10 deletions
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java
@ -35,7 +35,7 @@ import java.util.Map;
 public interface BaseManufacturerFeign {

    /**
-     * 分页列表
+     * 主机厂分页列表
     *
     * @param pagerQuery 查询条件
     * @return
@ -45,6 +45,17 @@ public interface BaseManufacturerFeign {
    @ResponseBody
    public ResultBean<PagerVo<BaseManufacturerVo>> pagerList(@RequestBody PagerQuery<BaseManufacturerQuery> pagerQuery);

+    /**
+     * 公司供应商分页列表
+     *
+     * @param pagerQuery 查询条件
+     * @return
+     */
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/gysPagerList")
+    @ResponseBody
+    public ResultBean<PagerVo<BaseManufacturerVo>> gysPagerList(@RequestBody PagerQuery<BaseManufacturerQuery> pagerQuery);
+
    /**
     * 新增保存
     *
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java
@ -30,6 +30,11 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
        return null;
    }

+    @Override
+    public ResultBean<PagerVo<BaseManufacturerVo>> gysPagerList(PagerQuery<BaseManufacturerQuery> pagerQuery) {
+        return null;
+    }
+
    @Override
    public ResultBean save(BaseManufacturerAllDto dto) {
        return ResultBean.fireFail().setMsg("接口anrui-base/basemanufacturer/save无法访问");
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java
@ -64,6 +64,15 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
        return rb.success().setData(pv1);
    }

+    @Override
+    public ResultBean<PagerVo<BaseManufacturerVo>> gysPagerList(PagerQuery<BaseManufacturerQuery> pagerQuery) {
+        ResultBean<PagerVo<BaseManufacturerVo>> rb = ResultBean.fireFail();
+        IPage<BaseManufacturerVo> page = baseManufacturerService.gysPagerList(pagerQuery);
+        PagerVo<BaseManufacturerVo> pv = new PagerVo<>();
+        PagerVo<BaseManufacturerVo> pv1 = PagerUtil.pageToVo(page, pv);
+        return rb.success().setData(pv1);
+    }
+
    @Override
    public ResultBean save(BaseManufacturerAllDto dto) {
        return baseManufacturerService.saveAll(dto);
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
@ -65,6 +65,30 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
        return baseMapper.pagerList(page, qw);
    }

+    public IPage<BaseManufacturerVo> gysPagerList(PagerQuery<BaseManufacturerQuery> pagerQuery) {
+        IPage<BaseManufacturerQuery> page = PagerUtil.queryToPage(pagerQuery);
+        QueryWrapper<BaseManufacturerVo> qw = new QueryWrapper<>();
+        BaseManufacturerQuery params = pagerQuery.getParams();
+        if (pagerQuery != null) {
+            if (StringUtils.isNotBlank(params.getManufacturerName())) {//厂商名称
+                qw.like("bm.manufacturerName", params.getManufacturerName());
+            }
+            if (StringUtils.isNotBlank(params.getSupplierType())) {//厂商分类key
+                qw.eq("bm.supplierType", params.getSupplierType());
+            }
+            if (StringUtils.isNotBlank(params.getManufacturerTelePhone())) {//厂商办公电话
+                qw.like("bm.manufacturerTelePhone", params.getManufacturerTelePhone());
+            }
+            if (StringUtils.isNotBlank(params.getContactName())) {//联系人
+                qw.like("bm.contactName", params.getContactName());
+            }
+        }
+        qw.eq("isDelete", 0);
+        qw.ne("supplierType",0001);
+        qw.eq("useOrg",params.getUseOrgSid());
+        return baseMapper.pagerList(page, qw);
+    }
+
    /**
     * 构造查询条件
     *
@ -88,6 +112,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
            }
        }
        qw.eq("isDelete", 0);
+        qw.eq("supplierType",0001);
        return qw;
    }

--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@ -255,7 +255,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     * @description: 根据车架号和分公司sid查询车辆信息
     */
    public BaseVehicle selectByVinNoAndOrgSid(String vinNo, String useOrgSid) {
-        return baseMapper.selectByVinNoAndOrgSid(vinNo,useOrgSid);
+        return baseMapper.selectByVinNoAndOrgSid(vinNo, useOrgSid);
    }

    /**
@ -785,7 +785,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
        /*if (StringUtils.isNotBlank(pagerQuery.getLockedState())) { //锁定状态
            qw.and(wrapper -> wrapper.eq("bv.lockedState", "0").or().isNull("bv.lockedState").or().eq("bv.lockedStateValue", ""));
        }*/
-        qw.eq("bv.lockedState",VehicleState.LockEnum.UN_LOCK.getCode());
+        qw.eq("bv.lockedState", VehicleState.LockEnum.UN_LOCK.getCode());
        //库存或调入或内销
        qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
        if (StringUtils.isNotBlank(pagerQuery.getUseOrg())) { // 分公司
@ -1131,7 +1131,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
            //买断状态：未买断
            qw.eq("bv.settlementStatus", VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
            //订单类型
-            qw.and(wrapper -> wrapper.ne("bv.manPurOrderTypeKey",ManPurOrderType.ManOrderType.NG_ORDER.getCode()).or().ne("bv.manPurOrderTypeKey",ManPurOrderType.ManOrderType.WC_ORDER.getCode()));
+            qw.and(wrapper -> wrapper.ne("bv.manPurOrderTypeKey", ManPurOrderType.ManOrderType.NG_ORDER.getCode()).or().ne("bv.manPurOrderTypeKey", ManPurOrderType.ManOrderType.WC_ORDER.getCode()));
            //调车
            //qw.eq("bv.witPinState", VehicleState.ShuntingEnum.UN_SHUNTING.getCode());
        }
@ -1311,7 +1311,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
            //库存状态：库存
            qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
            //订单类型
-            qw.ne("bv.manPurOrderTypeKey",ManPurOrderType.ManOrderType.NG_ORDER.getCode());
+            qw.ne("bv.manPurOrderTypeKey", ManPurOrderType.ManOrderType.NG_ORDER.getCode());
            //调车状态：未调车
            //qw.eq("bv.witPinState", VehicleState.ShuntingEnum.UN_SHUNTING.getCode()).or().eq("bv.witPinState", VehicleState.ShuntingEnum.OUTCOLL.getCode());
        }
@ -1516,7 +1516,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                qw.eq("bv.useOrgSid", query.getUseOrg());
            }
            qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
-            qw.eq("bv.lockedState",VehicleState.LockEnum.UN_LOCK.getCode());
+            qw.eq("bv.lockedState", VehicleState.LockEnum.UN_LOCK.getCode());
        }
        return qw;
    }
@ -1559,7 +1559,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
            if (StringUtils.isNotBlank(query.getUseOrg())) {//分公司
                qw.eq("bvo.useOrgSid", query.getUseOrg());
            }
-            qw.eq("bvo.state",0);
+            qw.eq("bvo.state", 0);
        }
        return qw;
    }
@ -1739,7 +1739,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
        if (StringUtils.isNotBlank(params.getUseOrgSid())) {
            qw.eq("bv.createOrgSid", params.getUseOrgSid());
        }
-        qw.eq("bv.isDelete",0);
+        qw.eq("bv.isDelete", 0);
        //库存或调入或采购退库中
        qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()));
        IPage<AppScmWarehouseVinVo> iPage = baseMapper.getPcVinByWarehouseSid(page, qw, params.getWarehouseSid());
@ -1942,7 +1942,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
        baseVehicle.setModifyTime(null);
        baseVehicle.setCreateBySid(null);

-        BeanUtil.copyProperties(baseVehicle, new_baseVehicle, new CopyOptions().setIgnoreNullValue(true));
+        copyBeanToBean(baseVehicle,new_baseVehicle);
+        //BeanUtil.copyProperties(baseVehicle, new_baseVehicle, new CopyOptions().setIgnoreNullValue(true));
        //调车状态
        new_baseVehicle.setWitPinState(VehicleState.ShuntingEnum.WITPURCHASE.getCode());
        new_baseVehicle.setWitPinStateValue(VehicleState.ShuntingEnum.WITPURCHASE.getRemarks());
@ -2122,6 +2123,120 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
        }
    }

+    public void copyBeanToBean(BaseVehicle dto, BaseVehicle baseVehicle) {
+        if (StringUtils.isNotBlank(dto.getMaterialSid())) {
+            baseVehicle.setMaterialSid(dto.getMaterialSid());
+        }
+        if (StringUtils.isNotBlank(dto.getModelSid())) {
+            baseVehicle.setModelSid(dto.getModelSid());
+        }
+        if (StringUtils.isNotBlank(dto.getVehicleState())) {
+            baseVehicle.setVehicleState(dto.getVehicleState());
+        }
+        if (StringUtils.isNotBlank(dto.getVehicleStateValue())) {
+            baseVehicle.setVehicleStateValue(dto.getVehicleStateValue());
+        }
+        if (StringUtils.isNotBlank(dto.getModelName())) {
+            baseVehicle.setModelName(dto.getModelName());
+        }
+        if (StringUtils.isNotBlank(dto.getConfigName())) {
+            baseVehicle.setConfigName(dto.getConfigName());
+        }
+        if (StringUtils.isNotBlank(dto.getModelConfigSid())) {
+            baseVehicle.setModelConfigSid(dto.getModelConfigSid());
+        }
+        if (StringUtils.isNotBlank(dto.getSpecialInstructions())) {
+            baseVehicle.setSpecialInstructions(dto.getSpecialInstructions());
+        }
+        if (StringUtils.isNotBlank(dto.getVinNo())) {
+            baseVehicle.setVinNo(dto.getVinNo());
+        }
+        if (StringUtils.isNotBlank(dto.getEngineNo())) {
+            baseVehicle.setEngineNo(dto.getEngineNo());
+        }
+        if (StringUtils.isNotBlank(dto.getOrderingNo())) {
+            baseVehicle.setOrderingNo(dto.getOrderingNo());
+        }
+        if (StringUtils.isNotBlank(dto.getManPurOrderTypeKey())) {
+            baseVehicle.setManPurOrderTypeKey(dto.getManPurOrderTypeKey());
+        }
+        if (StringUtils.isNotBlank(dto.getManPurOrderTypeValue())) {
+            baseVehicle.setManPurOrderTypeValue(dto.getManPurOrderTypeValue());
+        }
+        if (dto.getPriceDate() != null) {
+            baseVehicle.setPriceDate(dto.getPriceDate());
+        }
+        if (dto.getDepartureDate() != null) {
+            baseVehicle.setDepartureDate(dto.getDepartureDate());
+        }
+        if (dto.getArrivalDate() != null) {
+            baseVehicle.setArrivalDate(dto.getArrivalDate());
+        }
+        if (dto.getSalesDate() != null) {
+            baseVehicle.setSalesDate(dto.getSalesDate());
+        }
+        if (dto.getSolidDate() != null) {
+            baseVehicle.setSolidDate(dto.getSolidDate());
+        }
+        if (StringUtils.isNotBlank(dto.getSettlementStatus())) {
+            baseVehicle.setSettlementStatus(dto.getSettlementStatus());
+        }
+        if (StringUtils.isNotBlank(dto.getSettlementStatusValue())) {
+            baseVehicle.setSettlementStatusValue(dto.getSettlementStatusValue());
+        }
+        if (dto.getReturnDate() != null) {
+            baseVehicle.setReturnDate(dto.getReturnDate());
+        }
+        if (StringUtils.isNotBlank(dto.getLocation())) {
+            baseVehicle.setLocation(dto.getLocation());
+        }
+        if (StringUtils.isNotBlank(dto.getLocationName())) {
+            baseVehicle.setLocationName(dto.getLocationName());
+        }
+        if (dto.getCostPrice() != null) {
+            baseVehicle.setCostPrice(dto.getCostPrice());
+        }
+        if (dto.getContractPrice() != null) {
+            baseVehicle.setContractPrice(dto.getContractPrice());
+        }
+        if (dto.getSalePrice() != null) {
+            baseVehicle.setSalePrice(dto.getSalePrice());
+        }
+        if (StringUtils.isNotBlank(dto.getWarrantyCardNo())) {
+            baseVehicle.setWarrantyCardNo(dto.getWarrantyCardNo());
+        }
+        if (StringUtils.isNotBlank(dto.getLockedState())) {
+            baseVehicle.setLockedState(dto.getLockedState());
+        }
+        if (StringUtils.isNotBlank(dto.getLockedStateValue())) {
+            baseVehicle.setLockedStateValue(dto.getLockedStateValue());
+        }
+        if (StringUtils.isNotBlank(dto.getCreateOrgSid())) {
+            baseVehicle.setCreateOrgSid(dto.getCreateOrgSid());
+        }
+        if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
+            baseVehicle.setCreateOrgName(dto.getCreateOrgName());
+        }
+        if (StringUtils.isNotBlank(dto.getUseOrgSid())) {
+            baseVehicle.setUseOrgSid(dto.getUseOrgSid());
+        }
+        if (StringUtils.isNotBlank(dto.getUseOrgName())) {
+            baseVehicle.setUseOrgName(dto.getUseOrgName());
+        }
+        if (StringUtils.isNotBlank(dto.getInsideCode())) {
+            baseVehicle.setInsideCode(dto.getInsideCode());
+        }
+        if (dto.getFreight() != null) {
+            baseVehicle.setFreight(dto.getFreight());
+        }
+        if (StringUtils.isNotBlank(dto.getWitPinState())) {
+            baseVehicle.setWitPinState(dto.getWitPinState());
+        }
+        if (StringUtils.isNotBlank(dto.getWitPinStateValue())) {
+            baseVehicle.setWitPinStateValue(dto.getWitPinStateValue());
+        }
+    }
+
    /**
     * 是否允许买断
     *
@ -2182,6 +2297,6 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
    }

    public void updateVehicleState(String vehicleState, String vehicleStateValue, String vinNo, String useOrgSid) {
-        baseMapper.updateVehicleState(vehicleState,vehicleStateValue,vinNo,useOrgSid);
+        baseMapper.updateVehicleState(vehicleState, vehicleStateValue, vinNo, useOrgSid);
    }
 }