submit

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderController.java

@@ -250,4 +250,11 @@ public class OrderController extends BaseController {
         return toAjax(iOrderGoodsService.mailOrderHandle(bo)?1:0);
     }
 
+    @ApiOperation("订单导出")
+    @PostMapping("/export/new")
+    public AjaxResult<Void> exportNew(@RequestBody OrderExportNewBo bo) {
+        List<OrderExportNewVo> list = iOrderService.exportNew(bo);
+        ExcelUtil<OrderExportNewVo> util = new ExcelUtil<>(OrderExportNewVo.class);
+        return util.exportExcel(list,"订单记录");
+    }
 }

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

@@ -0,0 +1,23 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class OrderExportNewBo implements Serializable {
+
+    @ApiModelProperty("订单号")
+    private String orderSn;
+    @ApiModelProperty("订单开始时间")
+    private Long orderStartTime;
+    @ApiModelProperty("订单结束时间")
+    private Long orderEndTime;
+    @ApiModelProperty("教育类型id")
+    private Long educationTypeId;
+    @ApiModelProperty("业务层次id")
+    private Long businessId;
+    @ApiModelProperty("公司名称")
+    private String companyName;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderMapper.java

@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
 import com.zhongzheng.modules.grade.bo.ClassGradeListBo;
 import com.zhongzheng.modules.grade.domain.ClassGrade;
+import com.zhongzheng.modules.order.bo.OrderExportNewBo;
 import com.zhongzheng.modules.order.bo.OrderGoodsQueryBo;
 import com.zhongzheng.modules.order.bo.OrderQueryBo;
 import com.zhongzheng.modules.order.domain.Order;
+import com.zhongzheng.modules.order.vo.OrderExportNewVo;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 import com.zhongzheng.modules.order.vo.OrderListVo;
 import com.zhongzheng.modules.top.goods.vo.TopOldOrderInvoiceVo;
@@ -72,4 +74,6 @@ public interface OrderMapper extends BaseMapper<Order> {
     Long getOrderGoodsByBo(@Param("goodsId") Long goodsId,@Param("userId") Long userId);
 
     Long getCountByGoods(@Param("goodsIds") List<Long> goodsIds);
+
+    List<OrderExportNewVo> exportNew(OrderExportNewBo bo);
 }

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

@@ -7,10 +7,7 @@ import com.zhongzheng.modules.goods.bo.QuestionOpenImportBo;
 import com.zhongzheng.modules.goods.vo.QuestionOpenImportVo;
 import com.zhongzheng.modules.order.bo.*;
 import com.zhongzheng.modules.order.domain.Order;
-import com.zhongzheng.modules.order.vo.OrderGoodsVo;
-import com.zhongzheng.modules.order.vo.OrderListExportVo;
-import com.zhongzheng.modules.order.vo.OrderListVo;
-import com.zhongzheng.modules.order.vo.OrderVo;
+import com.zhongzheng.modules.order.vo.*;
 import com.zhongzheng.modules.top.goods.vo.TopOldOrderInvoiceVo;
 
 import java.util.Collection;
@@ -135,4 +132,6 @@ public interface IOrderService extends IService<Order> {
     List<TopOldOrderInvoiceVo> getOrderInvoiceList(String orderSn);
 
     List<String> getBusinessNameBySn(String orderSn);
+
+	List<OrderExportNewVo> exportNew(OrderExportNewBo bo);
 }

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

@@ -3420,6 +3420,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return baseMapper.getBusinessNameBySn(orderSn);
     }
 
+    @Override
+    public List<OrderExportNewVo> exportNew(OrderExportNewBo bo) {
+        return baseMapper.exportNew(bo);
+    }
+
     private void questionOpen(User user, QuestionMerchant merchant,UserSubscribe userSubscribe,Long loginId,String loginName) {
         //商家商品
         Goods merGoods = iGoodsService.getOne(new LambdaQueryWrapper<Goods>()

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

@@ -0,0 +1,92 @@
+package com.zhongzheng.modules.order.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+/**
+ * 订单视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-11-08
+ */
+@Data
+@ApiModel("订单视图对象")
+public class OrderExportNewVo implements Serializable {
+
+    /**
+     * 订单时间
+     */
+    @Excel(name = "订单时间")
+    @ApiModelProperty("订单时间")
+    private String orderTime;
+
+    /**
+     * 学员姓名
+     */
+    @Excel(name = "学员姓名")
+    @ApiModelProperty("学员姓名")
+    private String realname;
+
+    /**
+     * 手机号码
+     */
+    @Excel(name = "手机号码")
+    @ApiModelProperty("手机号码")
+    private String telphone;
+
+    /**
+     * 身份证号
+     */
+    @Excel(name = "身份证号")
+    @ApiModelProperty("身份证号")
+    private String idCard;
+
+    @Excel(name = "公司名称")
+    @ApiModelProperty("公司名称")
+    private String companyName;
+    /**
+     * 订单编号
+     */
+    @Excel(name = "订单编号")
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+
+    /**
+     * 商品名称
+     */
+    @Excel(name = "商品名称")
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+
+    /**
+     * 报名岗位
+     */
+    @Excel(name = "报名岗位")
+    @ApiModelProperty("报名岗位")
+    private String majorName;
+
+    /**
+     * 商品年份
+     */
+    @Excel(name = "商品年份")
+    @ApiModelProperty("商品年份")
+    private String goodsYear;
+
+    /**
+     * 是否关闭过订单
+     */
+    @Excel(name = "订单是否关闭")
+    @ApiModelProperty("订单是否关闭")
+    private String orderStatus;
+
+    @Excel(name = "是否学时复购冲突")
+    @ApiModelProperty("是否学时复购冲突")
+    private String studyStatus;
+
+}

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

@@ -733,4 +733,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </select>
 
+    <select id="exportNew" resultType="com.zhongzheng.modules.order.vo.OrderExportNewVo"
+            parameterType="com.zhongzheng.modules.order.bo.OrderExportNewBo">
+        SELECT
+            FROM_UNIXTIME( og.create_time, '%Y-%m-%d %H:%i:%s' ) AS orderTime,
+            u.realname AS realname,
+            AES_DECRYPT( UNHEX( u.id_card ), 'base20230213zzkj' ) AS idCard,
+            AES_DECRYPT( UNHEX( u.telphone ), 'base20230213zzkj' ) AS telphone,
+            u.company_name AS companyName,
+            m.category_name AS majorName,
+            g.seven_year AS goodsYear,
+            CASE
+            WHEN og.`status` = 1 THEN
+            '否'
+            WHEN og.`status` = 0 THEN
+            '是' ELSE '其他'
+            END AS orderStatus
+        FROM
+            order_goods og
+        LEFT JOIN `order` o ON og.order_sn = o.order_sn
+        LEFT JOIN `user` u ON o.user_id = u.user_id
+        LEFT JOIN goods g ON og.goods_id = g.goods_id
+        LEFT JOIN major m ON g.major_id = m.id
+        WHERE
+        og.refund_status != 2
+        AND og.pay_status != 1
+        <if test="orderSn != null and orderSn != ''">
+            AND o.order_sn = #{orderSn}
+        </if>
+        <if test="orderStartTime != null and orderStartTime != ''">
+            AND og.create_time <![CDATA[ >= ]]> #{orderStartTime}
+        </if>
+        <if test="orderEndTime != null and orderEndTime != ''">
+            AND og.create_time <![CDATA[ <= ]]> #{orderEndTime}
+        </if>
+        <if test="educationTypeId != null and educationTypeId != ''">
+            AND g.education_type_id = #{educationTypeId}
+        </if>
+        <if test="businessId != null and businessId != ''">
+            AND g.business_id = #{businessId}
+        </if>
+        <if test="companyName != null and companyName != ''">
+            AND u.company_name = #{companyName}
+        </if>
+    </select>
+
 </mapper>