fix

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

@@ -35,29 +35,23 @@ public class TopOldOrderCompanyExportVo {
 
 	@Excel(name = "已付分成(元)")
 	@ApiModelProperty("已付分成(元)")
-	private String createUsername;
-	/** 业务号 */
-	@Excel(name = "业务号")
-	@ApiModelProperty("业务号")
-	private String createNo;
-	/** 订单标准价格 */
-	@Excel(name = "合同金额(元)")
-	@ApiModelProperty("订单标准价格")
-	private BigDecimal orderPrice;
-	/** 实收账款（元） */
-	@Excel(name = "已收账款(元)")
-	@ApiModelProperty("实收账款（元）")
-	private BigDecimal orderReceived;
-	/** 未收账款（元） */
-	@Excel(name = "未收账款(元)")
-	@ApiModelProperty("未收账款（元）")
-	private BigDecimal orderUncollected;
-	/** 预收款时间 */
-	@Excel(name = "预收时间")
-	@ApiModelProperty("预收款时间")
-	private String predictReceiveTime;
-	@ApiModelProperty("剩余天数")
-	private Integer predictReceiveDay;
+	private BigDecimal payMoney;
+	@Excel(name = "已扣分成(元)")
+	@ApiModelProperty("已扣分成(元)")
+	private BigDecimal deductMoney;
+
+
+	@Excel(name = "待付分成(元)")
+	@ApiModelProperty("待付分成(元)")
+	private BigDecimal waitPayMoney;
+	@Excel(name = "待扣分成(元)")
+	@ApiModelProperty("待扣分成(元)")
+	private BigDecimal waitDeductMoney;
+	@ApiModelProperty("预付时间")
+	private String predictPayTime;
+	@ApiModelProperty("预付款剩余天数")
+	private Integer predictPayDay;
+
 
 
 }

zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -270,6 +270,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="creditStatus != null and creditStatus != ''">
             AND too.credit_status = #{creditStatus}
         </if>
+        <if test="orderSn != null and orderSn != ''">
+            AND too.order_sn = #{orderSn}
+        </if>
         <if test="badBill != null and badBill == 1 and badBillList != null and badBillList.size()!=0 ">
             AND
             <foreach collection="badBillList" item="item" index="index" open="(" close=")" separator="or">