修改mapper文件

release
yishiqihuasheng 2 years ago
parent 0b67228414
commit 72ac228482
  1. 7
      dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
  2. 2
      dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java
  3. 4
      dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml

@ -139,8 +139,9 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
String kprq = snInvoice.getBillingDate();
String je = snInvoice.getTotalAmount();
String amountTax = snInvoice.getAmountTax();
String xfsh = snInvoice.getSalesTaxNo();
String se = snInvoice.getAmountTax();
String se = snInvoice.getTotalTax();
String gfsbh = snInvoice.getPurchaserTaxNo();
String gfmc = snInvoice.getPurchaserName();
String invoiceType = snInvoice.getInvoiceType();
@ -163,6 +164,9 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
if (se != null) {
recordInvoice.setTaxAmount(new BigDecimal(se));
}
if (amountTax != null){
recordInvoice.setTotalAmount(new BigDecimal(amountTax));
}
recordInvoice.setXfTaxNo(xfsh);
// recordInvoice.setGfTaxNo(gfsbh);
@ -185,6 +189,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
recordInvoice.setImageId(imageId);
recordInvoice.setCompCode(compCode);
if (baseTDxRecordInvoice != null) {
baseTDxRecordInvoiceDao.update(recordInvoice, recordWrapper);
} else {

@ -174,7 +174,7 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl<ExtInvoicePoolD
}
//报账单号字典值转换
// pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,pageList.get(i).getInAccountStatus()));
log.info("入账状态====>{}",pageList.get(i).getInAccountStatus());
// log.info("入账状态====>{}",pageList.get(i).getInAccountStatus());
pageList.get(i).setInvoiceType(InvoiceTypeUtils.invoiceTypeName(pageList.get(i).getInvoiceType()));
pageList.get(i).setQsrq(pageList.get(i).getQsrq() == null ? "" : pageList.get(i).getQsrq());
pageList.get(i).setRzrq(pageList.get(i).getRzrq() == null ? "" : pageList.get(i).getRzrq());

@ -130,6 +130,7 @@
<if test="invoiceSource!=null and invoiceSource!='' and invoiceSource!='99'">
and t.invoice_source = #{invoiceSource}
</if>
and t.invoice_type != '101'
</select>
<select id="listAddTaxInvoice" parameterType="java.util.Map"
resultType="com.dxhy.extend.entity.ExtAddTaxInvoice" databaseId="mysql">
@ -256,6 +257,7 @@
<!-- <if test="snVoucherNumber !=null and snVoucherNumber !='' and snVoucherNumber !='99'">-->
<!-- and t.sn_voucher_number = #{snVoucherNumber}-->
<!-- </if>-->
and t.invoice_type != '101'
</select>
<!--其他发票汇总-->
<select id="selectOtherHj" parameterType="java.util.Map"
@ -325,7 +327,7 @@
invoice_no invoiceNo,
DATE_FORMAT(invoice_date,'%Y-%m-%d') invoiceDate,
DATE_FORMAT(create_date,'%Y-%m-%d') createDate,
invoice_amount invoiceAmount,
total_amount invoiceAmount,
qs_status qszt,
DATE_FORMAT(qs_date,'%Y-%m-%d') qsrq,
qs_type qsfs,

Loading…
Cancel
Save