单据复制

jianshui-admin/src/main/java/com/jianshui/web/controller/platform/BillInfoAddPController.java

@@ -6,10 +6,14 @@ import com.jianshui.common.core.controller.BaseController;
 import com.jianshui.common.core.domain.AjaxResult;
 import com.jianshui.common.core.page.TableDataInfo;
 import com.jianshui.invoice.domain.BillInfo;
+import com.jianshui.invoice.domain.Invoice;
 import com.jianshui.invoice.mapper.BillInfoMapper;
+import com.jianshui.invoice.mapper.InvoiceMapper;
+import com.jianshui.platform.dto.CopyBillInfoQueryDTO;
 import com.jianshui.platform.dto.DocumentListQueryPDTO;
 import com.jianshui.platform.dto.InvoiceAdd.BillInfoPDTO;
 import com.jianshui.platform.service.InvoiceAddPService;
+import com.jianshui.platform.vo.InvoiceCopyBillinfoListPVO;
 import com.jianshui.platform.vo.InvoiceListPVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,6 +38,9 @@ public class BillInfoAddPController extends BaseController {
     @Autowired
     private BillInfoMapper billInfoMapper;
 
+    @Autowired
+    private InvoiceMapper invoiceMapper;
+
     @ApiOperation(value = "单据保存",notes = "单据保存请求(支持数电普票、数电专票)")
     @PostMapping( "invoiceSave")
     public AjaxResult invoiceSave(@RequestBody BillInfoPDTO billInfoPDTO) throws Exception {
@@ -72,15 +79,29 @@ public class BillInfoAddPController extends BaseController {
     }
 
     @ApiOperation(value = "复制",notes = "开发中")
-    @PostMapping( "copy")
-    public AjaxResult copy(@RequestBody JSONObject jsonObject) throws Exception {
+    @PostMapping( "copyBillInfo")
+    public AjaxResult copyBillInfo(@RequestBody CopyBillInfoQueryDTO copyBillInfoQueryDTO) throws Exception {
 
-        // TODO: 复制：复制的是开票信息还是发票信息
+        // TODO: 复制：传入选择票种，复制的是已开发票的票种信息。
+//        AjaxResult ajaxResult = addService.copyBillInfo(copyBillInfoQueryDTO);
 
         return AjaxResult.error("功能开发中！");
     }
 
 
+    @ApiOperation(value = "可复制单据查询",notes = "开发中")
+    @GetMapping( "copyBillInfoList")
+    public TableDataInfo copyBillInfoList(CopyBillInfoQueryDTO copyBillInfoQueryDTO) throws Exception {
+
+        startPage();
+        Invoice invoice = BeanUtil.copyProperties(copyBillInfoQueryDTO,Invoice.class);
+        List<Invoice> invoiceList = invoiceMapper.selectInvoiceList(invoice);
+
+        List<InvoiceCopyBillinfoListPVO> invoiceCopyBillinfoListPVOS = BeanUtil.copyToList(invoiceList,InvoiceCopyBillinfoListPVO.class);
+        return getDataTable(invoiceCopyBillinfoListPVOS);
+    }
+
+
 
 
 

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/Invoice.java

@@ -11,6 +11,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.jianshui.common.annotation.Excel;
 import com.jianshui.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -333,6 +334,35 @@ public class Invoice extends BaseEntity {
     private Map<String, Object> params;
 
 
+
+    /** 可复制发票查询 start*/
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    @ApiModelProperty( value = "开票日期开始")
+    private String startTime;
+
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    @ApiModelProperty(value = "开票日期结束")
+    private String endTime;
+
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    @ApiModelProperty(value = "发票起号")
+    private String startFphm;
+
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    @ApiModelProperty(value = "发票止号")
+    private String endFphm;
+
+
+    /** 可复制发票查询 end*/
+
     /** 经办人姓名 */
     private String jbrxm;
     /** 经办人证件号码 */
@@ -879,6 +909,38 @@ public class Invoice extends BaseEntity {
         this.invoiceFileStorage = invoiceFileStorage;
     }
 
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getStartFphm() {
+        return startFphm;
+    }
+
+    public void setStartFphm(String startFphm) {
+        this.startFphm = startFphm;
+    }
+
+    public String getEndFphm() {
+        return endFphm;
+    }
+
+    public void setEndFphm(String endFphm) {
+        this.endFphm = endFphm;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

jianshui-invoice/src/main/resources/mapper/invoice/InvoiceMapper.xml

@@ -116,6 +116,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fpqqlsh != null  and fpqqlsh != ''"> and fpqqlsh = #{fpqqlsh}</if>
             <if test="invoiceType != null  and invoiceType != ''"> and invoice_type = #{invoiceType}</if>
             <if test="state != null "> and state = #{state}</if>
+            <!-- 新增开票日期区间查询条件 -->
+            <if test="startTime != null and endTime != null">
+                and kprq BETWEEN #{startTime} AND #{endTime}
+            </if>
+            <!-- 新增发票号码区间查询条件 -->
+            <if test="startFphm != null and endFphm != null">
+                and fphm BETWEEN #{startFphm} AND #{endFphm}
+            </if>
         </where>
     </select>
 

jianshui-platform/src/main/java/com/jianshui/platform/dto/CopyBillInfoQueryDTO.java

@@ -0,0 +1,45 @@
+package com.jianshui.platform.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jianshui.common.annotation.Excel;
+import com.jianshui.common.core.page.PageDomain;
+import com.jianshui.platform.dto.InvoiceAdd.BillInfoDetailPDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 复制单据-查询入参
+ */
+@Data
+@ApiModel("单据复制")
+public class CopyBillInfoQueryDTO extends PageDomain {
+
+    @ApiModelProperty(value = "发票类型 1 数电普票  2数电专票")
+    private String InvoiceType;
+
+    @ApiModelProperty( value = "开票日期开始")
+    private String startTime;
+
+    @ApiModelProperty(value = "开票日期结束")
+    private String endTime;
+
+    @ApiModelProperty(value = "购方税号")
+    private String buyerTaxnum;
+
+    @ApiModelProperty(value = "购方名称")
+    private String buyerName;
+
+    @ApiModelProperty(value = "发票起号")
+    private String startFphm;
+
+    @ApiModelProperty(value = "发票止号")
+    private String endFphm;
+
+
+
+}

jianshui-platform/src/main/java/com/jianshui/platform/service/BillInfoAddPService.java

@@ -1,6 +1,8 @@
 package com.jianshui.platform.service;
 
 
+import com.jianshui.common.core.domain.AjaxResult;
+
 /**
 * @Author: kk
 * @Description: 单据管理
@@ -15,15 +17,4 @@ public interface BillInfoAddPService {
 
 
 
-
-
-
-
-
-
-
-
-
-
-
 }

jianshui-platform/src/main/java/com/jianshui/platform/service/InvoiceAddPService.java

@@ -1,7 +1,9 @@
 package com.jianshui.platform.service;
 
 
+import com.jianshui.common.core.domain.AjaxResult;
 import com.jianshui.invoice.domain.dto.HXResponse;
+import com.jianshui.platform.dto.CopyBillInfoQueryDTO;
 import com.jianshui.platform.dto.InvoiceAdd.BillInfoPDTO;
 
 /**
@@ -28,17 +30,4 @@ public interface InvoiceAddPService {
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 }

jianshui-platform/src/main/java/com/jianshui/platform/service/impl/BillInfoAddPServiceImpl.java

@@ -1,5 +1,6 @@
 package com.jianshui.platform.service.impl;
 
+import com.jianshui.common.core.domain.AjaxResult;
 import com.jianshui.invoice.mapper.BillInfoMapper;
 import com.jianshui.platform.service.BillInfoAddPService;
 import lombok.extern.slf4j.Slf4j;
@@ -20,11 +21,4 @@ public class BillInfoAddPServiceImpl implements BillInfoAddPService {
     private static BillInfoMapper billInfoMapper;
 
 
-
-
-
-
-
-
-
 }

jianshui-platform/src/main/java/com/jianshui/platform/service/impl/InvoiceAddPServiceImpl.java

@@ -1,17 +1,20 @@
 package com.jianshui.platform.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.jianshui.common.core.domain.AjaxResult;
 import com.jianshui.common.core.domain.entity.Companyservice;
 import com.jianshui.common.exception.jianshui.JianshuiServiceException;
 import com.jianshui.common.utils.SecurityUtils;
 import com.jianshui.common.utils.ValidateUtils;
 import com.jianshui.invoice.domain.BillInfo;
+import com.jianshui.invoice.domain.Invoice;
 import com.jianshui.invoice.domain.dto.HXResponse;
 import com.jianshui.invoice.enums.ChannelSource;
 import com.jianshui.invoice.factory.IInvoiceServiceFactory;
 import com.jianshui.invoice.mapper.BillInfoMapper;
 import com.jianshui.invoice.mapper.InvoiceMapper;
 import com.jianshui.invoice.service.IInvoiceApiService;
+import com.jianshui.platform.dto.CopyBillInfoQueryDTO;
 import com.jianshui.platform.dto.InvoiceAdd.BillInfoPDTO;
 import com.jianshui.platform.dto.InvoiceAdd.species.BillInfoSDGenInvoicePDTO;
 import com.jianshui.platform.dto.InvoiceAdd.species.BillInfoSDSpecialInvoicePDTO;
@@ -25,6 +28,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Optional;
 
 
@@ -137,25 +141,5 @@ public class InvoiceAddPServiceImpl implements InvoiceAddPService {
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 }

jianshui-platform/src/main/java/com/jianshui/platform/vo/InvoiceCopyBillinfoListPVO.java

@@ -0,0 +1,56 @@
+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 InvoiceCopyBillinfoListPVO {
+
+    @ApiModelProperty(value = "发票代码")
+    private String fpdm;
+
+    @ApiModelProperty(value = "发票号码")
+    private String fphm;
+
+    @ApiModelProperty(value = "发票类型")
+    private String invoiceType;
+
+    @ApiModelProperty(value = "购方名称")
+    private String buyerName;
+
+    @ApiModelProperty(value = "购方税号")
+    private String buyerTaxnum;
+
+    @ApiModelProperty(value = "销方名称")
+    private String sellerName;
+
+    @ApiModelProperty(value = "销方税号")
+    private String sellerTaxnum;
+
+    @ApiModelProperty(value = "未税金额")
+    private BigDecimal taxfreeamt;
+
+    @ApiModelProperty(value = "税额")
+    private BigDecimal tax;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "开票日期")
+    private Date kprq;
+
+
+    
+}