From fe1e53f6862381c1c57f30e57c0b1fc66549f92a Mon Sep 17 00:00:00 2001 From: dongxiaoke <1910333201@qq.com> Date: Mon, 12 Jun 2023 13:41:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E7=A8=8E=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/InvoiceAddController.java | 15 +++++ .../domain/vo/render/GetInvoiceSphVO.java | 14 ++--- .../income/domain/vo/render/GetInvoiceVO.java | 42 ++++++------- .../platform/dto/InvoiceListQueryPDTO.java | 36 +++++++++++ .../jianshui/platform/vo/InvoiceListPVO.java | 59 +++++++++++++++++++ 5 files changed, 138 insertions(+), 28 deletions(-) create mode 100644 jianshui-platform/src/main/java/com/jianshui/platform/dto/InvoiceListQueryPDTO.java create mode 100644 jianshui-platform/src/main/java/com/jianshui/platform/vo/InvoiceListPVO.java diff --git a/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java b/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java index 16590f3..c95603c 100644 --- a/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java +++ b/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java @@ -10,8 +10,10 @@ import com.jianshui.invoice.domain.Invoice; import com.jianshui.invoice.domain.dto.HXResponse; import com.jianshui.invoice.mapper.InvoiceMapper; import com.jianshui.platform.dto.InvoiceAdd.BillInfoPDTO; +import com.jianshui.platform.dto.InvoiceListQueryPDTO; import com.jianshui.platform.dto.invoicered.InvoiceQueryPDTO; import com.jianshui.platform.service.InvoiceAddService; +import com.jianshui.platform.vo.InvoiceListPVO; import com.jianshui.platform.vo.invoicered.InvoiceQueryPVO; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; @@ -62,6 +64,19 @@ public class InvoiceAddController extends BaseController { + @ApiOperation(value = "发票管理",notes = "发票管理") + @GetMapping( "invoiceList") + public TableDataInfo invoiceList(InvoiceListQueryPDTO queryPDTO) throws Exception { + + startPage(); + Invoice invoice = BeanUtil.copyProperties(queryPDTO,Invoice.class); + List invoiceLIst = invoiceMapper.selectInvoiceList(invoice); + + List invoiceListPVOS = BeanUtil.copyToList(invoiceLIst,InvoiceListPVO.class); + return getDataTable(invoiceListPVOS); + } + + diff --git a/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceSphVO.java b/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceSphVO.java index a87f1ab..0a5fecc 100644 --- a/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceSphVO.java +++ b/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceSphVO.java @@ -13,7 +13,7 @@ public class GetInvoiceSphVO { @JSONField(name = "Xh") private int id; // invoice_check表的id -// private int invoice_check_id; + private int invoice_check_id; // 明细编号 private String mxbh; // 货物名称 @@ -31,7 +31,7 @@ public class GetInvoiceSphVO { @JSONField(name = "Se") private String se; // 含税单价 -// private String hsdj; + private String hsdj; // 含税金额 @JSONField(name = "Je") private String hsje; @@ -45,15 +45,15 @@ public class GetInvoiceSphVO { @JSONField(name = "Jldw") private String jldw; // 费用项目 货运发票返回信息 -// private String fyxm; + private String fyxm; // 车牌号 通行费发票返回信息 -// private String cph; + private String cph; // 类型 通行费发票返回信息 -// private String lx; + private String lx; // 通行日期起 通行费发票返回信息 -// private String txrqq; + private String txrqq; // 通行日起止 通行费发票返回信息 -// private String txrqz; + private String txrqz; //商品编码 @JSONField(name = "Taxcode") private String ssflbm; diff --git a/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceVO.java b/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceVO.java index 758080f..1613971 100644 --- a/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceVO.java +++ b/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceVO.java @@ -26,11 +26,11 @@ public class GetInvoiceVO { @JSONField(name = "pch") private String pch; // 查验结果 -// @JSONField(name = "cyjg") -// private String cyjg; + @JSONField(name = "cyjg") + private String cyjg; // 查验结果信息 查询结果的信息 -// @JSONField(name = "cyjgxx") -// private String cyjgxx; + @JSONField(name = "cyjgxx") + private String cyjgxx; // 发票种类 @JSONField(name = "Fplx") // 单独处理 private String fpzl; @@ -41,8 +41,8 @@ public class GetInvoiceVO { @JSONField(name = "Fphm") private String fphm; // 查验次数 -// @JSONField(name = "cycs") -// private String cycs; + @JSONField(name = "cycs") + private String cycs; // 销售方名称 @JSONField(name = "Xfmc") private String xfmc; @@ -50,7 +50,7 @@ public class GetInvoiceVO { @JSONField(name = "Xfsh") private String xfsbh; // 销售方地址电 -// @JSONField(name = "Xfdzdh") + @JSONField(name = "Xfdzdh") private String xfdzdh; // 销售方地址 2022.09.16 浪潮要求新增需求 @JSONField(name = "Xfyhzh") @@ -93,14 +93,14 @@ public class GetInvoiceVO { @JSONField(name = "Jqbm") private String jqbh; // 开票人 -// @JSONField(name = "kpr") -// private String kpr; - // 收款人 -// @JSONField(name = "skr") -// private String skr; - // 复核人 -// @JSONField(name = "fhr") -// private String fhr; + @JSONField(name = "kpr") + private String kpr; +// 收款人 + @JSONField(name = "skr") + private String skr; +// 复核人 + @JSONField(name = "fhr") + private String fhr; // 校验码 @JSONField(name = "JYM") private String jym; @@ -110,8 +110,8 @@ public class GetInvoiceVO { @JSONField(name = "HCBZ") private String hcbz; // 作废标志 Y:已作废 H:已冲红 N：未作废 -// @JSONField(name = "status") -// private String status; + @JSONField(name = "status") + private String status; // 创建时间 @JSONField(name = "created_at") private Date created_at; @@ -174,8 +174,8 @@ public class GetInvoiceVO { @JSONField(name = "djzh") private String djzh; - @JSONField(name = "cyjg") - private String cyjg; +// @JSONField(name = "cyjg") +// private String cyjg; @JSONField(name = "smfdwgr") private String smfdwgr; @@ -186,8 +186,8 @@ public class GetInvoiceVO { @JSONField(name = "escsc") private String escsc; - @JSONField(name = "cycs") - private String cycs; +// @JSONField(name = "cycs") +// private String cycs; @JSONField(name = "mfdwgrdz") private String mfdwgrdz; diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/dto/InvoiceListQueryPDTO.java b/jianshui-platform/src/main/java/com/jianshui/platform/dto/InvoiceListQueryPDTO.java new file mode 100644 index 0000000..be45202 --- /dev/null +++ b/jianshui-platform/src/main/java/com/jianshui/platform/dto/InvoiceListQueryPDTO.java @@ -0,0 +1,36 @@ +package com.jianshui.platform.dto; + + +import com.jianshui.common.core.page.PageDomain; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** +* @Author: kk +* @Description: 发票管理查询 +* @DateTime: 2023/6/12 10:48 +* @Params: +* @Return +*/ + +@Data +@ApiModel("发票管理查询") +public class InvoiceListQueryPDTO extends PageDomain { + + @ApiModelProperty(value = "购方名称") + private String buyerName; + + @ApiModelProperty(value = "发票代码") + private String fpdm; + + @ApiModelProperty(value = "发票号码") + private String fphm; + + + + + + + +} diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/vo/InvoiceListPVO.java b/jianshui-platform/src/main/java/com/jianshui/platform/vo/InvoiceListPVO.java new file mode 100644 index 0000000..b94c0cd --- /dev/null +++ b/jianshui-platform/src/main/java/com/jianshui/platform/vo/InvoiceListPVO.java @@ -0,0 +1,59 @@ +package com.jianshui.platform.vo; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** +* @Author: kk +* @Description: 发票管理 +* @DateTime: 2023/6/12 10:49 +* @Params: +* @Return +*/ + +@Data +@ApiModel("发票管理") +public class InvoiceListPVO { + + @ApiModelProperty(value = "购方名称") + private String buyerName; + + @ApiModelProperty(value = "购方税号") + private String buyerTaxnum; + + @ApiModelProperty(value = "发票代码") + private String fpdm; + + @ApiModelProperty(value = "发票号码") + private String fphm; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "开票日期") + private Date kprq; + + @ApiModelProperty(value = "不含税金额") + private BigDecimal taxfreeamt; + + @ApiModelProperty(value = "税额") + private BigDecimal tax; + + @ApiModelProperty(value = "价税合计") + private String jshj; + + @ApiModelProperty(value = "销方名称") + private String sellerName; + + @ApiModelProperty(value = "销方税号") + private String sellerTaxnum; + + + + + +}