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

@@ -114,4 +114,7 @@ public class OrderGoodsAddBo {
     private String consigneePhone;
     @ApiModelProperty("手机地址")
     private String consigneeSite;
+
+    @ApiModelProperty("业务员")
+    private String salesman;
 }

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

@@ -78,4 +78,6 @@ public class OrderInputQueryBo extends BaseEntity {
 	@ApiModelProperty("录单来源 1普通录单 2新B端下单  3旧B端下单")
 	private Integer inputFrom;
 	private List<String> inputOrderSns;
+	@ApiModelProperty("业务员")
+	private String salesman;
 }

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

@@ -143,4 +143,7 @@ public class OrderQueryBo extends BaseEntity {
 
 	@ApiModelProperty("公司名称")
 	private String companyName;
+
+	@ApiModelProperty("业务员")
+	private String salesman;
 }

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

@@ -127,6 +127,9 @@ private static final long serialVersionUID=1L;
     /** 预约考试ID */
     private Long examSign;
 
+    /** 业务员名称 */
+    private String salesman;
+
     /** 完成日期 */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long finishTime;

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

@@ -263,4 +263,7 @@ public class OrderListVo {
 
     @ApiModelProperty("是否线下退款标识：0否 1是")
     private Integer offlineRefundSign;
+
+    @ApiModelProperty("业务员")
+    private String salesman;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserImportAddBo.java

@@ -49,6 +49,10 @@ public class UserImportAddBo {
     @ApiModelProperty("年份")
     private String year;
 
+    @Excel(name = "业务员")
+    @ApiModelProperty("业务员")
+    private String salesman;
+
     @Excel(name = "失败原因")
     private String cause;
 
@@ -62,4 +66,5 @@ public class UserImportAddBo {
     private String subjectIds;
     @ApiModelProperty("用户编号")
     private String studentCode;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserPeriodImportBo.java

@@ -43,6 +43,9 @@ public class UserPeriodImportBo implements Serializable {
     @Excel(name = "学历")
     private String education;
 
+    @Excel(name = "业务员")
+    private String salesman;
+
     @Excel(name = "所学专业")
     private String major;
 

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

@@ -120,6 +120,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="goodsType != null">
             AND g.goods_type = #{goodsType}
         </if>
+        <if test="salesman != null and salesman != ''">
+            AND og.salesman like concat('%', #{salesman}, '%')
+        </if>
         GROUP BY
         u.input_order_sn
         ORDER BY create_time DESC

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

@@ -60,10 +60,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="projectName" column="project_name"/>
         <result property="businessName" column="business_name"/>
         <result property="schoolName" column="school_name"/>
-        <result property="categoryName" column="category_name"/>
+        <result property="salesman" column="salesman"/>
 
         <result property="goodsPrice" column="goods_price"/>
         <result property="goodsRealPrice" column="goods_real_price"/>
+        <result property="goodsRealPrice" column="goods_real_price"/>
 
         <result property="idCard" column="id_card" typeHandler="com.zhongzheng.common.type.EncryptHandler"/>
         <result property="telphone" column="telphone" typeHandler="com.zhongzheng.common.type.EncryptHandler"/>
@@ -108,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             og.order_goods_id,
             og.goods_real_price,
             og.offline_refund_sign,
+            og.salesman,
             u.telphone,
             u.realname,
             u.id_card,
@@ -165,6 +167,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="orderGoodsStatus == 1">
             AND og.pay_status in (2,3,4) AND og.refund_status != 2
         </if>
+        <if test="salesman != null and salesman != ''">
+            AND og.salesman like concat('%', #{salesman}, '%')
+        </if>
         <if test="startTime != null">
             AND o.create_time >= #{startTime}
         </if>