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

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
8a376ebacf aa27cdbbb8
commit
438e43fa15
11 changed files with 121 additions and 90 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. 7
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
  2. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
  3. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  4. 44
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  5. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverQuery.java
  6. 18
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java
  7. 42
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java
  8. 25
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml
  9. 56
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java
  10. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversQuery.java
  11. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java

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

@ -274,6 +274,13 @@ public interface BaseVehicleFeign {
@PostMapping("/selGCVehByStockState")
public ResultBean<List<BaseExistingCarListVo>> selGCVehByStockState(@RequestParam("createOrgSid") String createOrgSid);
/**
* 根据车辆sid获取销售订单信息
*/
@ApiOperation("根据车辆sid获取销售订单信息")
@PostMapping("/fetchByVehSid")
public ResultBean<BaseExistingCarListVo> fetchByVehSid(@RequestParam("vehSid") String vehSid);
/**
* pc排产车详情（新）
*

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

@ -157,6 +157,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
return null;
}
@Override
public ResultBean<BaseExistingCarListVo> fetchByVehSid(String vehSid) {
return null;
}
@Override
public ResultBean<AppPurchaseDetailsVo> getPurchaseDetails(String vinNo) {
return null;

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

@ -1071,6 +1071,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
return baseVehicleService.selGCVehByStockState(createOrgSid);
}
@Override
public ResultBean<BaseExistingCarListVo> fetchByVehSid(String vehSid) {
return baseVehicleService.baseVehicleService(vehSid);
}
/**
* 根据车架号查询现车详情
*

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

@ -993,14 +993,14 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
* @param configSid
* @return
*/
public AppCurrentCarDetailConfigVo getAppCurrentCarDetailConfigVo(String modelSid, String configSid, String userSid, String useOrgSid,String orgPath) {
public AppCurrentCarDetailConfigVo getAppCurrentCarDetailConfigVo(String modelSid, String configSid, String userSid, String useOrgSid, String orgPath) {
String useOrg = "";
if (StringUtils.isNotBlank(useOrgSid)) {
useOrg = useOrgSid;
} else {
useOrg = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
}
if(StringUtils.isNotBlank(orgPath)){
if (StringUtils.isNotBlank(orgPath)) {
useOrg = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
}
AppCurrentCarDetailConfigVo configDetailVo = baseMapper.getAppModelConfig(modelSid, configSid, useOrg);
@ -1994,7 +1994,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
if (params.getVinNoList().size() > 0) {
qw.notIn("bv.vinNo", params.getVinNoList());
}
if(StringUtils.isNotBlank(params.getPurchaseSystemSid())){
if (StringUtils.isNotBlank(params.getPurchaseSystemSid())) {
qw.like("bv.purchaseSystemSid", params.getPurchaseSystemSid());
}
//结算状态：0未买断
@ -3868,6 +3868,28 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
return rb.success().setData(baseExistingCarListVo);
}
public ResultBean<BaseExistingCarListVo> baseVehicleService(String vehSid) {
ResultBean rb = ResultBean.fireFail();
List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.fetchByVehSid(vehSid).getData();
BaseExistingCarListVo existingCarListVo = new BaseExistingCarListVo();
for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
String salesOrderSid = busSalesOrderVehicle.getSalesOrderSid();
BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderFeign.fetchDetailsBySid(salesOrderSid).getData();
if (busSalesOrderDetailsVo != null) {
if (!busSalesOrderDetailsVo.getNodeState().equals("待提交") && !busSalesOrderDetailsVo.getNodeState().equals("已终止")) {
existingCarListVo.setSaleOrderNo(busSalesOrderDetailsVo.getBillNo());
existingCarListVo.setSaleOrderDate(busSalesOrderDetailsVo.getCreateDate());
existingCarListVo.setCustomerSid(busSalesOrderDetailsVo.getCustomerSid());
existingCarListVo.setCustomerName(busSalesOrderDetailsVo.getCustomerName());
existingCarListVo.setStaffSid(busSalesOrderDetailsVo.getStaffSid());
existingCarListVo.setStaffName(busSalesOrderDetailsVo.getStaffName());
break;
}
}
}
return rb.success().setData(existingCarListVo);
}
public PagerVo<BaseVehicleQKKPVo> vehicleQKKPList(PagerQuery<BaseVehicleQKKPQuery> pagerQuery) {
IPage<BaseVehicleQKKPVo> page = vehicleQKKPPageList(pagerQuery);
List<BaseVehicleQKKPTrailerVo> baseVehicleQKKPTrailerVos = new ArrayList<>();
@ -3875,9 +3897,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
List<BaseVehicleQKKPVo> recordsNew1 = new ArrayList<>();
List<BaseVehicleQKKPVo> recordsNew = new ArrayList<>();
for (BaseVehicleQKKPVo record : records) {
if (StringUtils.isNotBlank(record.getVehSid())){
if (StringUtils.isNotBlank(record.getVehSid())) {
FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(record.getVehSid()).getData();
if (finBillVehicleDetailsVo == null){
if (finBillVehicleDetailsVo == null) {
recordsNew1.add(record);
}
}
@ -3885,14 +3907,14 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
for (BaseVehicleQKKPVo baseVehicleQKKPVo : recordsNew1) {
String vehSid = baseVehicleQKKPVo.getVehSid();
BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = busArrearsCarryVehicleApplyFeign.selSubmitLc(vehSid).getData();
if (busArrearsCarryVehicleApply == null){
if (busArrearsCarryVehicleApply == null) {
recordsNew.add(baseVehicleQKKPVo);
}
}
for (BaseVehicleQKKPVo baseVehicleQKKPVo : recordsNew) {
TraliveredVo data = baseTrailerService.trailerList(baseVehicleQKKPVo.getVehSid(),baseVehicleQKKPVo.getContractNo()).getData();
TraliveredVo data = baseTrailerService.trailerList(baseVehicleQKKPVo.getVehSid(), baseVehicleQKKPVo.getContractNo()).getData();
List<TrailerVo> trailerVos = data.getList();
if (trailerVos != null && trailerVos.size() > 0){
if (trailerVos != null && trailerVos.size() > 0) {
for (TrailerVo trailerVo : trailerVos) {
BaseVehicleQKKPTrailerVo baseVehicleQKKPTrailerVo = new BaseVehicleQKKPTrailerVo();
baseVehicleQKKPTrailerVo.setVinNo(baseVehicleQKKPVo.getVinNo());
@ -3914,7 +3936,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
IPage<BaseVehicleQKKPVo> page = PagerUtil.queryToPage(pagerQuery);
BaseVehicleQKKPQuery params = pagerQuery.getParams();
QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
qw.eq("bso.contractNo",params.getContractNo());
qw.eq("bso.contractNo", params.getContractNo());
if (StringUtils.isNotBlank(params.getVinNo())) {
qw.like("bsov.linkNo", params.getVinNo());
}
@ -3923,9 +3945,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
}
//查询是否存在应收未收款项
ResultBean<List<String>> listResultBean = finUncollectedReceivablesDetailedFeign.selectByContractNoOne(params.getContractNo());
if(!listResultBean.getData().isEmpty()){
if (!listResultBean.getData().isEmpty()) {
listResultBean.getData().removeAll(Collections.singleton(null));
qw.notIn("bsov.sid",listResultBean.getData());
qw.notIn("bsov.sid", listResultBean.getData());
}
return baseMapper.vehicleQKKPPageList(page, qw);
}

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverQuery.java
View File

@ -15,11 +15,8 @@ public class AppBusDiscountpackageHandoverQuery implements Query {
private String orgPath; // 分公司sid
@ApiModelProperty("当前登录用户sid")
private String userSid; //
// @ApiModelProperty("待接收销售专员用户sid")
// private String recUserSid; // 待接收销售专员用户sid
@ApiModelProperty("1待准备 2待交接 3已交接")
private String type; // 1待准备 2待交接 3已交接
@ApiModelProperty("1待准备 2待交接 3已交接")
private String names; // 1待准备 2待交接 3已交接
private String name; //
}

18
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java
View File

@ -21,7 +21,7 @@ public class AppBusDiscountpackageHandoverVo implements Vo {
@ApiModelProperty("销售订单sid")
private String salesOrderSid; // 销售订单sid
@ApiModelProperty("交接状态 1待准备，2待交接，3已交接")
private Integer type; // 交接状态
private String nodeState; // 交接状态
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("创建日期")
private Date createDate; // 合同编号
@ -33,13 +33,13 @@ public class AppBusDiscountpackageHandoverVo implements Vo {
private String model; // 车型名称
@ApiModelProperty("车辆台数")
private String carNum; // 车辆台数
@ApiModelProperty("接收人姓名")
private String recName; // 接收人姓名
@ApiModelProperty("接收人电话")
private String recPhone; // 接收人电话
@ApiModelProperty("待交接显示")
private Boolean showHandleBtn; // 待交接显示
@ApiModelProperty("已交接显示")
private Boolean showDownloadBtn; // 已交接显示
@ApiModelProperty("优惠包数量")
private String discountNum; // 优惠包数量
@ApiModelProperty("优惠包总价值")
private String price; // 接收人电话
@ApiModelProperty("办理显示")
private Boolean showHandleBtn; // 办理显示
@ApiModelProperty("上传显示")
private Boolean showUploadBtn; // 上传显示
}

42
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java
View File

@ -29,14 +29,10 @@ import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto;
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.*;
import com.yxt.anrui.buscenter.api.busdelivereddetailsdiscount.BusDeliveredDetailsDiscount;
import com.yxt.anrui.buscenter.api.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountDto;
import com.yxt.anrui.buscenter.api.busdeliveredusemessage.AppUseInfoDto;
import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessage;
import com.yxt.anrui.buscenter.biz.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountService;
import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessageService;
@ -152,44 +148,6 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
}
}
public void appSaveList(List<AppCarListDto> carList, String sid) {
for (int i = 0; i < carList.size(); i++) {
BusDeliveredApplyDetails busDeliveredApplyDetails = new BusDeliveredApplyDetails();
AppCarListDto appCarListDto = carList.get(i);
busDeliveredApplyDetails.setRemarks(appCarListDto.getCarRemarks());
busDeliveredApplyDetails.setVinNo(appCarListDto.getVin());
// busDeliveredApplyDetails.setPrice(appCarListDto.getPrice());
busDeliveredApplyDetails.setApplySid(sid);
if (carList.get(i).getUseInfo() != null) {
AppUseInfoDto useInfo = carList.get(i).getUseInfo();
BusDeliveredUseMessage busDeliveredUseMessage = new BusDeliveredUseMessage();
/* busDeliveredUseMessage.setProvince(useInfo.getProvince());
busDeliveredUseMessage.setCity(useInfo.getCity());
busDeliveredUseMessage.setCounty(useInfo.getCounty());*/
busDeliveredUseMessage.setAddress(useInfo.getAddress());
busDeliveredUseMessage.setIdNo(useInfo.getIdNumber());
busDeliveredUseMessage.setName(useInfo.getCustomer());
busDeliveredUseMessage.setMobile(useInfo.getMobile());
busDeliveredUseMessage.setApplySid(sid);
busDeliveredUseMessageService.save(busDeliveredUseMessage);
busDeliveredApplyDetails.setUseMessageSid(busDeliveredUseMessage.getSid());
}
BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
baseVehicleTempstateDto.setBusSid(sid);
baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.ISSUE_APPLY.getCode());
baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.ISSUE_APPLY.getRemarks());
baseVehicleTempstateDto.setTempKey("1");
baseVehicleTempstateDto.setTempValue("待审核");
for (AppCarListDto carListDto : carList) {
baseVehicleTempstateDto.setVinNo(carListDto.getVin());
BaseVehicleVo data = baseVehicleFeign.selVehicleByVinNo(carListDto.getVin()).getData();
baseVehicleTempstateDto.setVehSid(data.getSid());
baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
}
save(busDeliveredApplyDetails);
}
}
/**
* 根据出库申请sid删除车辆关联的信息
*

25
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml
View File

@ -23,18 +23,27 @@
<select id="selectAppPageVo"
resultType="com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo">
select distinct
SELECT DISTINCT
sid,
`state` as `type`,
createTime as createDate,
contractNo as contractId,
createTime AS createDate,
contractNo AS contractId,
customerName,
vehModel as model,
vehCount as carNum,
vehModel AS model,
vehCount AS carNum,
recName,
recPhone,
recTime
FROM bus_discountpackage_handover
recTime,
CASE
`state`
WHEN 1 THEN
'待准备'
WHEN 2 THEN
'待交接'
WHEN 3 THEN
'已交接'
END AS nodeState
FROM
bus_discountpackage_handover
<where>${ew.sqlSegment}</where>
</select>

56
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java
View File

@ -18,6 +18,7 @@ import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService;
import com.yxt.anrui.buscenter.biz.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListService;
import com.yxt.anrui.portal.api.sysrole.SysRoleFeign;
import com.yxt.anrui.portal.api.sysrole.SysRoleVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.common.base.config.component.DocPdfComponent;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
@ -34,6 +35,7 @@ import org.springframework.stereotype.Service;
import java.io.File;
import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@ -58,6 +60,8 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
private DocPdfComponent docPdfComponent;
@Autowired
private CommonContractFeign commonContractFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
/**
* 筛选条件
@ -493,22 +497,23 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
private QueryWrapper<BusDiscountpackageHandover> appCreateQueryWrapper(AppBusDiscountpackageHandoverQuery query) {
QueryWrapper<BusDiscountpackageHandover> qw = new QueryWrapper<>();
qw.eq("useOrgSid", query.getOrgPath());
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
qw.eq("useOrgSid", useOrgSid);
qw.eq("isDelete", 0);
if (StringUtils.isNotBlank(query.getUserSid())) {
qw.eq("recUserSid", query.getUserSid());
}
if (StringUtils.isNotBlank(query.getType())) {
if (query.getType().equals("3")) {
qw.eq("state", query.getType());
} else {
if (query.getType().equals("2")) {
qw.eq("state", 3);
} else if (query.getType().equals("1")) {
qw.ne("state", 3);
}
}
if (StringUtils.isNotBlank(query.getNames())) {
qw.and(wrapper -> wrapper.like("contractNo", query.getNames()).or().like("customerName", query.getNames())
.or().like("recName",query.getNames()));
if (StringUtils.isNotBlank(query.getName())) {
qw.and(wrapper -> wrapper.like("contractNo", query.getName()).or().like("customerName", query.getName()));
}
qw.orderByDesc("createTime");
return qw;
}
@ -525,11 +530,10 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
IPage<BusDiscountpackageHandover> page = PagerUtil.queryToPage(pq);
IPage<AppBusDiscountpackageHandoverVo> pagging = baseMapper.selectAppPageVo(page, qw);
List<AppBusDiscountpackageHandoverVo> records = pagging.getRecords();
if (null != records) {
if (null != records && records.size() > 0) {
for (AppBusDiscountpackageHandoverVo record : records) {
if (null != record) {
if (StringUtils.isNotBlank(record.getContractId())) {
CommonContract data = commonContractFeign.selectByNo(record.getContractId()).getData();
if (null != data) {
if (StringUtils.isNotBlank(data.getBusSid())) {
@ -537,13 +541,37 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
}
}
}
if (null != record.getType()) {
if (record.getType() == 1 || record.getType() == 2) {
record.setShowHandleBtn(true);
} else if (record.getType() == 3) {
record.setShowDownloadBtn(true);
if (("待交接".equals(record.getNodeState()))) {
record.setShowHandleBtn(true);
} else {
record.setShowHandleBtn(false);
}
if (("已交接".equals(record.getNodeState()))) {
//查询有没有上传的图片
List<BuscenterFile> buscenterFiles = buscenterFileService.selectByLinkSid(record.getSid(), BuscenterFileEnum.DISCOUNTPACKAGE_HANDOVER.getAttachType());
if (buscenterFiles.size() > 0) {
record.setShowUploadBtn(false);
} else {
record.setShowUploadBtn(true);
}
}
record.setShowUploadBtn(false);
}
List<BusDiscountpackageHandoverList> listByMainSid = busDiscountpackageHandoverListService.findListByMainSid(record.getSid());
if (listByMainSid.size() > 0) {
BigDecimal price = new BigDecimal(0);
int discountNum = 0;
for (BusDiscountpackageHandoverList handoverList : listByMainSid) {
if (null != handoverList) {
//优惠包数量
String number = handoverList.getNumber();
discountNum = discountNum + Integer.valueOf(number);
BigDecimal totalPrice = handoverList.getTotalPrice();
price = price.add(totalPrice);
}
}
record.setDiscountNum(String.valueOf(discountNum));
record.setPrice(String.valueOf(price));
}
}
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversQuery.java
View File

@ -19,7 +19,7 @@ public class AppBusDiscountpackageHandoversQuery implements Query {
@ApiModelProperty("1待准备 2待交接 3已交接")
private String type; // 1待准备 2待交接 3已交接
@ApiModelProperty("合同编号/客户名称/待接收人")
private String names;
private String name;
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java
View File

@ -21,7 +21,7 @@ public class AppBusDiscountpackageHandoversVo implements Vo {
@ApiModelProperty("销售订单sid")
private String salesOrderSid; // 销售订单sid
@ApiModelProperty("交接状态 1待准备，2待交接，3已交接")
private Integer type; // 交接状态
private String nodeSate; // 交接状态
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("创建日期")
private Date createDate; // 合同编号

Write Preview
Loading…
Cancel
Save