submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/CompanyOrderInvoiceBo.java

@@ -34,7 +34,7 @@ public class CompanyOrderInvoiceBo implements Serializable {
     @ApiModelProperty("业务层次ID")
     private Long businessId;
 
-    @ApiModelProperty("发票状态：1待审核 2已开票 3不通过")
+    @ApiModelProperty("发票状态：1待审核 2已开票 3不通过 4已失效")
     private Integer invoiceStatus;
 
     @ApiModelProperty("冲红状态：1待冲红 2已冲红")

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderInvoice.java

@@ -92,6 +92,7 @@ private static final long serialVersionUID=1L;
     /** 发票类型：0,C端个人发票  1，C端企业发票 */
     private Integer invoiceType;
     /** 发票备注 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String invoiceRemark;
     /** 收票姓名 */
     private String consignee;
@@ -104,7 +105,9 @@ private static final long serialVersionUID=1L;
     /** 冲红状态：1待冲红 2已冲红 */
     private Integer washStatus;
     /** 开票备注 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String openRemark;
     /** 处理备注 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String handleRemark;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/CompanyOrderInvoiceVo.java

@@ -80,4 +80,7 @@ public class CompanyOrderInvoiceVo implements Serializable {
     private String businessName;
     @ApiModelProperty("商品类型")
     private Integer goodsType;
+
+    @ApiModelProperty("审核状态")
+    private Integer periodStatus;
 }

zhongzheng-system/src/main/resources/mapper/modules/order/OrderInvoiceMapper.xml

@@ -150,7 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 WHEN oi.period_status = 2 THEN
                     3
                 WHEN oi.invoice_status = 2 THEN
-                    2 ELSE 0
+                    2 ELSE oi.invoice_status
                 END invoiceStatus,
             oi.apply_time AS applyTime,
             oi.make_out_time AS invoiceTime,