手工签收添加字段

dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java

@@ -88,7 +88,6 @@ public class SignFpqsController extends AbstractController {
             return ResponseEntity.ok(R.error("购方税号不能为空"));
         }
         String gfsh = (String) pramsMap.get("gfsh");
-//        gfshList.add(gfsh);
         pramsMap.put("gfsh", gfsh);
 
         if (pramsMap.get("companyCode") == null || "".equals(pramsMap.get("companyCode"))){

dxhy-sign/src/main/java/com/dxhy/sign/entity/QsExcelEntity.java

@@ -86,5 +86,32 @@ public class QsExcelEntity {
     @ExcelProperty("签收时间")
     private Date qsDate;
 
+    //凭证号
+    @ExcelProperty("凭证号")
+    private String snVoucherNumber;
+    //账期
+    @ExcelProperty("账期")
+    private String accountPeriod;
+    //过账时间
+    @ExcelProperty("过账时间")
+    private String postingTime;
+    //影像号
+    @ExcelProperty("影像号")
+    private String imageNumber;
+    //报账单号
+    @ExcelProperty("报账单号")
+    private String bzdh;
+    /**
+     * 组织编码
+     */
+    @ExcelProperty("组织编码")
+    private String compCode;
+
+    @ExcelProperty("报账人")
+    private String bzr;
+
+    @ExcelProperty("入账状态")
+    private String inAccountStatus;
+
 
 }

dxhy-sign/src/main/java/com/dxhy/sign/entity/TDxRecordInvoice.java

@@ -427,4 +427,24 @@ public class TDxRecordInvoice implements Serializable {
     private String scanId;
     private String invoiceSource;
 
+    //凭证号
+    private String snVoucherNumber;
+    //账期
+    private String accountPeriod;
+    //过账时间
+    private String postingTime;
+    //影像号
+    @TableField("image_id")
+    private String imageNumber;
+    //报账单号
+    private String bzdh;
+    /**
+     * 组织编码
+     */
+    private String compCode;
+
+    private String bzr;
+
+    private String inAccountStatus;
+
 }

dxhy-sign/src/main/java/com/dxhy/sign/model/SgqsWqsfpVO.java

@@ -1,5 +1,6 @@
 package com.dxhy.sign.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -81,4 +82,23 @@ public class SgqsWqsfpVO implements Serializable {
 
     private String uuid;
 
+    //凭证号
+    private String snVoucherNumber;
+    //账期
+    private String accountPeriod;
+    //过账时间
+    private String postingTime;
+    //影像号
+    private String imageNumber;
+    //报账单号
+    private String bzdh;
+    /**
+     * 组织编码
+     */
+    private String compCode;
+
+    private String bzr;
+
+    private String inAccountStatus;
+
 }

dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java

@@ -230,6 +230,18 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
                 AmountFormatUtil.fmtMicrometer(MathUtil.round(tDxRecordInvoice.getInvoiceAmount().toPlainString())));
         wqsfp.setTaxAmount(
                 AmountFormatUtil.fmtMicrometer(MathUtil.round(tDxRecordInvoice.getTaxAmount().toPlainString())));
+        wqsfp.setAccountPeriod(tDxRecordInvoice.getAccountPeriod());
+        wqsfp.setPostingTime(tDxRecordInvoice.getPostingTime());
+        wqsfp.setBzdh(tDxRecordInvoice.getBzdh());
+        wqsfp.setBzr(tDxRecordInvoice.getBzr());
+        wqsfp.setImageNumber(tDxRecordInvoice.getImageNumber());
+        wqsfp.setSnVoucherNumber(tDxRecordInvoice.getSnVoucherNumber());
+        wqsfp.setCompCode(tDxRecordInvoice.getCompCode());
+        if ("1".equals(tDxRecordInvoice.getInAccountStatus())){
+            wqsfp.setInAccountStatus("已入账");
+        }else {
+            wqsfp.setInAccountStatus("未入账");
+        }
 
         return wqsfp;
     }

dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml

@@ -18,6 +18,14 @@
         <result column="remark" property="remark"/>
         <result column="qs_date" property="qsDate"/>
         <result column="qs_name" property="qsName"/>
+        <result column="sn_voucher_number" property="snVoucherNumber"/>
+        <result column="posting_time" property="postingTime"/>
+        <result column="image_id" property="imageNumber"/>
+        <result column="account_period" property="accountPeriod"/>
+        <result column="bzdh" property="bzdh"/>
+        <result column="bzr" property="bzr"/>
+        <result column="inaccount_status" property="inAccountStatus"/>
+        <result column="comp_code" property="compCode"/>
     </resultMap>
 
     <resultMap id="WqshjResultMap" type="com.dxhy.sign.entity.TDxRecordInvoice">
@@ -30,7 +38,7 @@
             resultMap="BaseResultMap" databaseId="mysql">
         select
         t.id,t.invoice_type,t.invoice_code,t.invoice_no,t.ele_invoice_no,t.invoice_date,t.gf_name,t.xf_name,t.invoice_amount,t.tax_amount,t.dept_id,t.qs_status
-        ,
+        ,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period,t.bzdh,t.bzr,t.inaccount_status,t.comp_code
         from t_dx_record_invoice t
         where t.company = #{company}
         and t.gf_tax_no = #{gfsh}
@@ -83,6 +91,7 @@
         select
         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
+        ,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period,t.bzdh,t.bzr,t.inaccount_status,t.comp_code
         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">