激活BUG判断

jsjp-admin/src/main/java/com/miaxis/pc/PcOrderInfoController.java

@@ -1,8 +1,11 @@
 package com.miaxis.pc;
 
+import com.miaxis.common.annotation.Log;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.poi.ExcelUtil;
 import com.miaxis.order.domain.OrderInfo;
 import com.miaxis.order.dto.QuerySchoolOrderListDTO;
 import com.miaxis.order.service.IOrderInfoService;
@@ -12,6 +15,7 @@ import com.miaxis.wx.service.IRefundRecordService;
 import com.miaxis.wx.service.IWxJsOrderService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -117,5 +121,17 @@ public class PcOrderInfoController extends BaseController{
     }
 
 
+    /**
+     * 导出订单信息列表
+     */
+    @Log(title = "订单信息", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出订单信息列表Excel")
+    public Response<String> export(@ModelAttribute QuerySchoolOrderListDTO schoolOrderListDTO){
+        List<QuerySchoolOrderListVo> list = orderInfoService.selectSchoolOrderInfoList(schoolOrderListDTO);
+        ExcelUtil<QuerySchoolOrderListVo> util = new ExcelUtil<QuerySchoolOrderListVo>(QuerySchoolOrderListVo.class);
+        return util.exportExcel(list, "info");
+    }
+
 
 }

jsjp-service/src/main/java/com/miaxis/newgzpt/dto/GzptSchPayConfigDTO.java

@@ -26,9 +26,9 @@ public class GzptSchPayConfigDTO implements Serializable {
     private String jxmc;
 
     @ApiModelProperty(value = "0关闭 1开通 此字段将权限大于开通时间")
-    @TableField("IS_OPEN")
     private Integer isOpen;
 
-
+    @ApiModelProperty(value = "0关闭 1开通 此字段将权限大于开通时间")
+    private String dqbh;
 
 }

jsjp-service/src/main/java/com/miaxis/order/dto/QuerySchoolOrderListDTO.java

@@ -32,4 +32,8 @@ public class QuerySchoolOrderListDTO extends BaseBusinessEntity {
 
     @ApiModelProperty(value = "是否是合作订单 1:合作单位 0:不合作")
     private Integer isShare;
+
+    @ApiModelProperty(value = "地区编号")
+    private String dqbh;
+
 }

jsjp-service/src/main/java/com/miaxis/order/vo/QuerySchoolOrderListVo.java

@@ -1,6 +1,7 @@
 package com.miaxis.order.vo;
 
 
+import com.miaxis.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,17 +14,19 @@ import lombok.Data;
 public class QuerySchoolOrderListVo  {
     private static final long serialVersionUID = 1L;
 
-
+    @Excel(name = "驾校名称")
     @ApiModelProperty(value = "驾校名称")
     private String schoolName;
 
+    @Excel(name = "驾校编号")
     @ApiModelProperty(value = "驾校编号")
     private String school;
 
-
+    @Excel(name = "订单总金额")
     @ApiModelProperty(value = "订单总金额")
     private String orderTotal;
 
+    @Excel(name = "驾校提成")
     @ApiModelProperty(value = "驾校提成")
     private String schoolCommission;
 

jsjp-service/src/main/resources/mapper/newgzpt/GzptSchPayConfigMapper.xml

@@ -25,6 +25,7 @@
         <where>
             <if test="isOpen != null"> and is_open = #{isOpen }</if>
             <if test="jxmc != null  and jxmc != ''"> and jxmc like '%' ||  #{jxmc,jdbcType=VARCHAR} || '%'</if>
+            <if test="dqbh != null  and dqbh != ''"> and dqbh = #{dqbh}</if>
         </where>
     </select>
 

jsjp-service/src/main/resources/mapper/order/OrderInfoMapper.xml

@@ -70,6 +70,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tradeType != null">
                 and trade_type = #{tradeType }
             </if>
+            <if test="dqbh != null  and dqbh != ''">
+                and dqbh = #{dqbh}
+            </if>
             <if test="schoolName != null  and schoolName != ''">
                 and school_name like concat('%', #{schoolName}, '%')
             </if>