Browse Source

订单开票审核负责人开发

anderx 3 years ago
parent
commit
fda291826b

+ 4 - 3
src/main/java/com/goafanti/common/mapper/TOrderInvoiceMapper.xml

@@ -457,8 +457,9 @@
 
   <select id="salesmanOrderInvoiceList" resultType="com.goafanti.order.bo.TOrderInvoiceBo">
     select a.id ,a.order_no as orderNo,b.contract_no contractNo,a.amount,date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createTime,
-	a.reject_reason as  rejectReason,a.status ,a.approval from t_order_invoice a left join t_order_new b
-	on a.order_no=b.order_no where a.status !=4
+	a.reject_reason as  rejectReason,a.status ,a.approval,a.examine_name examineName
+    from t_order_invoice a left join t_order_new b on a.order_no=b.order_no
+    where a.status in (0,1,2,3)
 	<if test="orderNo !=null">
 	and a.order_no = #{orderNo,jdbcType=VARCHAR}
 	</if>
@@ -469,7 +470,7 @@
   </select>
 
   <select id="salesmanOrderInvoiceCount" resultType="java.lang.Integer">
-   select count(*) from t_order_invoice where status !=4
+   select count(*) from t_order_invoice where a.status in (0,1,2,3)
 	<if test="orderNo !=null">
 	and order_no = #{orderNo,jdbcType=VARCHAR}
 	</if>

+ 13 - 3
src/main/java/com/goafanti/order/bo/TOrderInvoiceBo.java

@@ -25,7 +25,17 @@ public class TOrderInvoiceBo {
 	private BigDecimal notAmount;
 	private BigDecimal settlementAmount;
 	private String rejectReason;
+	private String examineName;
 	private Integer approval;
+
+	public String getExamineName() {
+		return examineName;
+	}
+
+	public void setExamineName(String examineName) {
+		this.examineName = examineName;
+	}
+
 	public Integer getId() {
 		return id;
 	}
@@ -56,7 +66,7 @@ public class TOrderInvoiceBo {
 	public void setProjectStatus(Integer projectStatus) {
 		this.projectStatus = projectStatus;
 	}
-	
+
 	public String getCreateTime() {
 		return createTime;
 	}
@@ -117,6 +127,6 @@ public class TOrderInvoiceBo {
 	public void setContractNo(String contractNo) {
 		this.contractNo = contractNo;
 	}
-	
-	
+
+
 }