diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionVo.java index a19c2cf059..1344f4184e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionVo.java @@ -72,4 +72,7 @@ public class BaseManufactorSubscriptionVo implements Vo { @ApiModelProperty("厂家采购类型value") private String applyType; + + @ApiModelProperty(value = "排产申请sid") + private String vehApplySid; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/AppHandoverCertificateInfoVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/AppHandoverCertificateInfoVo.java new file mode 100644 index 0000000000..798951e509 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/AppHandoverCertificateInfoVo.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.base.api.basevehiclecertificate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppHandoverCertificateInfoVo implements Vo { + private static final long serialVersionUID = 5182269192194137775L; + + @ApiModelProperty("车架号") + private String vin; + @ApiModelProperty("车辆sid") + private String carSid; + @ApiModelProperty("") + private String invoice; + @ApiModelProperty("合格证日期") + private String date; + @ApiModelProperty("合格证附件") + private List invoiceImages; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java index 9a07b4412e..2759b9e125 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java @@ -125,4 +125,9 @@ public interface BaseVehicleCertificateFeign { @PostMapping("/updateCertificate") @ResponseBody ResultBean updateCertificate(@RequestBody CertificateDto dto); + + @ApiOperation("交车准备获取合格证信息") + @GetMapping("/getCertificateInfo/{vinNo}/{userSid}") + @ResponseBody + ResultBean getCertificateInfo(@PathVariable("vinNo") String vinNo, @PathVariable("userSid") String userSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeignFallback.java index 3a96b7ea2c..b4e96033c5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeignFallback.java @@ -77,4 +77,9 @@ public class BaseVehicleCertificateFeignFallback implements BaseVehicleCertifica return null; } + @Override + public ResultBean getCertificateInfo(String vinNo, String userSid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleStateTempOrLast.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleStateTempOrLast.java new file mode 100644 index 0000000000..32da53f5d9 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleStateTempOrLast.java @@ -0,0 +1,42 @@ +package com.yxt.anrui.base.common.enums; + +import lombok.Getter; + +/** + * @Author hp + * @Date 2022/11/17 15:10 + * @Description 临时状态 持久状态 + */ +public class VehicleStateTempOrLast { + @Getter + public static enum PaymentEnum { + + ARREARS_CARRY_VEHICLE("0001", "欠款提车"), + + ARREARS_INVOICING("0004", "欠款开票"), + + PAY_MODELS("0002", "交清车款"), + + BAG_CARD_BUSINESS("0003", "包牌业务"); + + /** + * code值 + */ + private final String code; + /** + * 备注 + */ + private final String remarks; + + /** + * 构造器 + * + * @param code code值 + * @param remarks 备注 + */ + private PaymentEnum(String code, String remarks) { + this.code = code; + this.remarks = remarks; + } + } +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java index 39f6f69d99..fb43a28bcc 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java @@ -109,6 +109,7 @@ public class BaseDiscountpackageService extends MybatisBaseService= date_format('" + effectiveStartDate + "','%Y-%m-%d')"). diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionMapper.xml index bd1d6617ec..7a73eaf15c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionMapper.xml @@ -5,8 +5,10 @@ - update base_manufactor_subscription set subscriptionPeo = #{subscriptionPeo} - , subscriptionDate = #{subscriptionDate} - , state = 1 + update base_manufactor_subscription set subscriptionPeo = #{subscriptionPeo} + , subscriptionDate = #{subscriptionDate} + , state = 1 , remarks=#{remarks} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java index 9e069743d0..aef7ee7a73 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java @@ -110,25 +110,25 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(query.getState())) { - qw.eq("state", query.getState()); + qw.eq("bms.state", query.getState()); if ("1".equals(query.getState())) { //若为认款，则按照认款日期倒序排序 - qw.orderByDesc("subscriptionDate"); + qw.orderByDesc("bms.subscriptionDate"); } } if (StringUtils.isNotBlank(query.getPaymentState())) { - qw.eq("paymentState", query.getPaymentState()); + qw.eq("bms.paymentState", query.getPaymentState()); } if (StringUtils.isNotBlank(query.getProSchAppNo())) { - qw.like("proSchAppNo", query.getProSchAppNo()); + qw.like("bms.proSchAppNo", query.getProSchAppNo()); } String subscriptionStartDate = query.getSubscriptionStartDate(); String subscriptionEndDate = query.getSubscriptionEndDate(); - qw.apply(StringUtils.isNotEmpty(subscriptionStartDate), "date_format (subscriptionDate,'%Y-%m-%d') >= date_format('" + subscriptionStartDate + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(subscriptionEndDate), "date_format (subscriptionDate,'%Y-%m-%d') <= date_format('" + subscriptionEndDate + "','%Y-%m-%d')" + qw.apply(StringUtils.isNotEmpty(subscriptionStartDate), "date_format (bms.subscriptionDate,'%Y-%m-%d') >= date_format('" + subscriptionStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(subscriptionEndDate), "date_format (bms.subscriptionDate,'%Y-%m-%d') <= date_format('" + subscriptionEndDate + "','%Y-%m-%d')" ); - qw.eq("createOrgSid", query.getCreateOrgSid()); - qw.orderByDesc("proSchAppNo"); + qw.eq("bms.createOrgSid", query.getCreateOrgSid()); + qw.orderByDesc("bms.proSchAppNo"); return qw; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java index 1a6ae62a57..1641d8957b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java @@ -297,6 +297,11 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign { return baseVehicleCertificateService.updateCertificate(dto); } + @Override + public ResultBean getCertificateInfo(String vinNo, String userSid) { + return baseVehicleCertificateService.getCertificateInfo(vinNo, userSid); + } + /** * @param sheet 单元格 * @param resultCell 列表的值 diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java index 8e86e549d1..cc14dec67f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java @@ -4,13 +4,21 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandExportVo; import com.yxt.anrui.base.api.basevehiclecertificate.*; +import com.yxt.anrui.base.api.commonappendix.CommonAppendix; +import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; +import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; +import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -29,6 +37,15 @@ import java.util.List; @Service public class BaseVehicleCertificateService extends MybatisBaseService { + @Autowired + SysStaffOrgFeign sysStaffOrgFeign; + + @Autowired + CommonAppendixService commonAppendixService; + + @Autowired + private FileUploadComponent fileUploadComponent; + /** * 台账信息条件分页查询 * @@ -190,4 +207,21 @@ public class BaseVehicleCertificateService extends MybatisBaseService getCertificateInfo(String vinNo, String userSid) { + ResultBean rb = ResultBean.fireFail(); + AppHandoverCertificateInfoVo vo = new AppHandoverCertificateInfoVo(); + String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + BaseVehicleCertificateVo baseVehicleCertificateVo = baseMapper.selectByVinNoAndOrgSid(vinNo, userOrgSid); + vo.setVin(vinNo); + vo.setDate(baseVehicleCertificateVo.getCertificateDate()); + vo.setInvoice(baseVehicleCertificateVo.getCertificationNo()); + List appAppendixList = commonAppendixService.getAppAppendixList(baseVehicleCertificateVo.getSid(), "0002"); + List invoiceImages = new ArrayList<>(); + for (CommonAppendixVo commonAppendixVo : appAppendixList) { + invoiceImages.add(fileUploadComponent.getUrlPrefix() + commonAppendixVo.getFilePath()); + } + vo.setInvoiceImages(invoiceImages); + return rb; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceInfoVo.java index a92b2829d5..cfe5f4ef03 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceInfoVo.java @@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -26,7 +27,7 @@ public class AppAdvanceInvoiceInfoVo implements Vo { @ApiModelProperty("所有车辆列表") private List vinList = new ArrayList<>(); @ApiModelProperty("欠款金额") - private String arrearsMoney; + private BigDecimal arrearsMoney; @ApiModelProperty("车型") private String carModel; @ApiModelProperty("开票信息确认书") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoicePageQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoicePageQuery.java index 65cbf0b777..96f04ddb86 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoicePageQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoicePageQuery.java @@ -13,4 +13,7 @@ public class AppAdvanceInvoicePageQuery implements Query { @ApiModelProperty("客户名称字段 合同编号字段") private String name; + + @ApiModelProperty("状态") + private String type; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapply.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapply.java index d04c27cdf2..e7a5c6a55f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapply.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapply.java @@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * Project: anrui_buscenter(销售业务)
* File: BusAdvanceGinvoiceapply.java
@@ -49,27 +51,27 @@ import lombok.Data; @TableName("bus_advance_ginvoiceapply") public class BusAdvanceGinvoiceapply extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("创建人接口") + @ApiModelProperty("创建人接口") private String createByName; // 创建人接口 - @ApiModelProperty("合同编号") + @ApiModelProperty("合同编号") private String contractNo; // 合同编号 - @ApiModelProperty("客户名称") + @ApiModelProperty("客户名称") private String customerName; // 客户名称 - @ApiModelProperty("数量") + @ApiModelProperty("数量") private Integer num; // 数量 - @ApiModelProperty("欠款金额") - private Float arrearsMoney; // 欠款金额 - @ApiModelProperty("承诺回款日期") + @ApiModelProperty("欠款金额") + private BigDecimal arrearsMoney; // 欠款金额 + @ApiModelProperty("承诺回款日期") private String returnedMoneyDate; // 承诺回款日期 - @ApiModelProperty("申请人") + @ApiModelProperty("申请人") private String applyName; // 申请人 - @ApiModelProperty("车型") + @ApiModelProperty("车型") private String carModel; // 车型 - @ApiModelProperty("申请日期") + @ApiModelProperty("申请日期") private String applyDate; // 申请日期 - @ApiModelProperty("提前开票原因key") + @ApiModelProperty("提前开票原因key") private String advGinReasonKey; // 提前开票原因key - @ApiModelProperty("提前开票原因value") + @ApiModelProperty("提前开票原因value") private String advGinReasonValue; // 提前开票原因value @ApiModelProperty("选择 手写 key 0 1") private String advGinReasonType; @@ -83,6 +85,9 @@ public class BusAdvanceGinvoiceapply extends BaseEntity { @ApiModelProperty(value = "用户sid") private String createBySid; + @ApiModelProperty(value = "状态") + private String type; + @ApiModelProperty(value = "节点状态") private String nodeState; @ApiModelProperty(value = "节点id") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehicleQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehicleQuery.java index a37c735a3f..c6b16c7350 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehicleQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehicleQuery.java @@ -14,4 +14,7 @@ public class AppArrearsCarryVehicleQuery implements Query { @ApiModelProperty("客户名称 合同编号") private String name; + @ApiModelProperty("状态") + private String type; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java index ddf9aaadb9..9c15995f93 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java @@ -70,6 +70,9 @@ public class BusArrearsCarryVehicleApply extends BaseEntity { @ApiModelProperty("分公司名称") private String useOrgName; + @ApiModelProperty("状态") + private String type; + @ApiModelProperty(value = "节点状态") private String nodeState; @ApiModelProperty(value = "节点id") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java index cb2f28bfae..fbc06abd89 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java @@ -98,7 +98,7 @@ public interface BusArrearsCarryVehicleApplyFeign { public ResultBean saveArrearsApply(@Valid @RequestBody AppArrearsCarryDto dto); @ApiOperation("手机端-删除欠款提车") - @GetMapping("/deleteArrearsTakeCar") + @DeleteMapping("/deleteArrearsTakeCar") @ResponseBody public ResultBean deleteArrearsTakeCar(@SpringQueryMap AppAdvanceArrearsInfoQuery query); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFileEnum.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFileEnum.java index 940bf9ccf0..f8acbccb85 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFileEnum.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFileEnum.java @@ -16,6 +16,9 @@ public enum BuscenterFileEnum { ENTRUST("007", "委托提车授权书"), ENTRUST_CONFIRM("008", "交车资料确认单"), EXIT_TICKET("009", "出门证"), + HANDOVER_POLICY("010", "保单照片"), + HANDOVER_LICENCE("011", "临时牌照"), + HANDOVER_OTHRRDATA("012", "其他资料"), ; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepare.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepare.java index 2943f43145..5cd9ded058 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepare.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepare.java @@ -54,6 +54,8 @@ public class BusHandoverPrepare extends BaseEntity { private String contractNo; // 合同编号 @ApiModelProperty("客户名称") private String customerName; // 客户名称 + @ApiModelProperty("客户sid") + private String customerSid; @ApiModelProperty("联系电话") private String mobile; // 联系电话 @ApiModelProperty("品牌") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java index 23961f0477..0adae430a6 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java @@ -13,6 +13,8 @@ public class BusHandoverPrepareAddDto implements Dto { @ApiModelProperty("合同编号") private String contractNo; // 合同编号 + @ApiModelProperty("客户Sid") + private String customerSid; // 客户名称 @ApiModelProperty("客户名称") private String customerName; // 客户名称 @ApiModelProperty("联系电话") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeign.java index aff138e67c..aed3072d24 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeign.java @@ -140,5 +140,9 @@ public interface BusHandoverPrepareFeign { @ResponseBody ResultBean getDeliveryPlanInfoDetail(@SpringQueryMap AppBusHandoverPrepareInfoQuery query); + @ApiOperation("提交交车准备信息") + @PostMapping("/submitDeliveryPlanInfo") + @ResponseBody + ResultBean submitDeliveryPlanInfo(@RequestBody AppSubmitHandoverPrepareDto dto); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java index f8c87e1751..4b4901c6d7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java @@ -128,4 +128,9 @@ public class BusHandoverPrepareFeignFallback implements BusHandoverPrepareFeign public ResultBean getDeliveryPlanInfoDetail(AppBusHandoverPrepareInfoQuery query) { return null; } + + @Override + public ResultBean submitDeliveryPlanInfo(AppSubmitHandoverPrepareDto dto) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoQuery.java index 75a9d7fcf0..ca8553a0a3 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoQuery.java @@ -11,6 +11,8 @@ public class AppCertificateInfoQuery implements Query { @ApiModelProperty("车架号") private String vin; - @ApiModelProperty("车辆sid") - private String carSid; + @ApiModelProperty("用户sid") + private String userSid; + + private String sid; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoVo.java index b82d618365..eb481cd38b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoVo.java @@ -10,10 +10,10 @@ import java.util.List; public class AppCertificateInfoVo implements Vo { private static final long serialVersionUID = -4673876588141577559L; + private String sid; + @ApiModelProperty("车架号") private String vin; - @ApiModelProperty("车辆sid") - private String carSid; @ApiModelProperty("") private String invoice; @ApiModelProperty("合格证日期") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoQuery.java index e40d7df0ad..370f60776e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoQuery.java @@ -11,7 +11,6 @@ public class AppInvoicingInfoQuery implements Query { @ApiModelProperty("车架号") private String vin; - @ApiModelProperty("车辆sid") - private String carSid; + private String sid; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoVo.java index 9522134e0d..510e3e7b62 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoVo.java @@ -10,10 +10,10 @@ import java.util.List; public class AppInvoicingInfoVo implements Vo { private static final long serialVersionUID = 8827030575604891015L; + private String sid; + @ApiModelProperty("车架号") private String vin; - @ApiModelProperty("车辆sid") - private String carSid; @ApiModelProperty("发票代码") private String invoice; @ApiModelProperty("开票日期") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataDto.java index b7ccaeb451..13adbe6255 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataDto.java @@ -11,10 +11,8 @@ public class AppOtherDataDto implements Dto { private static final long serialVersionUID = 6765583840451569166L; - @ApiModelProperty("") private String sid; - @ApiModelProperty("车辆sid") - private String carSid; + @ApiModelProperty("车架号") private String vin; @ApiModelProperty("其他资料照片") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoQuery.java index 7e6e5f1592..0aee884b5d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoQuery.java @@ -8,10 +8,9 @@ import lombok.Data; public class AppOtherDataInfoQuery implements Query { private static final long serialVersionUID = 6544083379297436705L; - @ApiModelProperty("") + private String sid; - @ApiModelProperty("车辆sid") - private String carSid; + @ApiModelProperty("车架号") private String vin; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoVo.java index baa4470a3e..cdd66a7bbc 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoVo.java @@ -10,10 +10,8 @@ import java.util.List; public class AppOtherDataInfoVo implements Vo { private static final long serialVersionUID = 7178241214019642737L; - @ApiModelProperty("") private String sid; - @ApiModelProperty("车辆sid") - private String carSid; + @ApiModelProperty("车架号") private String vin; @ApiModelProperty("其他资料照片") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyDto.java index e89dcd052e..98d6b3672b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyDto.java @@ -14,10 +14,9 @@ public class AppPolicyDto implements Dto { private List policyList; @ApiModelProperty("临时牌照") private List licenceList; - @ApiModelProperty("sid") + private String sid; - @ApiModelProperty("车辆照片") - private String carSid; + @ApiModelProperty("车架号") private String vin; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoQuery.java index e8682b7864..d77fe68664 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoQuery.java @@ -13,7 +13,4 @@ public class AppPolicyInfoQuery implements Query { @ApiModelProperty("车架号") private String vin; - - @ApiModelProperty("车辆sid") - private String carSid; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoVo.java index fccbcc364b..39b0934d60 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoVo.java @@ -1,4 +1,20 @@ package com.yxt.anrui.buscenter.api.bushandoverprepare.app; -public class AppPolicyInfoVo { +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppPolicyInfoVo implements Vo { + private static final long serialVersionUID = 5449450307167004770L; + private String sid; + + @ApiModelProperty("保单照片") + private List policyList; + @ApiModelProperty("临时牌照") + private List licenceList; + @ApiModelProperty("车架号") + private String vin; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppSubmitHandoverPrepareDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppSubmitHandoverPrepareDto.java new file mode 100644 index 0000000000..b5a17e6bf8 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppSubmitHandoverPrepareDto.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.buscenter.api.bushandoverprepare.app; + +import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleDto; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppSubmitHandoverPrepareDto implements Dto { + private static final long serialVersionUID = 138156532304986357L; + + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("合同编号") + private String contractId; + @ApiModelProperty("车辆集合") + private List carDataList; + @ApiModelProperty("记录sid") + private String sid; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织机构") + private String orgPath; + @ApiModelProperty("付款方式") + private String payType; + @ApiModelProperty("车型") + private String model; + @ApiModelProperty("品牌") + private String brand; + + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleDto.java index 2fd45aab5e..2a6752f2d4 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleDto.java @@ -13,15 +13,15 @@ public class AppBusHandoverPrepareVehicleDto implements Dto { @ApiModelProperty("车架号") private String vinNo; // 车架号 @ApiModelProperty("开票状态") - private int invoicingState; // 开票状态 + private boolean invoicingState; // 开票状态 @ApiModelProperty("合格证状态") - private int certificateState; // 合格证状态 + private boolean certificateState; // 合格证状态 @ApiModelProperty("保单状态") - private int policyState; // 保单状态 + private boolean policyState; // 保单状态 @ApiModelProperty("随车资料状态") - private int onBoardDataState; // 随车资料状态 + private boolean onBoardDataState; // 随车资料状态 @ApiModelProperty("其他资料状态") - private int otherDataState; // 其他资料状态 + private boolean otherDataState; // 其他资料状态 @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid @ApiModelProperty("创建组织名称") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleInfoVo.java index 991ee4645a..56db821af7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleInfoVo.java @@ -8,6 +8,8 @@ import lombok.Data; public class AppBusHandoverPrepareVehicleInfoVo implements Vo { private static final long serialVersionUID = 1415137296013613928L; + @ApiModelProperty("sid") + private String sid; // 交车申请表sid @ApiModelProperty("交车申请表sid") private String mainSid; // 交车申请表sid @ApiModelProperty("车架号") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWait.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWait.java index 5fa467b29e..fd0931b96a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWait.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWait.java @@ -39,6 +39,12 @@ public class BusHandoverWait extends BaseEntity { @ApiModelProperty("付款状态value") private String payStateValue; + @ApiModelProperty("车型sid") + private String modelSid; + + @ApiModelProperty("车型别名") + private String modelName; + @ApiModelProperty("分公司sid") private String useOrgSid; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitDto.java index f188850a96..977672a3e6 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitDto.java @@ -45,4 +45,7 @@ public class BusHandoverWaitDto implements Dto { @ApiModelProperty("车型别名") private String modelName; + @ApiModelProperty("分公司sid") + private String useOrgSid; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/contract/AppRovalContractPageQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/contract/AppRovalContractPageQuery.java index 1a225f3bb4..026e538cc9 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/contract/AppRovalContractPageQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/contract/AppRovalContractPageQuery.java @@ -14,4 +14,7 @@ public class AppRovalContractPageQuery implements Query { @ApiModelProperty("车架号 客户名称 合同编号") private String name; + + @ApiModelProperty("状态") + private int stateType; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.java index b8ac670bee..ec2a7b1cfe 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.java @@ -34,6 +34,7 @@ import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import java.util.List; import java.util.Map; @@ -69,4 +70,7 @@ public interface BusAdvanceGinvoiceapplyMapper extends BaseMapper getAdvanceInvoiceList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); int updateFlowFiled(Map map); + + @Update("update bus_advance_ginvoiceapply set `type` = '2' where sid =#{sid}") + void updateType(@Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java index 4ff6521c9e..9afd2c3a76 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java @@ -30,16 +30,20 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.*; +import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto; +import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractVo; +import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppAdvanceInvoiceTaskQuery; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppSubmitAdvanceInvoiceDto; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.GetNodeQuery; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.GetNodeVo; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo; import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicle; import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDetailsVo; import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDto; @@ -81,6 +85,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -133,6 +138,8 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService listPage(PagerQuery pq) { BusAdvanceGinvoiceapplyQuery query = pq.getParams(); @@ -385,6 +392,9 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); IPage iPage = baseMapper.getAdvanceInvoiceList(page, qw, params.getName()); for (AppAdvanceInvoicePageVo record : iPage.getRecords()) { @@ -408,18 +418,14 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService carList = new ArrayList<>(); List vinList = new ArrayList<>(); - int arrearsMoney = 0; List carLists = busGinvoiceapplyVehicleService.fetchByAdvGinSid(contractSid); for (BusGinvoiceapplyVehicleDetailsVo vehicleDetailsVo : carLists) { AdCarListVo adCarListVo = new AdCarListVo(); adCarListVo.setPrice(vehicleDetailsVo.getDealMoney()); adCarListVo.setVin(vehicleDetailsVo.getVinNo()); carList.add(adCarListVo); - int dealMoney = Integer.parseInt(vehicleDetailsVo.getDealMoney()); - arrearsMoney = dealMoney + arrearsMoney; } vo.setCarList(carList); - vo.setArrearsMoney(String.valueOf(arrearsMoney)); List vinLists = busSalesOrderService.selectByContractNo(busAdvanceGinvoiceapply.getContractNo()); if (vinLists.size() > 0) { for (AppRovalContractPageVo appRovalContractPageVo : vinLists) { @@ -482,6 +488,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService 0) { for (String vin : dto.getVinList()) { BusGinvoiceapplyVehicle busGinvoiceapplyVehicle = new BusGinvoiceapplyVehicle(); @@ -492,11 +499,16 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService carList = dto.getCarList(); @@ -522,6 +533,8 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService busGinvoiceapplyVehicleDetailsVos = busGinvoiceapplyVehicleService.fetchByAdvGinSid(busAdvanceGinvoiceapply.getSid()); + for (BusGinvoiceapplyVehicleDetailsVo busGinvoiceapplyVehicleDetailsVo : busGinvoiceapplyVehicleDetailsVos) { + baseVehicleTempstateDto.setVehSid(busGinvoiceapplyVehicleDetailsVo.getVehicleSid()); + baseVehicleTempstateFeign.save(baseVehicleTempstateDto); + } + baseMapper.updateType(busAdvanceGinvoiceapply.getSid()); //创建BusinessVariables实体对象 BusinessVariables bv = new BusinessVariables(); //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java index 2577f415d2..3acb12a021 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java @@ -74,4 +74,6 @@ public interface BusArrearsCarryVehicleApplyMapper extends BaseMapper map); + + void updateType(@Param("businessSid") String businessSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml index 77bfb58e7d..7f55ddb28d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml @@ -98,4 +98,10 @@ WHERE sid = #{sid} + + + update bus_arrears_carry_vehicle_apply + set `type` = '2' + where sid = #{businessSid} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java index 4ab0476e2e..9b9002a80b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java @@ -8,10 +8,13 @@ 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.BaseVehicleSelectVo; +import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto; +import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractVo; +import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceInfoVo; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapply; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteAdvanceInvoiceDto; @@ -23,6 +26,7 @@ import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarry import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo; import com.yxt.anrui.buscenter.api.busdelivered.AddRetrievalApplyDto; import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo; import com.yxt.anrui.buscenter.biz.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsService; import com.yxt.anrui.buscenter.biz.busdelivered.BusDeliveredService; @@ -30,6 +34,8 @@ import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; import com.yxt.anrui.buscenter.biz.flow.FlowableService; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; +import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign; +import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; @@ -129,6 +135,12 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); IPage iPage = baseMapper.getAdvanceInvoiceList(page, qw, params.getName()); return iPage; @@ -554,8 +569,12 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService 0) { List vinList = dto.getVinList(); @@ -645,6 +664,16 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService busArrearsCarryVehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid()); + for (BusArrearsCarryVehicleDetailsVo busArrearsCarryVehicleDetailsVo : busArrearsCarryVehicleDetailsVos) { + baseVehicleTempstateDto.setVehSid(busArrearsCarryVehicleDetailsVo.getVehicleSid()); + baseVehicleTempstateFeign.save(baseVehicleTempstateDto); + } + baseMapper.updateType(businessSid); //创建BusinessVariables实体对象 BusinessVariables bv = new BusinessVariables(); //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 @@ -770,6 +799,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService recipientSidList = new ArrayList<>(); + //修改状态 + baseMapper.updateType(bv.getBusinessSid()); + //推送出库申请 List vehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid()); if (vehicleDetailsVos.size() > 0) { @@ -780,10 +812,15 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService recipientSidList = new ArrayList<>(); + //修改状态 + baseMapper.updateType(bv.getBusinessSid()); + //推送出库申请 List vehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid()); if (vehicleDetailsVos.size() > 0) { @@ -909,6 +949,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService { - List selectByLinkSid(@Param("sid") String sid, @Param("attachType")String attachType); + List selectByLinkSid(@Param("sid") String sid, @Param("attachType") String attachType); int deleteByLinkSid(String sid); BuscenterFile selectByLinkSidOne(@Param("sid") String sid, @Param("attachType") String attachType); + + @Delete("delete from buscenter_file where linkSid = #{sid} and attachType = #{attachType}") + void delByLinkSidOrType(@Param("sid") String sid, @Param("attachType") String attachType); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscenterfile/BuscenterFileService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscenterfile/BuscenterFileService.java index 33f0cdda18..79d0c1954c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscenterfile/BuscenterFileService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscenterfile/BuscenterFileService.java @@ -48,4 +48,8 @@ public class BuscenterFileService extends MybatisBaseService getDeliveryPlanInfoDetail(AppBusHandoverPrepareInfoQuery query) { return busHandoverPrepareService.getDeliveryPlanInfoDetail(query); } + + @Override + public ResultBean submitDeliveryPlanInfo(AppSubmitHandoverPrepareDto dto) { + return busHandoverPrepareService.submitDeliveryPlanInfo(dto); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java index 112fe3ed0d..a6a849fc46 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java @@ -28,15 +28,27 @@ package com.yxt.anrui.buscenter.biz.bushandoverprepare; 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.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.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; 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; @@ -47,6 +59,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -70,6 +83,16 @@ public class BusHandoverPrepareService extends MybatisBaseService createQueryWrapper(BusHandoverPrepareQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -182,27 +205,70 @@ public class BusHandoverPrepareService extends MybatisBaseService resultBean = finBillVehicleFeign.selDetailsByVinNo(vin); AppInvoicingInfoVinNoVo data = resultBean.getData(); BeanUtil.copyProperties(data, vo); + vo.setVin(vin); return rb.success().setData(vo); } public ResultBean getCertificateInfo(AppCertificateInfoQuery query) { - return null; + ResultBean rb = new ResultBean(); + AppCertificateInfoVo vo = new AppCertificateInfoVo(); + String vinNo = query.getVin(); + String userSid = query.getUserSid(); + ResultBean resultBean = baseVehicleCertificateFeign.getCertificateInfo(vinNo, userSid); + AppHandoverCertificateInfoVo data = resultBean.getData(); + BeanUtil.copyProperties(data, vo); + vo.setVin(vinNo); + return rb.success().setData(vo); } public ResultBean getPolicyInfo(AppPolicyInfoQuery query) { - return null; + ResultBean rb = new ResultBean<>(); + AppPolicyInfoVo vo = new AppPolicyInfoVo(); + List policyList = new ArrayList<>();// 保单照片 + List licenceList = new ArrayList<>();// 临时牌照 + List policyFiles = buscenterFile.selectByLinkSid(query.getSid(), BuscenterFileEnum.HANDOVER_POLICY.getAttachType()); + for (BuscenterFile file : policyFiles) { + policyList.add(fileUploadComponent.getUrlPrefix() + file.getFilePath()); + } + List licenceFiles = buscenterFile.selectByLinkSid(query.getSid(), BuscenterFileEnum.HANDOVER_LICENCE.getAttachType()); + for (BuscenterFile file : licenceFiles) { + licenceList.add(fileUploadComponent.getUrlPrefix() + file.getFilePath()); + } + vo.setPolicyList(policyList); + vo.setLicenceList(licenceList); + vo.setSid(query.getSid()); + vo.setVin(query.getVin()); + return rb.success().setData(vo); } public ResultBean savePolicyInfo(AppPolicyDto dto) { - return null; + ResultBean rb = new ResultBean<>(); + buscenterFile.delByLinkSidOrType(dto.getSid(), BuscenterFileEnum.HANDOVER_POLICY.getAttachType()); + buscenterFile.saveAll(dto.getSid(), dto.getPolicyList(), BuscenterFileEnum.HANDOVER_POLICY.getAttachType()); + buscenterFile.delByLinkSidOrType(dto.getSid(), BuscenterFileEnum.HANDOVER_LICENCE.getAttachType()); + buscenterFile.saveAll(dto.getSid(), dto.getLicenceList(), BuscenterFileEnum.HANDOVER_LICENCE.getAttachType()); + return rb.success(); } public ResultBean getOtherDataInfo(AppOtherDataInfoQuery query) { - return null; + ResultBean rb = new ResultBean<>(); + AppOtherDataInfoVo vo = new AppOtherDataInfoVo(); + List otherFiles = buscenterFile.selectByLinkSid(query.getSid(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType()); + List otherInfo = new ArrayList<>(); + for (BuscenterFile file : otherFiles) { + otherInfo.add(fileUploadComponent.getUrlPrefix() + file.getFilePath()); + } + vo.setOtherInfo(otherInfo); + vo.setSid(query.getSid()); + vo.setVin(query.getVin()); + return rb.success().setData(vo); } public ResultBean saveOtherDataInfo(AppOtherDataDto dto) { - return null; + ResultBean rb = new ResultBean<>(); + buscenterFile.delByLinkSidOrType(dto.getSid(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType()); + buscenterFile.saveAll(dto.getSid(), dto.getOtherInfo(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType()); + return rb.success(); } public ResultBean saveDeliveryPlanInfo(AppHandoverPrepareDto dto) { @@ -225,6 +291,51 @@ public class BusHandoverPrepareService extends MybatisBaseService getDeliveryPlanInfoDetail(AppBusHandoverPrepareInfoQuery query) { - return null; + ResultBean rb = ResultBean.fireFail(); + String sid = query.getSid(); + AppBusHandoverPrepareInfoVo appBusHandoverPrepareInfoVo = new AppBusHandoverPrepareInfoVo(); + BusHandoverPrepare busHandoverPrepare = fetchBySid(sid); + BeanUtil.copyProperties(busHandoverPrepare, appBusHandoverPrepareInfoVo); + List list = busHandoverPrepareVehicleService.selByMainSid(sid); + appBusHandoverPrepareInfoVo.setCarDataList(list); + appBusHandoverPrepareInfoVo.setUserSid(query.getUserSid()); + return rb.success().setData(appBusHandoverPrepareInfoVo); + } + + public ResultBean submitDeliveryPlanInfo(AppSubmitHandoverPrepareDto dto) { + ResultBean rb = ResultBean.fireFail(); + BusHandoverPrepare busHandoverPrepare = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto, busHandoverPrepare); + List handoverPrepareVehicleDtos = dto.getCarDataList(); + if (handoverPrepareVehicleDtos.size() > 0) { + String sid = dto.getSid(); + busHandoverPrepareVehicleService.deleteByMainSid(sid); + for (AppBusHandoverPrepareVehicleDto handoverPrepareVehicleDto : handoverPrepareVehicleDtos) { + BusHandoverPrepareVehicle busHandoverPrepareVehicle = new BusHandoverPrepareVehicle(); + BeanUtil.copyProperties(handoverPrepareVehicleDto, busHandoverPrepareVehicle); + busHandoverPrepareVehicle.setMainSid(busHandoverPrepare.getSid()); + busHandoverPrepareVehicleService.save(busHandoverPrepareVehicle); + + BusHandoverWaitDto busHandoverWaitDto = new BusHandoverWaitDto(); + busHandoverWaitDto.setContractNo(busHandoverPrepare.getContractNo()); + busHandoverWaitDto.setCustomerName(busHandoverPrepare.getCustomerName()); + busHandoverWaitDto.setCustomerSid(busHandoverPrepare.getCustomerSid()); + busHandoverWaitDto.setVinNo(handoverPrepareVehicleDto.getVinNo()); + BaseVehicle data = baseVehicleFeign.selectByVinNoAndOrgSid(handoverPrepareVehicleDto.getVinNo(), busHandoverPrepare.getUseOrgSid()).getData(); + if (data!=null){ + busHandoverWaitDto.setVinSid(data.getSid()); + busHandoverWaitDto.setModelSid(data.getModelSid()); + busHandoverWaitDto.setModelName(data.getModelName()); + } + busHandoverWaitDto.setUseOrgSid(busHandoverPrepare.getUseOrgSid()); + busHandoverWaitDto.setPayTypeKey(busHandoverPrepare.getPayTypeKey()); + busHandoverWaitDto.setPayTypeValue(busHandoverPrepare.getPayType()); + busHandoverWaitService.saveAll(busHandoverWaitDto); + } + } + busHandoverPrepare.setHandoverPrepareState("已准备"); + busHandoverPrepare.setHandoverPrepareStateKey("2"); + updateById(busHandoverPrepare); + return rb.success(); } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.java index 1febadf73e..1b383f3045 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.java @@ -67,19 +67,19 @@ public interface BusHandoverPrepareVehicleMapper extends BaseMapper selByMainSid(@Param("sid") String sid); - @Update("update bus_handover_prepare_vehicle set invoicingState = 1 where mainSid = #{sid} and vinNo = #{vin}") + @Update("update bus_handover_prepare_vehicle set invoicingState = 1 where sid = #{sid} and vinNo = #{vin}") void saveInvoiceState(@Param("sid") String sid, @Param("vin") String vin); - @Update("update bus_handover_prepare_vehicle set certificateState = 1 where mainSid = #{sid} and vinNo = #{vin} ") + @Update("update bus_handover_prepare_vehicle set certificateState = 1 where sid = #{sid} and vinNo = #{vin} ") void saveCertificateState(@Param("sid") String sid, @Param("vin") String vin); - @Update("update bus_handover_prepare_vehicle set policyState = 1 where mainSid = #{sid} and vinNo = #{vin} ") + @Update("update bus_handover_prepare_vehicle set policyState = 1 where sid = #{sid} and vinNo = #{vin} ") void savePolicyState(@Param("sid") String sid, @Param("vin") String vin); - @Update("update bus_handover_prepare_vehicle set onBoardDataState = 1 where mainSid = #{sid} and vinNo = #{vin} ") + @Update("update bus_handover_prepare_vehicle set onBoardDataState = 1 where sid = #{sid} and vinNo = #{vin} ") void saveOnBoardState(@Param("sid") String sid, @Param("vin") String vin); - @Update("update bus_handover_prepare_vehicle set otherDataState = 1 where mainSid = #{sid} and vinNo = #{vin} ") + @Update("update bus_handover_prepare_vehicle set otherDataState = 1 where sid = #{sid} and vinNo = #{vin} ") void saveOtherDataState(@Param("sid") String sid, @Param("vin") String vin); @Delete("delete from bus_handover_prepare_vehicle where mainSid = #{sid}") diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.xml index 106f1b84cc..7d743b4296 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.xml @@ -16,7 +16,8 @@ @@ -308,11 +311,14 @@ left join bus_deposit_vehicle_customer bc on bd.sid = bc.billSid ${ew.sqlSegment} - - and concat(bd.billNo - , bc.customerName - , bc.customerMobile) LIKE concat('%' - , #{name} + + and concat(IFNULL(bd.billNo + , '') + , ifnull(bc.customerName + , '') + , ifnull(bc.customerMobile + , '')) LIKE concat('%' + , #{names} , '%') @@ -344,6 +350,8 @@ - update bus_main_deposit set modifyTime = #{date} where sid = #{sid} + update bus_main_deposit + set modifyTime = #{date} + where sid = #{sid} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java index 9721ff694c..20edc0cca1 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java @@ -178,4 +178,7 @@ public interface BusSalesOrderMapper extends BaseMapper { IPage getApprovalContractList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); List selectByContractNo(@Param("contractNo") String contractNo); + + + BusSalesOrderDetailsVo getByContractNo(String contractNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index f80f2e2bb2..5c84cb5e71 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -263,4 +263,9 @@ LEFT JOIN bus_sales_order_vehicle bsov ON bsov.salesOrderSid = bo.sid WHERE bo.contractNo = #{contractNo} + \ No newline at end of file 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 648d06fe45..6de46159c0 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 @@ -42,6 +42,8 @@ import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixFeign; import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyFeign; import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePriceVo; +import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; +import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateVo; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign; import com.yxt.anrui.base.api.busvehicleapplydetail.AppBusVehicleApplyListVo; import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailFeign; @@ -53,6 +55,7 @@ import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractVo; import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.enums.VehicleState; +import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious; @@ -232,6 +235,8 @@ public class BusSalesOrderService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("bo.staffSid", sysUserVo.getStaffSid()); + List vinList = new ArrayList(); + if (params.getStateType() == 1) { + List data = baseVehicleTempstateFeign.selectAll(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()).getData(); + for (BaseVehicleTempstateVo datum : data) { + BaseVehicleSelectVo vehicleSelectVo = baseVehicleFeign.details(datum.getVehSid()).getData(); + vinList.add(vehicleSelectVo.getVinNo()); + } + } else if (params.getStateType() == 2) { + List data = baseVehicleTempstateFeign.selectAll(VehicleStateTempOrLast.PaymentEnum.ARREARS_INVOICING.getCode()).getData(); + for (BaseVehicleTempstateVo datum : data) { + BaseVehicleSelectVo vehicleSelectVo = baseVehicleFeign.details(datum.getVehSid()).getData(); + vinList.add(vehicleSelectVo.getVinNo()); + } + } + if (vinList.size() > 0) { + qw.notIn("bsov.linkNo", vinList); + } IPage page = PagerUtil.queryToPage(pagerQuery); IPage iPage = baseMapper.getApprovalContractList(page, qw, params.getName()); for (AppRovalContractPageVo record : iPage.getRecords()) { @@ -2868,4 +2890,9 @@ public class BusSalesOrderService extends MybatisBaseService list = baseMapper.selectByContractNo(contractNo); return list; } + + public BusSalesOrderDetailsVo getByContractNo(String contractNo) { + BusSalesOrderDetailsVo vo = baseMapper.getByContractNo(contractNo); + return vo; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finaccountnum/finaccountnum.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finaccountnum/finaccountnum.vue index 4594735d0d..f37f501b8a 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finaccountnum/finaccountnum.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finaccountnum/finaccountnum.vue @@ -112,7 +112,6 @@ export default { // 查询 ----------- tableKey: 0, list: [], - total: 1, listLoading: false, listQuery: { params: { @@ -121,7 +120,8 @@ export default { userSid: '' }, current: 1, - size: 5 + size: 5, + total: 0 }, rules: {} // ------------------------------------ @@ -198,10 +198,10 @@ export default { this.listLoading = false if (response.code === '200' && response.data && response.data.total > 0) { this.list = response.data.records - this.total = response.data.total + this.listQuery.total = response.data.total } else { this.list = [] - this.total = 0 + this.listQuery.total = 0 } }) }, diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue index 02f0fafa48..2481fd55f4 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue @@ -183,7 +183,8 @@ export default { collectionTypeKey: '', subscriptionState: '', useOrgSid: '', - createBySid: '' + createBySid: '', + state: '' }, total: 0 } @@ -242,6 +243,7 @@ export default { getList() { this.listLoading = true this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid') + this.listQuery.params.state = 0 listPage(this.listQuery).then((response) => { this.listLoading = false if (response.code === '200') { @@ -266,7 +268,8 @@ export default { collectionTypeKey: '', subscriptionState: '', useOrgSid: '', - createBySid: '' + createBySid: '', + state: '' }, total: 0 } diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue index df25c1f31c..077b2c90df 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue @@ -579,6 +579,7 @@ export default { remittanceConfirmationUrl: '', balance: '', useOrgSid: '', + userSid: '', finSelectedReceivablesDetaileds: [], paymentVoucherAppendixs: [], remittanceConfirmationAppendixs: [] diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue index 42f03402d7..bc4bf9285d 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue @@ -166,7 +166,8 @@ export default { collectionTypeKey: '', subscriptionState: '', useOrgSid: '', - createBySid: window.sessionStorage.getItem('staffSid') + createBySid: '', + state: '' }, total: 0 } @@ -208,6 +209,8 @@ export default { // 查询列表信息 getList() { this.listLoading = true + this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid') + this.listQuery.params.state = 1 listPage(this.listQuery).then((response) => { this.listLoading = false if (response.code === '200') { @@ -231,7 +234,8 @@ export default { collectionTypeKey: '', subscriptionState: '', useOrgSid: '', - createBySid: window.sessionStorage.getItem('staffSid') + createBySid: '', + state: '' }, total: 0 } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml index af85870a49..949ecd9513 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml @@ -96,7 +96,6 @@ SELECT *, emergencyMobile AS mobile2 FROM crm_customer_temp WHERE sid = #{sid} - AND staffSid = #{staffSid} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java index 60f96a11aa..1959c8ccb2 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java @@ -25,12 +25,14 @@ *********************************************************/ package com.yxt.anrui.fin.api.fincollectionconfirmation; +import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; 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.ApiModelProperty; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; @@ -121,5 +123,9 @@ public interface FinCollectionConfirmationFeign { @GetMapping("/billeNoList") ResultBean> billeNoList(); + @ApiOperation("欠款提车-查询欠款金额及收款金额") + @GetMapping("/selectArrearsMoneyOrCollectionMoney/{contractNo}") + ResultBean selectArrearsMoneyOrCollectionMoney(@PathVariable("contractNo") String contractNo); + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java index 83c18f7e01..4b93ae0232 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.fin.api.fincollectionconfirmation; +import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import com.yxt.common.core.query.PagerQuery; @@ -126,4 +127,9 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf public ResultBean> billeNoList() { return null; } + + @Override + public ResultBean selectArrearsMoneyOrCollectionMoney(String contractNo) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/AppBusArrearsCarryMoneyVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/AppBusArrearsCarryMoneyVo.java new file mode 100644 index 0000000000..5690e74582 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/AppBusArrearsCarryMoneyVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.fin.api.fincollectionconfirmation.app; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class AppBusArrearsCarryMoneyVo implements Vo { + private static final long serialVersionUID = 315129249938477010L; + + @ApiModelProperty("合同金额") + private BigDecimal contractAmount; + + @ApiModelProperty("收款总金额") + private BigDecimal contractCollectionMoney; + + @ApiModelProperty("欠款金额") + private BigDecimal arrearsMoney; + + @ApiModelProperty("收款金额") + private BigDecimal subscriptionMoney; + +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java index a3ba1a66c9..a45aeebe61 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java @@ -27,6 +27,7 @@ package com.yxt.anrui.fin.biz.fincollectionconfirmation; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; +import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import com.yxt.common.base.utils.PagerUtil; @@ -199,4 +200,9 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF public ResultBean> billeNoList() { return finCollectionConfirmationService.billNoList(); } + + @Override + public ResultBean selectArrearsMoneyOrCollectionMoney(String contractNo) { + return finCollectionConfirmationService.selectArrearsMoneyOrCollectionMoney(contractNo); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 763a12cb7d..52a70541b0 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -32,7 +32,10 @@ import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; +import com.yxt.anrui.base.api.commoncontract.CommonContract; +import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; +import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinSelectDto; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto; @@ -95,6 +98,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService createQueryWrapper(FinCollectionConfirmationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -808,4 +813,23 @@ public class FinCollectionConfirmationService extends MybatisBaseService stringList = baseMapper.billNoList(); return rb.success().setData(stringList); } + + public ResultBean selectArrearsMoneyOrCollectionMoney(String contractNo) { + ResultBean rb = ResultBean.fireFail(); + AppBusArrearsCarryMoneyVo vo = new AppBusArrearsCarryMoneyVo(); + //获取已认款金额 + List list = finSelectedReceivablesDetailedService.selByContractNo(contractNo); + BigDecimal subscriptionMoney = new BigDecimal(0); + for (AppBusArrearsCarryMoneyVo appBusArrearsCarryMoneyVo : list) { + subscriptionMoney = subscriptionMoney.add(appBusArrearsCarryMoneyVo.getSubscriptionMoney()); + } + vo.setContractCollectionMoney(subscriptionMoney); + //获取欠款金额 + CommonContract commonContract = commonContractFeign.selectByNo(contractNo).getData(); + String contractAmount = commonContract.getContractAmount(); + BigDecimal contractAmountMoney = new BigDecimal(contractAmount); + BigDecimal arrearsMoney = contractAmountMoney.subtract(subscriptionMoney); + vo.setArrearsMoney(arrearsMoney); + return rb.success().setData(vo); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java index 320b512bc4..7a764a7b5c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java @@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo; +import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; @@ -96,4 +97,6 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper selectByCollSid(@Param("collectionBillSid") String collectionBillSid); + + List selByContractNo(String contractNo); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index e411208079..3993f43261 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -84,4 +84,15 @@ FROM fin_selected_receivables_detailed WHERE collSid = #{collectionBillSid} + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java index cecf982bc5..51e0cc2915 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java @@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo; +import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedQuery; @@ -206,4 +207,9 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService selectByCollSid(String collectionBillSid) { return baseMapper.selectByCollSid(collectionBillSid); } + + public List selByContractNo(String contractNo) { + List list = baseMapper.selByContractNo(contractNo); + return list; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-ui/.env.development b/anrui-scm/anrui-scm-ui/.env.development index 67f7e0a1e3..ad912c6688 100644 --- a/anrui-scm/anrui-scm-ui/.env.development +++ b/anrui-scm/anrui-scm-ui/.env.development @@ -5,5 +5,5 @@ ENV = 'development' VUE_APP_BASE_API = '/api' ## 配置测试和本地开发时的 接口地址 -VUE_APP_URL = "http://anrui.yyundong.com" +VUE_APP_URL = "http://192.168.1.100:8111" ##VUE_APP_URL = "http://120.46.172.184:8111" diff --git a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue index 09710ba966..545a0f0c65 100644 --- a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue @@ -64,10 +64,10 @@ - *供应商办公电话 + 供应商办公电话 - + @@ -200,13 +200,6 @@ export default { callback() } } - var checkBanGongDianHua = (rule, value, callback) => { - const BanGongDianHua = /\d{3}-\d{8}|\d{4}-\d{7}/ - if (BanGongDianHua.test(value)) { - return callback() - } - callback(new Error('请输入办公电话')) - } return { tableKey: 0, index: 0, @@ -251,11 +244,6 @@ export default { message: '请填写供应商通讯地址', trigger: 'blur' }], - manufacturerTelePhone: [{ - required: true, - validator: checkBanGongDianHua, - trigger: 'blur' - }], manufacturerFax: [{ required: true, validator: checkChuanzhen, diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue index 5c721235d6..40d9c6f7c9 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue @@ -1,7 +1,7 @@