Merge branch 'dev'

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -3947,6 +3947,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         List<OrderKaoQianListExportVo> list = new ArrayList<>();
         for(OrderListVo vo : orderListVos){
             OrderKaoQianListExportVo item = BeanUtil.toBean(vo,OrderKaoQianListExportVo.class);
+            item.setBusinessName(vo.getBusinessName()+vo.getProjectName());
             list.add(item);
         }
         return list;

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

@@ -66,6 +66,9 @@ public class OrderKaoQianListExportVo {
     @ApiModelProperty("专业")
     private String categoryName;
 
+    @Excel(name = "业务层次")
+    @ApiModelProperty("业务层次")
+    private String businessName;
 
     @Excel(name = "教育名称")
     @ApiModelProperty("教育名称")

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

@@ -62,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="schoolName" column="school_name"/>
         <result property="salesman" column="salesman"/>
         <result property="subjectNames" column="category_name"/>
+        <result property="categoryName" column="category_name"/>
 
         <result property="goodsPrice" column="goods_price"/>
         <result property="goodsRealPrice" column="goods_real_price"/>