diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsQuery.java index b4c683cfb3..bfad2740f2 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsQuery.java @@ -4,6 +4,7 @@ import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.util.ArrayList; import java.util.List; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java index e87dbab4a2..29e1900ec9 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java @@ -73,7 +73,8 @@ public class AppDeliveredDetailsVo implements Vo { @ApiModelProperty(value = "任务id") private String taskId; - + @ApiModelProperty("销售专员sid") + private String pcStaffSid; @ApiModelProperty("PC发起人") private String pcApplyName; @ApiModelProperty("PC发起人sid") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredQuery.java index c9646258de..ee84321315 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredQuery.java @@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -61,7 +62,7 @@ public class BusDeliveredQuery implements Query { private String vinNo; @ApiModelProperty("用户sid") private String userSid; - @ApiModelProperty("车架号集合") - private List vinNoList; + @ApiModelProperty("车辆sid集合") + private List vinSid = new ArrayList<>(); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java index bb96fa8ef2..aa7d4fcc45 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java @@ -66,6 +66,8 @@ public class BusDeliveredVo implements Vo { private String busVinSid; @ApiModelProperty("车辆sid") private String vinSid; + @ApiModelProperty("销售类型") + private String paymentMethod; /* @ApiModelProperty(value = "联系电话") private String mobile; @ApiModelProperty(value = "证件号码") diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java index 156b18a24d..2140d01109 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java @@ -122,38 +122,6 @@ public class BusDeliveredService extends MybatisBaseService createQueryWrapper(BusDeliveredQuery query) { - QueryWrapper qw = new QueryWrapper<>(); - if (query != null) { - //合同编号 - if (StringUtils.isNotBlank(query.getContractNo())) { - qw.like("bd.contractNo", query.getContractNo()); - } - //客户名称 - if (StringUtils.isNotBlank(query.getName())) { - qw.like("bd.name", query.getName()); - } - //车架号 - if (StringUtils.isNotBlank(query.getVinNo())) { - qw.like("bd.vinNo", query.getVinNo()); - } - //车架号集合 - if (query.getVinNoList().size() > 0) { - qw.notIn("bd.vinNo", query.getVinNoList()); - } - //待出库：1，出库申请：0 - qw.eq("bd.state", 1); - - } - return qw; - } - /** * 待出库车辆分页列表 * @@ -177,8 +145,8 @@ public class BusDeliveredService extends MybatisBaseService 0) { - qw.notIn("bv.linkNo", query.getVinNoList()); + if (query.getVinSid().size() > 0) { + qw.notIn("bv.linkSid", query.getVinSid()); } //待出库：1，出库申请：0 qw.eq("bd.state", 1); @@ -262,6 +230,7 @@ public class BusDeliveredService extends MybatisBaseService list = query.getList(); + list.removeAll(Collections.singleton(null)); if (list.isEmpty()) { return rb.setMsg("请选择要出库的车辆"); } @@ -299,6 +268,7 @@ public class BusDeliveredService extends MybatisBaseService> listResultBean = dictCommonFeign.getTypeValues("buyerType", "0"); List dictCommonVoList = listResultBean.getData(); List voList = Optional.ofNullable(dictCommonVoList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), DeliveredDictVo.class)).collect(Collectors.toList()); + if("1".equals(appOrderDetailsVo.getPayTypeKey())){//贷款 + voList.remove(1); + } appDeliveredDetailsVo.setBuyerType(voList); //中介人 SubmitVo intermediary1 = appOrderDetailsVo.getIntermediary1(); @@ -421,18 +394,35 @@ public class BusDeliveredService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(busDeliveredApply.getStaffUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //pc发起人 + appDeliveredDetailsVo.setPcApplyName(busDeliveredApply.getApplyName()); + appDeliveredDetailsVo.setPcApplySid(busDeliveredApply.getApplySid()); + appDeliveredDetailsVo.setPcApplyDept(busDeliveredApply.getApplyDept()); + appDeliveredDetailsVo.setPcApplyDeptSid(busDeliveredApply.getApplyDeptSid()); + appDeliveredDetailsVo.setPcStaffSid(userVoResultBean.getData().getStaffSid()); appDeliveredDetailsVo.setUserSid(busDeliveredApply.getApplySid()); appDeliveredDetailsVo.setOrgPath(busDeliveredApply.getOrgSidPath()); appDeliveredDetailsVo.setSid(query.getOutboundSid()); - BeanUtil.copyProperties(busDeliveredApply, appDeliveredDetailsVo, "sid"); appDeliveredDetailsVo.setContractId(busDeliveredApply.getContractNo()); appDeliveredDetailsVo.setPublishInfo(busDeliveredApply.getApplyDept() + "-" + busDeliveredApply.getApplyName()); appDeliveredDetailsVo.setCreateTime(DateUtil.format(busDeliveredApply.getCreateTime(), "yyyy-MM-dd")); if (StringUtils.isNotBlank(busDeliveredApply.getDistributorPrice())) { appDeliveredDetailsVo.setDistributorName(busDeliveredApply.getDistributorName() + ",单车中介费：" + busDeliveredApply.getDistributorPrice() + "元"); + appDeliveredDetailsVo.setPcDistributorName(busDeliveredApply.getDistributorName()); + appDeliveredDetailsVo.setPcDistributorPrice(busDeliveredApply.getDistributorPrice()); + appDeliveredDetailsVo.setPcDistributorPriceAll(new BigDecimal(busDeliveredApply.getDistributorPrice()).multiply(new BigDecimal(query.getList().size())).toString()); + } if (StringUtils.isNotBlank(busDeliveredApply.getDistributorPriceTwo())) { appDeliveredDetailsVo.setDistributorNameTwo(busDeliveredApply.getDistributorNameTwo() + ",单车中介费：" + busDeliveredApply.getDistributorPriceTwo() + "元"); + appDeliveredDetailsVo.setDistributorNameTwo(busDeliveredApply.getDistributorNameTwo()); + appDeliveredDetailsVo.setPcDistributorPriceTwo(busDeliveredApply.getDistributorPriceTwo()); + appDeliveredDetailsVo.setPcDistributorPriceTwoAll(new BigDecimal(busDeliveredApply.getDistributorPriceTwo()).multiply(new BigDecimal(query.getList().size())).toString()); } List carList = new ArrayList<>(); List detailsList = busDeliveredApplyDetailsService.selectByApplySid(query.getOutboundSid()); @@ -465,10 +455,8 @@ public class BusDeliveredService extends MybatisBaseService> listResultBean = dictCommonFeign.getTypeValues("buyerType", "0"); List dictCommonVoList = listResultBean.getData(); List voList = Optional.ofNullable(dictCommonVoList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), DeliveredDictVo.class)).collect(Collectors.toList()); + if("1".equals(busDeliveredApply.getPaymentMethodKey())){//全款 + voList.remove(1); + } appDeliveredDetailsVo.setBuyerType(voList); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml index 3e84f5edf2..161b83a0f0 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml @@ -11,9 +11,12 @@ bd.taskId, bd.procInstId, bd.procDefId, - DATE_FORMAT(bd.applyDate, '%Y-%m-%d') as applyDate, + DATE_FORMAT(bd.createTime, '%Y-%m-%d') as applyDate, bd.applyName, - bd.modelName + bd.modelName, + bd.billNo, + bd.paymentMethod, + (select count(*) from bus_delivered_apply_details bad where bad.applySid = bd.sid) as num FROM bus_delivered_apply bd ${ew.sqlSegment} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index b684f107b2..c443f20562 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -50,13 +50,20 @@ import com.yxt.anrui.buscenter.api.busdelivereddetailsdiscount.BusDeliveredDetai import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessage; import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageVo; import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessagesVo; +import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverDto; +import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscount; import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.biz.busdelivered.BusDeliveredService; import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDetailsService; 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.bussalesorder.BusSalesOrderService; +import com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountService; +import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDto; @@ -148,6 +155,12 @@ public class BusDeliveredApplyService extends MybatisBaseService detailsList = busDeliveredApplyDetailsService.selectByApplySid(busDeliveredApply.getSid()); FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto(); finBillApplicationDto.setUseOrgSid(busDeliveredApply.getUseOrgSid()); @@ -642,13 +655,58 @@ public class BusDeliveredApplyService extends MybatisBaseService discountList = busDeliveredDetailsDiscountService.selectByApplySid(busDeliveredApply.getSid()); + BusDiscountpackageHandoverDto busDiscountpackageHandoverDto = new BusDiscountpackageHandoverDto(); + //合同编号 + busDiscountpackageHandoverDto.setContractNo(busDeliveredApply.getContractNo()); + //车型名称 + busDiscountpackageHandoverDto.setVehModel(busDeliveredApply.getModelName()); + //出库台数 + busDiscountpackageHandoverDto.setVehCount(String.valueOf(detailsList.size())); + List vinList = detailsList.stream().map(v -> v.getVinNo()).collect(Collectors.toList()); + String vins = String.join(",", vinList); + busDiscountpackageHandoverDto.setVins(vins); + busDiscountpackageHandoverDto.setRecUserSid(busDeliveredApply.getApplySid()); + busDiscountpackageHandoverDto.setCustomerName(busDeliveredApply.getName()); + busDiscountpackageHandoverDto.setRecName(busDeliveredApply.getApplyName()); + busDiscountpackageHandoverDto.setRecTime(new Date()); + //根据用户sid查询电话 + ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(busDeliveredApply.getApplySid()); + if (sysUserVoResultBean.getData() != null) { + busDiscountpackageHandoverDto.setRecPhone(sysUserVoResultBean.getData().getMobile()); + } + busDiscountpackageHandoverDto.setBusSid(busDeliveredApply.getSid()); + busDiscountpackageHandoverDto.setCreateOrgSid(busDeliveredApply.getUseOrgSid()); + busDiscountpackageHandoverDto.setUseOrgSid(busDeliveredApply.getUseOrgSid()); + ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(busDeliveredApply.getUseOrgSid()); + if (sysOrganizationVoResultBean.getData() != null) { + busDiscountpackageHandoverDto.setCreateOrgName(sysOrganizationVoResultBean.getData().getName()); + busDiscountpackageHandoverDto.setUseOrgName(sysOrganizationVoResultBean.getData().getName()); + } + List busDiscountpackageHandoverLists = new ArrayList<>(); + for (int i = 0; i < discountList.size(); i++) { + BusDeliveredDetailsDiscount busDeliveredDetailsDiscount = discountList.get(i); + BusDiscountpackageHandoverListDto busDiscountpackageHandoverListDto = new BusDiscountpackageHandoverListDto(); + busDiscountpackageHandoverListDto.setPrice(new BigDecimal(busDeliveredDetailsDiscount.getPrice())); + busDiscountpackageHandoverListDto.setNumber(String.valueOf(busDeliveredDetailsDiscount.getGiveNum())); + busDiscountpackageHandoverListDto.setDiscountName(busDeliveredDetailsDiscount.getName()); + busDiscountpackageHandoverListDto.setExplain(busDeliveredDetailsDiscount.getDiscountExplain()); + busDiscountpackageHandoverListDto.setRemarks(busDeliveredDetailsDiscount.getRemarks()); + busDiscountpackageHandoverListDto.setTotalPrice(new BigDecimal(busDeliveredDetailsDiscount.getPrice()).multiply(new BigDecimal(busDeliveredDetailsDiscount.getGiveNum()))); + busDiscountpackageHandoverLists.add(busDiscountpackageHandoverListDto); + } + busDiscountpackageHandoverDto.setBusDiscountpackageHandoverLists(busDiscountpackageHandoverLists); + busDiscountpackageHandoverService.saveOrUpdateDto(busDiscountpackageHandoverDto); + } updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); return rb.success().setData(resultBean.getData()); @@ -971,7 +1029,7 @@ public class BusDeliveredApplyService extends MybatisBaseService crmCustomerTempResultBean = crmCustomerTempFeign.fetchSid(customerSid); + if (crmCustomerTempResultBean.getData() != null) { + CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempResultBean.getData(); + BusDeliveredUseMessage busDeliveredUseMessage = new BusDeliveredUseMessage(); + busDeliveredUseMessage.setAddress(crmCustomerTempVo.getAddress()); + busDeliveredUseMessage.setName(crmCustomerTempVo.getName()); + busDeliveredUseMessage.setMobile(crmCustomerTempVo.getMobile()); + busDeliveredUseMessage.setIdNo(crmCustomerTempVo.getIDNumber()); + busDeliveredUseMessage.setCustomerType(crmCustomerTempVo.getCustomerType()); + busDeliveredUseMessage.setCustomerTypeKey(crmCustomerTempVo.getCustomerTypeKey()); + busDeliveredUseMessage.setApplySid(busDeliveredApply.getSid()); + busDeliveredUseMessage.setContacts(crmCustomerTempVo.getContacts()); + busDeliveredUseMessage.setIsConfirmRealBuyer("0"); + busDeliveredUseMessageService.insert(busDeliveredUseMessage); + busDeliveredApplyDetails.setUseMessageSid(busDeliveredUseMessage.getSid()); + } + + + } + if ("1".equals(busDeliveredApply.getTypeKey())) { + //贷款人的信息 + String loanSid = busDeliveredApply.getLoanSid(); + ResultBean crmCustomerTempResultBean = crmCustomerTempFeign.fetchSid(loanSid); + if (crmCustomerTempResultBean.getData() != null) { + CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempResultBean.getData(); + BusDeliveredUseMessage busDeliveredUseMessage = new BusDeliveredUseMessage(); + busDeliveredUseMessage.setAddress(crmCustomerTempVo.getAddress()); + busDeliveredUseMessage.setName(crmCustomerTempVo.getName()); + busDeliveredUseMessage.setMobile(crmCustomerTempVo.getMobile()); + busDeliveredUseMessage.setIdNo(crmCustomerTempVo.getIDNumber()); + busDeliveredUseMessage.setCustomerType(crmCustomerTempVo.getCustomerType()); + busDeliveredUseMessage.setCustomerTypeKey(crmCustomerTempVo.getCustomerTypeKey()); + busDeliveredUseMessage.setApplySid(busDeliveredApply.getSid()); + busDeliveredUseMessage.setContacts(crmCustomerTempVo.getContacts()); + busDeliveredUseMessage.setIsConfirmRealBuyer("0"); + busDeliveredUseMessageService.insert(busDeliveredUseMessage); + busDeliveredApplyDetails.setUseMessageSid(busDeliveredUseMessage.getSid()); + } + + } busDeliveredApplyDetailsService.insert(busDeliveredApplyDetails); } @@ -1270,6 +1380,14 @@ public class BusDeliveredApplyService extends MybatisBaseService carList = dto.getCarList(); if (!carList.isEmpty()) { + //判断合同编号是否一致 + for (int a = 0; a < carList.size(); a++) { + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(dto.getContractId(), carList.get(a).getVinSid()); + if (busSalesOrderVehicle == null) { + return rb.setMsg("所选车辆与合同编号不匹配"); + } + } + //判断已经选择的车辆是否已经提交 List vinSid = carList.stream().map(AppCarListVo::getVinSid).collect(Collectors.toList()); List vinNoList = baseMapper.selectVinNo(dto.getContractId(), vinSid); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountMapper.java index 8ddf7d3b85..69d145cad8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountMapper.java @@ -32,4 +32,6 @@ public interface BusDeliveredDetailsDiscountMapper extends BaseMapper selectByApplySid(String sid); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountMapper.xml index 42caaac0a2..eb607c51d6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountMapper.xml @@ -37,9 +37,17 @@ + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountService.java index cdf66059f8..63d707b095 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountService.java @@ -31,10 +31,14 @@ public class BusDeliveredDetailsDiscountService extends MybatisBaseService selectByApplySid(String sid) { + return baseMapper.selectByApplySid(sid); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index d10eb564ef..fc44631f46 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -5025,6 +5025,17 @@ public class BusSalesOrderService extends MybatisBaseService系列-全款/贷款销售订单 + String orgName = busSalesOrder.getOrgName(); + String customerName = busSalesOrder.getCustomerName(); + String typeValue = ""; + if("1".equals(busSalesOrder.getPayTypeKey())){ + typeValue = "全款销售订单"; + }else{ + typeValue = "贷款销售订单"; + } + String orderNames = orgName+"<"+customerName+">系列-"+typeValue; + variables.put("orderNames",orderNames); return variables; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoVo.java index e5d1e3e837..b4b597dc68 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoVo.java @@ -1,6 +1,7 @@ package com.yxt.anrui.fin.api.finbillapplication; import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -41,6 +42,9 @@ public class AppBillApplicationIInfoVo implements Vo { @ApiModelProperty("车辆集合") private List vinList; + @ApiModelProperty("开票挂车信息") + private List finBillTrailers; // 开票挂车信息 + @ApiModelProperty("开票状态") private String billState; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 7590b56d2a..973cd81bbf 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -225,6 +225,13 @@ public class FinBillApplicationService extends MybatisBaseService finBillApplicationVos = baseMapper.selectByContractNo(contractNo); if (finBillApplicationVos != null && finBillApplicationVos.size() > 0) { FinBillApplicationDetailsVo finBillApplicationVo = finBillApplicationVos.get(0); - entity.setOneBillMoney(new BigDecimal(finBillApplicationVo.getOneBillMoney())); + if (StringUtils.isNotBlank(finBillApplicationVo.getOneBillMoney())){ + entity.setOneBillMoney(new BigDecimal(finBillApplicationVo.getOneBillMoney())); + } } FinBillApplicationDetailsVo vo = new FinBillApplicationDetailsVo(); BeanUtil.copyProperties(entity, vo); @@ -718,12 +734,12 @@ public class FinBillApplicationService extends MybatisBaseService 0) { for (int i = 0; i < finSelectedReceivablesDetailedVos1_1_2.size(); i++) { - FinSelectedReceivablesDetailedVo vvvv = finSelectedReceivablesDetailedVos1_1.get(i); + FinSelectedReceivablesDetailedVo vvvv = finSelectedReceivablesDetailedVos1_1_2.get(i); String contractNo = vvvv.getContractNo(); String vinNo = vvvv.getVIN(); BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), contractNo, sid, vinNo); diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java index cfec6f944b..1314912fb8 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java @@ -89,11 +89,6 @@ public class FlowTaskController implements FlowTaskFeign { int size = Integer.valueOf(businessTaskQuery.getSize() + ""); int current = Integer.valueOf(businessTaskQuery.getCurrent() + ""); List fields = businessTaskQuery.getParams().getFields(); - /* AtomicReference orgPath= new AtomicReference<>(""); - fields.forEach(f->{ - if(f.getField().equals(BusinessVariables.ORGPATH)) - orgPath.set(f.getValue()); - });*/ String orgPath=null; for(BusinessTaskParam b: fields){ if(b.getField().equals(BusinessVariables.ORGPATH)) { diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml index e048fde156..e392111903 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml @@ -163,7 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) flow GROUP BY flow.PROC_INST_ID_ ORDER BY flow.START_TIME_ DESC - LIMIT #{page},#{size} +