Browse Source

更新业务状态字段

master
fanzongzhe 2 years ago
parent
commit
147cb36285
  1. 6
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java
  2. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java
  3. 3
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceExportVo.java
  4. 22
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceQuery.java
  5. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceVo.java
  6. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml

6
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java

@ -120,4 +120,10 @@ public class FinVehicleInvoice extends BaseEntity {
@ApiModelProperty("图片地址")
private String filePath;
@ApiModelProperty("业务状态Key 001正常开票 002包牌开票 003欠款开票")
private String businessStateKey;
@ApiModelProperty("业务状态")
private String businessState;
}

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java

@ -92,4 +92,8 @@ public class FinVehicleInvoiceDto implements Dto {
private String vinNo;
@ApiModelProperty("开票名称")
private String invoicingName;
@ApiModelProperty("业务状态Key 001正常开票 002包牌开票 003欠款开票")
private String businessStateKey;
@ApiModelProperty("业务状态")
private String businessState;
}

3
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceExportVo.java

@ -1,6 +1,7 @@
package com.yxt.anrui.fin.api.finvehicleinvoice;
import com.yxt.common.core.utils.ExportEntityMap;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -17,6 +18,8 @@ public class FinVehicleInvoiceExportVo implements Vo {
private String billingState;
@ExportEntityMap(CnName = "交接状态", EnName = "transferState")
private String transferState;
@ExportEntityMap(CnName = "业务状态", EnName = "businessState")
private String businessState;
@ExportEntityMap(CnName = "开票单位", EnName = "invoiceTitle")
private String invoiceTitle;
@ExportEntityMap(CnName = "开票类型", EnName = "invoiceType")

22
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceQuery.java

@ -31,51 +31,37 @@ public class FinVehicleInvoiceQuery implements Query {
@ApiModelProperty(value = "sids", required = false)
private List<String> sids;
@ApiModelProperty("开票单位")
private String invoiceTitle;
@ApiModelProperty("开票状态")
private String billingState;
@ApiModelProperty("开票状态Key")
private String billingStateKey;
@ApiModelProperty("开票类型Key")
private String invoiceTypeKey;
@ApiModelProperty("发票类别")
private String invoiceType;
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("车架号")
private String vinNo;
private String state;
@ApiModelProperty("移交状态")
private String transferState;
@ApiModelProperty("移交状态key")
private String transferStateKey;
@ApiModelProperty("开票名称")
private String invoicingName;
@ApiModelProperty("开票开始日期")
private String createStartTime ;
@ApiModelProperty("开票结束日期")
private String createEndTime ;
@ApiModelProperty("发票代码")
private String invoiceCode;
@ApiModelProperty("业务状态Key 001正常开票 002包牌开票 003欠款开票")
private String businessStateKey;
@ApiModelProperty("业务状态")
private String businessState;
}

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceVo.java

@ -67,4 +67,8 @@ public class FinVehicleInvoiceVo implements Vo {
private String filePath;
@ApiModelProperty("发票图片集合")
private List<String> filePaths;
@ApiModelProperty("业务状态Key 001正常开票 002包牌开票 003欠款开票")
private String businessStateKey;
@ApiModelProperty("业务状态")
private String businessState;
}

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml

@ -20,6 +20,8 @@
<result column="filePath" property="filePath"></result>
<result column="billingStateKey" property="billingStateKey"></result>
<result column="transferStateKey" property="transferStateKey"></result>
<result column="businessStateKey" property="businessStateKey"></result>
<result column="businessState" property="businessState"></result>
</resultMap>
@ -31,6 +33,8 @@
`state`,
billingStateKey,
billingState,
businessStateKey,
businessState,
transferStateKey,
transferState,
invoiceTitle,
@ -72,6 +76,7 @@
<result column="invoiceAmount" property="invoiceAmount"></result>
<result column="createTime" property="createTime"></result>
<result column="invoiceCode" property="invoiceCode"></result>
<result column="businessState" property="businessState"></result>
</resultMap>
@ -79,6 +84,7 @@
SELECT DISTINCT
billingState,
transferState,
businessState,
invoiceTitle,
invoiceType,
contractNo,

Loading…
Cancel
Save