diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java index e3e68156e..578f0de26 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java @@ -81,7 +81,7 @@ public class EmisSettleInvoiceRecord extends BaseEntity private BigDecimal openMoney; /* 发票号 */ private String invoiceNo; - /* 开票状态 0-待开票 1-已开票 2-拒绝开票 */ + /* 开票状态 0-待开票 1-开票中 2-开票成功 */ private String invoiceStatus; /* 开票状态描述 */ private String invoiceStatusDesc; @@ -91,7 +91,7 @@ public class EmisSettleInvoiceRecord extends BaseEntity private String email; /* 发票下载路径 */ private String filePath; - /* 审核状态 0-未审核 1-已审核 */ + /* 审核状态 0-未审核 1-已审核 2-审核不通过 */ private String blAudit; /* 审核日期 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleInvoiceRecordMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleInvoiceRecordMapper.java index 0ad83d04c..86dc7b256 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleInvoiceRecordMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleInvoiceRecordMapper.java @@ -56,7 +56,9 @@ public interface EmisSettleInvoiceRecordMapper extends BaseMapper=0) { + newBill.setOpenBillStatus("1"); + }else{ + newBill.setOpenBillStatus("2"); + } // 更新账单开票状态 emisSettleBillMapper.updateEmisSettleBill(newBill); diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml index 92e2a6b4b..3906f7478 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml @@ -125,7 +125,6 @@ and create_site = #{createSite} and update_site = #{updateSite} - and create_time = ]]> #{params.beginCreateTime} diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml index 90df325c8..eb64ed229 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml @@ -173,7 +173,7 @@ + + +