From 4e769707f2988f71283cac2ff92311c83e4bfe94 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Sun, 23 Apr 2023 08:55:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java    | 6 +++---
 .../src/main/resources/mapper/SignRecordInvoiceMapper.xml   | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java
index 0de59864..cb380ddf 100644
--- a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java
+++ b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java
@@ -3403,7 +3403,7 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
         if (resultList != null && resultList.size() > 0) {
             for (int i = 0; i < resultList.size(); i++) {
                 QsExcelEntity qsExcelEntity = new QsExcelEntity();
-                BeanUtils.copyProperties(qsExcelEntity,resultList.get(i));
+                BeanUtils.copyProperties(resultList.get(i),qsExcelEntity);
 
                 log.info("导出的发票数据魏:{}",JSONObject.toJSONString(resultList.get(i)));
                 log.info("totalAmount={}",resultList.get(i).getTotalAmount());
@@ -3428,7 +3428,7 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
                 outputStream = new ByteArrayOutputStream();
 //                excelWriter = EasyExcel.write(outputStream).build();
                 excelWriter = EasyExcel.write(outputStream,QsExcelEntity.class).build();
-                WriteSheet writeSheet = EasyExcel.writerSheet("sheet1.xlsx").head(QsExcelEntity.class).build();
+                WriteSheet writeSheet = EasyExcel.writerSheet("sheet").head(QsExcelEntity.class).build();
                 excelWriter.write(excelList, writeSheet);
                 log.info("excelwrite {}",excelWriter);
                 excelWriter.finish();
@@ -3488,7 +3488,7 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
         //附件  excel
         List<AttachmentVo> attachmentVoList = Lists.newArrayList();
         AttachmentVo attachmentVo = new AttachmentVo();
-        attachmentVo.setName("发票签收");
+        attachmentVo.setName("发票签收.xlsx");
         attachmentVo.setFileBytes(xlsxFile);
         attachmentVo.setType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
 //        attachmentVo.setType("application/msexcel");
diff --git a/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml b/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml
index c5586dc6..f9a1fe9c 100644
--- a/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml
+++ b/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml
@@ -15,6 +15,9 @@
         <result column="total_amount" property="totalAmount"/>
         <result column="qs_status" property="qsStatus"/>
         <result column="dept_id" property="deptId"/>
+        <result column="remark" property="remark"/>
+        <result column="qs_date" property="qsDate"/>
+        <result column="qs_name" property="qsName"/>
     </resultMap>
 
     <resultMap id="WqshjResultMap" type="com.dxhy.sign.entity.TDxRecordInvoice">
@@ -78,7 +81,8 @@
     <select id="selectWqsfpByQsyx" parameterType="java.util.Map"
             resultMap="BaseResultMap" databaseId="mysql">
         select
-        t.id,t.invoice_type,t.invoice_code,t.invoice_no,t.invoice_date,t.gf_name,t.xf_name,t.invoice_amount,t.tax_amount,t.dept_id,t.qs_status
+        t.id,t.invoice_type,t.invoice_code,t.invoice_no,t.invoice_date,t.total_amount,t.remark,t.qs_date,
+        t.gf_name,t.xf_name,t.invoice_amount,t.tax_amount,t.dept_id,t.qs_status,t.qs_name
         from t_dx_record_invoice t left join t_dx_invoice r on t.uuid = r.uuid
         where 1=1
         <if test="ids != null and ids.size()>0">