yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

待交车准备整理部分字段以及注释无用接口

zhanglei
dimengzhe 2 years ago
parent
d5cd6f1dad
commit
90a065d8c0
8 changed files with 78 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java
  2. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeign.java
  3. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java
  4. 29
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleDto.java
  5. 31
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicle.java
  6. 12
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  7. 8
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareRest.java
  8. 34
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java

32
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java
View File

@ -12,33 +12,33 @@ public class BusHandoverPrepareAddDto implements Dto {
private static final long serialVersionUID = -5503119838818185683L;
@ApiModelProperty("合同编号")
private String contractNo; // 合同编号
private String contractNo;
@ApiModelProperty("客户Sid")
private String customerSid; // 客户名称
private String customerSid;
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
private String customerName;
@ApiModelProperty("联系电话")
private String mobile; // 联系电话
@ApiModelProperty("品牌")
private String brandName; // 品牌
@ApiModelProperty("车辆数量")
private String num; // 车辆数量
private String mobile;
/* @ApiModelProperty("品牌")
private String brandName;
@ApiModelProperty("车辆数量")
private String num;*/
@ApiModelProperty("付款方式key")
private String payTypeKey; // 付款方式key
private String payTypeKey;
@ApiModelProperty("付款方式value")
private String payType; // 付款方式value
private String payType;
@ApiModelProperty("交车准备状态key")
private String handoverPrepareStateKey; // 交车准备状态key
private String handoverPrepareStateKey;
@ApiModelProperty("交车准备状态value")
private String handoverPrepareState; // 交车准备状态value
private String handoverPrepareState;
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
private String createOrgSid;
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
private String createOrgName;
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
private String useOrgSid;
@ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
private String useOrgName;
@ApiModelProperty("车辆信息")
private List<AppBusHandoverPrepareVehicleDto> appBusHandoverPrepareVehicleDtos;

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeign.java
View File

@ -55,6 +55,7 @@ import org.springframework.web.bind.annotation.*;
path = "v1/bushandoverprepare",
fallback = BusHandoverPrepareFeignFallback.class)
public interface BusHandoverPrepareFeign {
/*
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ -76,11 +77,14 @@ public interface BusHandoverPrepareFeign {
@ResponseBody
public ResultBean<BusHandoverPrepareDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation("出库申请推送交车准备数据")
@PostMapping("/addHandoverPrepare")
@ResponseBody
public ResultBean addHandoverPrepare(@RequestBody BusHandoverPrepareAddDto dto);
*/
//***********************************App**********************************

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java
View File

@ -46,7 +46,7 @@ import org.springframework.stereotype.Component;
*/
@Component
public class BusHandoverPrepareFeignFallback implements BusHandoverPrepareFeign {
/*
@Override
public ResultBean<PagerVo<BusHandoverPrepareVo>> listPage(PagerQuery<BusHandoverPrepareQuery> pq){
ResultBean rb = ResultBean.fireFail();
@ -72,7 +72,7 @@ public class BusHandoverPrepareFeignFallback implements BusHandoverPrepareFeign
@Override
public ResultBean addHandoverPrepare(BusHandoverPrepareAddDto dto) {
return null;
}
}*/
@Override
public ResultBean<PagerVo<AppHandoverPreparePageVo>> getDeliveryPlanList(PagerQuery<AppHandoverPreparePageQuery> pagerQuery) {

29
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleDto.java
View File

@ -9,27 +9,20 @@ public class AppBusHandoverPrepareVehicleDto implements Dto {
private static final long serialVersionUID = -8913800891100928726L;
@ApiModelProperty("交车申请表sid")
private String mainSid; // 交车申请表sid
private String mainSid;
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("开票状态")
private boolean invoicingState; // 开票状态
private String vinNo;
@ApiModelProperty("车辆sid")
private String vinSid;
@ApiModelProperty("发票状态")
private boolean invoicingState;
@ApiModelProperty("合格证状态")
private boolean certificateState; // 合格证状态
private boolean certificateState;
@ApiModelProperty("保单状态")
private boolean policyState; // 保单状态
private boolean policyState;
@ApiModelProperty("随车资料状态")
private boolean onBoardDataState; // 随车资料状态
@ApiModelProperty("其他资料状态")
private boolean otherDataState; // 其他资料状态
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
private boolean onBoardDataState;
@ApiModelProperty("其他资料")
private String otherFiles;
private String vinSid;
}

31
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicle.java
View File

@ -50,21 +50,20 @@ import lombok.Data;
public class BusHandoverPrepareVehicle extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("交车申请表sid")
private String mainSid; // 交车申请表sid
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("开票状态")
private int invoicingState; // 开票状态
@ApiModelProperty("合格证状态")
private int certificateState; // 合格证状态
@ApiModelProperty("保单状态")
private int policyState; // 保单状态
@ApiModelProperty("随车资料状态")
private int onBoardDataState; // 随车资料状态
@ApiModelProperty("其他资料状态")
private int otherDataState; // 其他资料状态
@ApiModelProperty("交车申请表sid")
private String mainSid;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("车辆sid")
private String vinSid;
@ApiModelProperty("开票状态")
private int invoicingState;
@ApiModelProperty("合格证状态")
private int certificateState;
@ApiModelProperty("保单状态")
private int policyState;
@ApiModelProperty("随车资料状态")
private int onBoardDataState;
@ApiModelProperty("其他资料状态")
private String otherFiles;
}

12
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
View File

@ -70,6 +70,7 @@ import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDet
import com.yxt.anrui.buscenter.biz.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountService;
import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessageService;
import com.yxt.anrui.buscenter.biz.busdiscountpackagehandover.BusDiscountpackageHandoverService;
import com.yxt.anrui.buscenter.biz.bushandoverprepare.BusHandoverPrepareService;
import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
import com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountService;
import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
@ -186,6 +187,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
private BaseVehicleOutFeign baseVehicleOutFeign;
@Autowired
private BusVehicleInformationHandoverService busVehicleInformationHandoverService;
@Autowired
private BusHandoverPrepareService busHandoverPrepareService;
/**
* 构造出库申请的查询条件
@ -716,14 +719,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
dto.setCustomerName(busDeliveredApply.getLoanName());
dto.setCustomerSid(busDeliveredApply.getLoanSid());
}
//品牌
//车辆数量
//付款方式
dto.setPayType(busDeliveredApply.getPaymentMethod());
dto.setPayTypeKey(busDeliveredApply.getPaymentMethodKey());
//交车准备状态
dto.setHandoverPrepareState("");
dto.setHandoverPrepareStateKey("");
dto.setHandoverPrepareState("1");
dto.setHandoverPrepareStateKey("待准备");
//创建组织sid、使用组织sid
dto.setCreateOrgSid(busDeliveredApply.getUseOrgSid());
dto.setUseOrgSid(busDeliveredApply.getUseOrgSid());
@ -739,9 +740,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
AppBusHandoverPrepareVehicleDto appBusHandoverPrepareVehicleDto = new AppBusHandoverPrepareVehicleDto();
appBusHandoverPrepareVehicleDto.setVinNo(details.getVinNo());
appBusHandoverPrepareVehicleDto.setVinSid(details.getVinSid());
dtos.add(appBusHandoverPrepareVehicleDto);
}
}
busHandoverPrepareService.addHandoverPrepare(dto);
}
/**

8
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareRest.java
View File

@ -26,16 +26,16 @@
package com.yxt.anrui.buscenter.biz.bushandoverprepare;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.bushandoverprepare.*;
import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareFeign;
import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* Project: bus_handover(交车准备) <br/>
@ -57,6 +57,7 @@ public class BusHandoverPrepareRest implements BusHandoverPrepareFeign {
@Autowired
private BusHandoverPrepareService busHandoverPrepareService;
/*
@Override
@ApiOperation("根据条件分页查询数据的列表")
@ -100,6 +101,7 @@ public class BusHandoverPrepareRest implements BusHandoverPrepareFeign {
busHandoverPrepareService.addHandoverPrepare(dto);
return rb.success();
}
*/
@Override
public ResultBean<PagerVo<AppHandoverPreparePageVo>> getDeliveryPlanList(PagerQuery<AppHandoverPreparePageQuery> pagerQuery) {

34
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java
View File

@ -30,18 +30,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
import com.yxt.anrui.base.api.basevehiclecertificate.AppHandoverCertificateInfoVo;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile;
import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum;
import com.yxt.anrui.buscenter.api.bushandoverprepare.*;
import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepare;
import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareAddDto;
import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*;
import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleDto;
import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleInfoVo;
import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicle;
import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitDto;
import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitFeign;
import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService;
import com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleService;
import com.yxt.anrui.buscenter.biz.bushandoverwait.BusHandoverWaitService;
@ -49,13 +48,11 @@ import com.yxt.anrui.fin.api.finbillvehicle.AppInvoicingInfoVinNoVo;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -94,7 +91,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
@Autowired
private BusHandoverWaitService busHandoverWaitService;
private QueryWrapper<BusHandoverPrepare> createQueryWrapper(BusHandoverPrepareQuery query) {
/* private QueryWrapper<BusHandoverPrepare> createQueryWrapper(BusHandoverPrepareQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BusHandoverPrepare> qw = new QueryWrapper<>();
@ -108,18 +105,18 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
IPage<BusHandoverPrepareVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BusHandoverPrepareVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
}*/
public void saveOrUpdateDto(BusHandoverPrepareDto dto) {
/* public void saveOrUpdateDto(BusHandoverPrepareDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
}*/
public void insertByDto(BusHandoverPrepareDto dto) {
/* public void insertByDto(BusHandoverPrepareDto dto) {
BusHandoverPrepare entity = new BusHandoverPrepare();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
@ -133,15 +130,20 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
BusHandoverPrepare entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
}*/
public BusHandoverPrepareDetailsVo fetchDetailsVoBySid(String sid) {
/* public BusHandoverPrepareDetailsVo fetchDetailsVoBySid(String sid) {
BusHandoverPrepare entity = fetchBySid(sid);
BusHandoverPrepareDetailsVo vo = new BusHandoverPrepareDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
}*/
/**
* 出库申请审核通过后推送待交车准备
*
* @param dto
*/
public void addHandoverPrepare(BusHandoverPrepareAddDto dto) {
BusHandoverPrepare busHandoverPrepare = new BusHandoverPrepare();
BeanUtil.copyProperties(dto, busHandoverPrepare);
@ -322,7 +324,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
busHandoverWaitDto.setCustomerSid(busHandoverPrepare.getCustomerSid());
busHandoverWaitDto.setVinNo(handoverPrepareVehicleDto.getVinNo());
BaseVehicle data = baseVehicleFeign.selectByVinNoAndOrgSid(handoverPrepareVehicleDto.getVinNo(), busHandoverPrepare.getUseOrgSid()).getData();
if (data!=null){
if (data != null) {
busHandoverWaitDto.setVinSid(data.getSid());
busHandoverWaitDto.setModelSid(data.getModelSid());
busHandoverWaitDto.setModelName(data.getModelName());

Write Preview
Loading…
Cancel
Save