he2802 2 rokov pred
rodič
commit
c531e9fea5

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

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.top.order.vo;
 
-import com.zhongzheng.common.annotation.Excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 2 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/vo/TopOldOrderExportVo.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.top.order.vo;
 
-import com.zhongzheng.common.annotation.Excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.zhongzheng.modules.top.goods.vo.TopOldOrderAttachmentVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/vo/TopOldOrderSellerExportVo.java

@@ -1,6 +1,6 @@
 package com.zhongzheng.modules.top.order.vo;
 
-import com.zhongzheng.common.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 6 - 0
zhongzheng-system/src/main/resources/mapper/modules/top/TopDivideLogMapper.xml

@@ -128,6 +128,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="payStatus != null ">
             AND dl.pay_status = #{payStatus}
         </if>
+        <if test="createNo != null ">
+            AND dl.create_no = #{createNo}
+        </if>
         <if test="monthTime != null and monthTime != ''">
             AND dl.month_time in
             <foreach collection="monthTime" item="item" index="index" open="(" close=")" separator=",">
@@ -152,6 +155,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="payStatus != null">
             AND dl.pay_status = #{payStatus}
         </if>
+        <if test="createNo != null ">
+            AND dl.create_no = #{createNo}
+        </if>
         <if test="monthTime != null and monthTime != ''">
             AND dl.month_time in
             <foreach collection="monthTime" item="item" index="index" open="(" close=")" separator=",">