1.财务开票信息导出调整

2.个贷详情列表导出调整

biz-base/src/main/java/com/dayou/controller/FinanceInvoiceController.java

@@ -1,6 +1,10 @@
 package com.dayou.controller;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.dayou.dto.MajorProductionSimpleDTO;
+import com.dayou.vo.FinanceInvoiceApplyExportVo;
+import com.dayou.vo.FinanceInvoiceDestroyExportVo;
+import com.dayou.vo.FinanceInvoiceRealExportVo;
 import com.dayou.vo.FinanceInvoiceVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -39,12 +44,38 @@ public class FinanceInvoiceController extends BaseController {
     }
 
     /**
-     * 财务开票列表
+     * 财务开票列表导出
      */
     @GetMapping("/export")
     public void page(FinanceInvoice financeInvoice, String keyword, HttpServletResponse response) throws IOException {
         List<FinanceInvoiceVo> result =financeInvoiceService.exportPage(financeInvoice, keyword);
-        exportPlus(response,financeInvoice.getState() + "发票",result,FinanceInvoiceVo.class);
+        // 不同状态要导出的字段不一样,处理一下
+        switch (financeInvoice.getState()) {
+            case "审核中": {
+                List<FinanceInvoiceApplyExportVo> list = new ArrayList<>();
+                for (FinanceInvoiceVo financeInvoiceVo : result) {
+                    list.add(BeanUtil.toBean(financeInvoiceVo, FinanceInvoiceApplyExportVo.class));
+                }
+                exportPlus(response, financeInvoice.getState() + "发票", list, FinanceInvoiceApplyExportVo.class);
+                break;
+            }
+            case "已开票": {
+                List<FinanceInvoiceRealExportVo> list = new ArrayList<>();
+                for (FinanceInvoiceVo financeInvoiceVo : result) {
+                    list.add(BeanUtil.toBean(financeInvoiceVo, FinanceInvoiceRealExportVo.class));
+                }
+                exportPlus(response, financeInvoice.getState() + "发票", list, FinanceInvoiceRealExportVo.class);
+                break;
+            }
+            case "已作废": {
+                List<FinanceInvoiceDestroyExportVo> list = new ArrayList<>();
+                for (FinanceInvoiceVo financeInvoiceVo : result) {
+                    list.add(BeanUtil.toBean(financeInvoiceVo, FinanceInvoiceDestroyExportVo.class));
+                }
+                exportPlus(response, financeInvoice.getState() + "发票", list, FinanceInvoiceDestroyExportVo.class);
+                break;
+            }
+        }
     }
 
     /**

dao/src/main/resources/mapper/FinanceInvoiceMapper.xml

@@ -86,6 +86,18 @@
         <if test="vo!=null and vo.pEndDate!=null and vo.pEndDate!=''">
             and fi.plan_make_date &lt;= #{vo.pEndDate}
         </if>
+        <if test="vo!=null and vo.rStartDate!=null and vo.rStartDate!=''">
+            and fi.real_make_date &gt;= #{vo.rStartDate}
+        </if>
+        <if test="vo!=null and vo.rEndDate!=null and vo.rEndDate!=''">
+            and fi.real_make_date &lt;= #{vo.rEndDate}
+        </if>
+        <if test="vo!=null and vo.dStartDate!=null and vo.dStartDate!=''">
+            and fi.modified &gt;= #{vo.dStartDate}
+        </if>
+        <if test="vo!=null and vo.dEndDate!=null and vo.dEndDate!=''">
+            and fi.modified &lt;= #{vo.dEndDate}
+        </if>
         <if test="vo!=null and vo.aStartDate!=null and vo.aStartDate!=''">
             and fi.created &gt;= #{vo.aStartDate}
         </if>

dao/src/main/resources/mapper/PersonalStatisticalStatementMapper.xml

@@ -41,6 +41,7 @@
         personal.location,
         customer.name AS customerName,
         (SELECT name FROM customer_company WHERE id = personal.clientele_sub_id) AS customerSubName,
+        linkman.name AS linkmanName,
         personal.agent,
         personal.bailorA AS bailor,
         target.acreage,
@@ -61,6 +62,7 @@
         LEFT JOIN personal_production AS statement ON statement.target_id = target.id AND statement.production = 'STATEMENT' AND statement.deleted = 0 AND statement.production_time IS NOT NULL
         LEFT JOIN personal_production AS report ON report.target_id = target.id AND report.production = 'FINAL' AND report.deleted = 0 AND report.production_time IS NOT NULL
         LEFT JOIN personal_production AS letter ON letter.target_id = target.id AND letter.production = 'LETTER' AND letter.deleted = 0 AND letter.production_time IS NOT NULL
+        LEFT JOIN customer_linkman AS linkman ON linkman.id = personal.clientele_contact_id
         LEFT JOIN (
         SELECT node.name AS currentNodeName,
         instance.business_id AS businessId,

domain/src/main/java/com/dayou/entity/FinanceInvoice.java

@@ -217,6 +217,30 @@ public class FinanceInvoice extends BaseEntity {
     @TableField(exist = false)
     private String pEndDate;
 
+    /**
+     * 实际开票时间起始
+     */
+    @TableField(exist = false)
+    private String rStartDate;
+
+    /**
+     * 实际开票时间结束
+     */
+    @TableField(exist = false)
+    private String rEndDate;
+
+    /**
+     * 作废时间起始
+     */
+    @TableField(exist = false)
+    private String dStartDate;
+
+    /**
+     * 作废时间结束
+     */
+    @TableField(exist = false)
+    private String dEndDate;
+
     @TableField(exist = false)
     private String aStartDate;
 

domain/src/main/java/com/dayou/vo/FinanceInvoiceApplyExportVo.java

@@ -0,0 +1,87 @@
+package com.dayou.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.dayou.annotation.*;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import static com.dayou.enums.MainBusinessEnum.FINANCE_MANAGEMENT;
+
+/**
+ * 财务开票-待审核excel导出
+ */
+@Data
+@ExcelSheet(sheetName = "财务开票")
+@LuceneResource(value = FINANCE_MANAGEMENT,serviceImplClassName = "financeInvoiceServiceImpl",menuName = "开票审批",url = "/finance/invoice/check")
+public class FinanceInvoiceApplyExportVo{
+
+    @Excel(name = "发票抬头")
+    private String title;
+
+    /**
+     * 发票类型
+     */
+    @ExportCell(columnName = "发票类型")
+    private String type;
+
+    /**
+     * 税号
+     */
+    @Excel(name = "税号")
+    private String taxNo;
+
+    /**
+     * 计划开票金额
+     */
+    @Excel(name = "计划开票金额")
+    private BigDecimal planAmount;
+
+    /**
+     * 计划开票日期
+     */
+    @Excel(name = "计划开票日期")
+    private LocalDate planMakeDate;
+
+    /**
+     * 开票状态（审核中，驳回，作废，待开票，已开票）
+     */
+    @Excel(name = "开票状态")
+    private String state;
+
+    @Excel(name = "订单号")
+    private String orderId;
+
+    @Excel(name = "订单名称")
+    private String orderName;
+
+    @Excel(name = "申请人")
+    private String applyName;
+
+    /**
+     * 业务类型
+     */
+    @Excel(name = "业务类型")
+    private String businessType;
+
+    /**
+     * 产品号
+     */
+    @Excel(name = "产品号")
+    private String productionNo;
+
+    /**
+     * 申请时间
+     */
+    @Excel(name = "申请时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    private String remark;
+
+}

domain/src/main/java/com/dayou/vo/FinanceInvoiceDestroyExportVo.java

@@ -0,0 +1,89 @@
+package com.dayou.vo;
+
+import com.dayou.annotation.Excel;
+import com.dayou.annotation.ExcelSheet;
+import com.dayou.annotation.ExportCell;
+import com.dayou.annotation.LuceneResource;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import static com.dayou.enums.MainBusinessEnum.FINANCE_MANAGEMENT;
+
+/**
+ * 财务开票-已作废excel导出
+ */
+@Data
+@ExcelSheet(sheetName = "财务开票")
+@LuceneResource(value = FINANCE_MANAGEMENT,serviceImplClassName = "financeInvoiceServiceImpl",menuName = "开票审批",url = "/finance/invoice/check")
+public class FinanceInvoiceDestroyExportVo {
+
+    @Excel(name = "发票抬头")
+    private String title;
+
+    /**
+     * 发票类型
+     */
+    @ExportCell(columnName = "发票类型")
+    private String type;
+
+    /**
+     * 税号
+     */
+    @Excel(name = "税号")
+    private String taxNo;
+
+    /**
+     * 计划开票金额
+     */
+    @Excel(name = "计划开票金额")
+    private BigDecimal planAmount;
+
+    /**
+     * 作废日期
+     */
+    @Excel(name = "作废日期")
+    private LocalDate modified;
+
+    /**
+     * 开票状态（审核中，驳回，作废，待开票，已开票）
+     */
+    @Excel(name = "开票状态")
+    private String state;
+
+    @Excel(name = "订单号")
+    private String orderId;
+
+    @Excel(name = "订单名称")
+    private String orderName;
+
+    @Excel(name = "申请人")
+    private String applyName;
+
+    /**
+     * 业务类型
+     */
+    @Excel(name = "业务类型")
+    private String businessType;
+
+    /**
+     * 产品号
+     */
+    @Excel(name = "产品号")
+    private String productionNo;
+
+    /**
+     * 申请时间
+     */
+    @Excel(name = "申请时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    private String remark;
+
+}

domain/src/main/java/com/dayou/vo/FinanceInvoiceRealExportVo.java

@@ -0,0 +1,87 @@
+package com.dayou.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.dayou.annotation.*;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import static com.dayou.enums.MainBusinessEnum.FINANCE_MANAGEMENT;
+
+/**
+ * 财务开票-已开excel导出
+ */
+@Data
+@ExcelSheet(sheetName = "财务开票")
+@LuceneResource(value = FINANCE_MANAGEMENT,serviceImplClassName = "financeInvoiceServiceImpl",menuName = "开票审批",url = "/finance/invoice/check")
+public class FinanceInvoiceRealExportVo {
+
+    @Excel(name = "发票抬头")
+    private String title;
+
+    /**
+     * 发票类型
+     */
+    @ExportCell(columnName = "发票类型")
+    private String type;
+
+    /**
+     * 税号
+     */
+    @Excel(name = "税号")
+    private String taxNo;
+
+    /**
+     * 计划开票金额
+     */
+    @Excel(name = "计划开票金额")
+    private BigDecimal planAmount;
+
+    /**
+     * 实际开票日期
+     */
+    @Excel(name = "实际开票日期")
+    private LocalDate realMakeDate;
+
+    /**
+     * 开票状态（审核中，驳回，作废，待开票，已开票）
+     */
+    @Excel(name = "开票状态")
+    private String state;
+
+    @Excel(name = "订单号")
+    private String orderId;
+
+    @Excel(name = "订单名称")
+    private String orderName;
+
+    @Excel(name = "申请人")
+    private String applyName;
+
+    /**
+     * 业务类型
+     */
+    @Excel(name = "业务类型")
+    private String businessType;
+
+    /**
+     * 产品号
+     */
+    @Excel(name = "产品号")
+    private String productionNo;
+
+    /**
+     * 申请时间
+     */
+    @Excel(name = "申请时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    private String remark;
+
+}

domain/src/main/java/com/dayou/vo/PersonalEfficiencyDetailVO.java

@@ -34,6 +34,12 @@ public class PersonalEfficiencyDetailVO {
     private String customerSubName;
 
     /**
+     * 客户联系人
+     */
+    @Excel(name = "客户联系人")
+    private String linkmanName;
+
+    /**
      * 中介
      */
     @Excel(name = "中介")