Excel文件下载

f32f8e99 · 伍思炜 · 9ddd5769 · f32f8e99 · f32f8e99 · f32f8e99
Commit f32f8e99 authored Sep 14, 2021 by 伍思炜
9 changed files
--- a/common/src/main/java/com/winsun/mapper/OrderMapper.java
+++ b/common/src/main/java/com/winsun/mapper/OrderMapper.java
@@ -94,6 +94,8 @@ public interface OrderMapper extends BaseMapper<Order> {
    List<BroadBandOrder> selectBroadBandOrderList(Page<BroadBandOrder> page, BroadBandOrder broadBandOrder);
+    //List<Map<String, Object>> selectBroadBandOrderList2(BroadBandOrder bao,String startTime,String endTime);
    /**
     * 查询重复订单
     * @param idCard

--- a/common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrder.java
+++ b/common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrder.java
@@ -1561,7 +1561,7 @@ public class IntelligenceSendOrder {
            JSONObject saleJsonObject =
                    getSaleId(productId, currentTimeStr, 0); // 获取销售ID
            log.info("----------调用智能平台的获取销售品接口返回值：" + saleJsonObject);
-            String expenses = null;
+            String expenses = "";
            if (schoolMap.get("identifying") != null) {
                expenses = schoolMap.get("identifying").toString();
            }

--- a/common/src/main/java/com/winsun/rabbitmq/RabbitProducer.java
+++ b/common/src/main/java/com/winsun/rabbitmq/RabbitProducer.java
 package com.winsun.rabbitmq;
+import com.winsun.auth.core.shiro.ShiroUser;
 import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -15,7 +16,7 @@ public class RabbitProducer {
    @Autowired
    private AmqpTemplate rabbitTemplate;
-    public void taskImport(Map<String,Object> type) {
+    public void taskImport(Map<String, Object> type) {
        this.rabbitTemplate.convertAndSend("taskImport", type);
    }

--- a/common/src/main/java/com/winsun/service/impl/HhrUserServiceImpl.java
+++ b/common/src/main/java/com/winsun/service/impl/HhrUserServiceImpl.java
@@ -33,6 +33,7 @@ public class HhrUserServiceImpl extends ServiceImpl<HhrUserMapper, HhrUser> impl
     * 获取管辖内用户id
     * @return
     */
+    @Override
    public List<Integer> getUserIds (Integer userId, List<String> roles) {
        List<Integer> resultList = new ArrayList<>();
        StringBuffer sb = new StringBuffer();

--- a/common/src/main/resources/com/winsun/mapper/mapping/OrderMapper.xml
+++ b/common/src/main/resources/com/winsun/mapper/mapping/OrderMapper.xml
@@ -165,6 +165,8 @@
      order by create_time desc
   </select>
    <select id="selectOrderIdByOrderNumber" parameterType="String" resultMap="broadBandOrder">
        select * from hhr_order where  order_number = #{orderNumber}
    </select>
@@ -467,5 +469,88 @@
            count( ho.id ) DESC
        limit 0, 5
    </select>
+    <select id="selectBroadBandOrderList2" resultType="java.util.HashMap">
+        select
+        ho.*,
+        ov.productName,
+        ov.order_set_meal,
+        ov.order_university_name,
+        ov.orderName,
+        ov.ipay,
+        ov.payType,
+        ov.webOrderAmount,
+        ov.order_payment_time,
+        ov.orderReqtranSeq,
+        ov.customeRid,
+        ov.orderPhone,
+        ov.order_customer_type,
+        ov.order_customer_student_id,
+        ov.order_customer_remarks,
+        ov.order_customer_account,
+        ov.order_customer_pwd,
+        ov.uptranseq,
+        ov.expenses,
+        ov.order_rf2,
+        ov.orderSeqTHD,
+        ov.order_region,
+        ov.orderDate
+        from (
+        select * from hhr_order
+        where
+        kd_order_id is not null
+        and user_type in (3,5,9,10)
+        <if test="createTimeStart != null and createTimeStart != ''">
+            and create_time &gt;= #{createTimeStart}
+        </if>
+        <if test="createTimeEnd != null and createTimeEnd != ''">
+            and create_time &lt;= #{createTimeEnd}
+        </if>
+        <if test="successTimeStart != null and successTimeStart != ''">
+            and success_time &gt;= #{successTimeStart}
+        </if>
+        <if test="successTimeEnd != null and successTimeEnd != ''">
+            and success_time &lt;= #{successTimeEnd}
+        </if>
+        <if test="userType != null and userType != ''">
+            and user_type = #{userType}
+        </if>
+        <if test="hehuorenArea != null and hehuorenArea != ''">
+            and hehuoren_area = #{hehuorenArea}
+        </if>
+        <if test="orderStatus != null and orderStatus != ''">
+            and order_status = #{orderStatus}
+        </if>
+        <if test="hehuorenSchool != null and hehuorenSchool != ''">
+            and hehuoren_school = #{hehuorenSchool}
+        </if>
+        <if test="orderNumber != null and orderNumber != ''">
+            and order_number = #{orderNumber}
+        </if>
+        <if test="hehuorenName != null and hehuorenName != ''">
+            and hehuoren_name = #{hehuorenName}
+        </if>
+        <if test="contactNumber != null and contactNumber != ''">
+            and contact_number = #{contactNumber}
+        </if>
+        <if test="businessNumber != null and businessNumber != ''">
+            and business_number = #{businessNumber}
+        </if>
+        <if test="customerName != null and customerName != ''">
+            and customer_name = #{customerName}
+        </if>
+        <if test="orderId != null and orderId != ''">
+            and order_id = #{orderId}
+        </if>
+        <if test="hehuorenIds != null and hehuorenIds.size > 0">
+            and hehuoren_id in
+            <foreach collection="hehuorenIds" item="hehuorenId" open="(" close=")" separator=",">
+                #{hehuorenId}
+            </foreach>
+        </if>
+        ) ho,order_view ov
+        where
+        ho.kd_order_id = ov.orderSeq
+        order by create_time desc
+    </select>
 </mapper>
\ No newline at end of file
--- a/core-service/src/main/resources/application.yml
+++ b/core-service/src/main/resources/application.yml
@@ -84,7 +84,7 @@ spring:
    database: 0
    host: localhost
    port: 6379
-    password: hniPdaqs4$8HH8m6KTP
+    password:
 #    password: ENC(dzBR0ihAkOs43UgnwmnQfFpmjbWvfqmtOIwwgra/+ik=)
    lettuce:
      pool:

--- a/service-manager/src/main/java/com/winsun/controller/OrderController.java
+++ b/service-manager/src/main/java/com/winsun/controller/OrderController.java
@@ -547,7 +547,7 @@ public class OrderController extends BaseController {
        ShiroUser user = getShiroUser();
        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "系统管理员", "县分管理员（订单）", "修改身份证", "合伙人"))) {
-            ResponseData.error("无权限查询订单");
+            return ResponseData.error("无权限查询订单");
        }
        List<Integer> userIds = hhrUserService.getUserIds(user.getId(), user.getRoleNames());
@@ -726,8 +726,11 @@ public class OrderController extends BaseController {
        }
        Map<String, Object> map = new HashMap<>();
        ShiroUser user = getShiroUser();
+        // 添加查询权限
+        List<Integer> userIds = hhrUserService.getUserIds(user.getId(), user.getRoleNames());
        map.put("userId", user.getId());
        map.put("userName", user.getName());
+        map.put("userIds",userIds);
        if (StringUtils.isNotBlank(createTimeStart)) {
            map.put("createTimeStart", createTimeStart);
        }
@@ -792,6 +795,7 @@ public class OrderController extends BaseController {
        }
        return ResponseData.success("订单导出正在队列排队执行中，稍后请在下载列表下载！");
    }
    public void ExportOrderView(Map<String, Object> map) {
        String createTimeStart = "";
        if(map.containsKey("createTimeStart")){

--- a/service-manager/src/main/java/com/winsun/controller/OrderViewController.java
+++ b/service-manager/src/main/java/com/winsun/controller/OrderViewController.java
@@ -9,9 +9,12 @@ import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.auth.core.shiro.ShiroUser;
 import com.winsun.auth.core.util.IOUtils;
+import com.winsun.bean.BroadBandOrder;
 import com.winsun.bean.OrderView;
 import com.winsun.constant.OrderStatus;
+import com.winsun.mapper.OrderMapper;
 import com.winsun.mapper.OrderViewMapper;
+import com.winsun.service.IHhrUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFCell;
@@ -23,7 +26,11 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -40,11 +47,16 @@ public class OrderViewController extends BaseController {
    private static OrderViewMapper orderViewMapper;
+    private static OrderMapper orderMapper;
    @Autowired
    public OrderViewController(OrderViewMapper orderViewMapper) {
        OrderViewController.orderViewMapper = orderViewMapper;
    }
+    @Autowired
+    private IHhrUserService hhrUserService;
    /**
     * @param startTime           开始时间
     * @param endTime             结束时间
@@ -61,6 +73,7 @@ public class OrderViewController extends BaseController {
                                                       @RequestParam("orderseq") String orderseq, @RequestParam("orderUniversityName") String orderUniversityName,
                                                       @RequestParam("status") String status, @RequestParam("ordername") String ordername,
                                                       @RequestParam(name = "pageNo") int pageIndex, @RequestParam(name = "pageSize") int pageSize) {
+        int i = 19;
        ShiroUser user = getShiroUser();
        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "县分管理员（订单）", "修改身份证"))) {
            return ResponseData.error("无数据权限");
@@ -90,11 +103,19 @@ public class OrderViewController extends BaseController {
        return ResponseData.success(page, "查询成功！");
    }
-    @Permission(menuname = "导出宽带订单", value = "download", method = RequestMethod.POST)
+    /*@Permission(menuname = "导出宽带订单", value = "download", method = RequestMethod.POST)
-    public void downloadOrderView(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime,
+    public ResponseData<String> downloadOrderView(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime,
                                  @RequestParam("orderseq") String orderseq, @RequestParam("orderUniversityName") String orderUniversityName,
-                                  @RequestParam("status") String status, @RequestParam("ordername") String ordername) {
+                                  @RequestParam("status") String status, @RequestParam("ordername") String ordername) throws ParseException {
+        ShiroUser user = getShiroUser();
+        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "系统管理员",  "县分管理员（订单）", "修改身份证", "合伙人"))) {
+            return ResponseData.error("无权限查询订单");
+        }
+        List<Integer> userIds = hhrUserService.getUserIds(user.getId(), user.getRoleNames());
        String dateFormat = "YYYY-MM-DD";
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
            startTime = startTime.substring(0, dateFormat.length()) + " 00:00:00";
            endTime = endTime.substring(0, dateFormat.length()) + " 23:59:59";
@@ -106,14 +127,32 @@ public class OrderViewController extends BaseController {
        if (StringUtils.isNotBlank(status)) {
            state = OrderStatus.findById(status).getId();
        }
-        Wrapper<OrderView> wrapper = new EntityWrapper();
+        *//*Wrapper<OrderView> wrapper = new EntityWrapper();
        wrapper.like(StringUtils.isNotBlank(orderseq), "orderSeq", orderseq, SqlLike.DEFAULT);
        wrapper.like(StringUtils.isNotBlank(ordername), "orderName", ordername, SqlLike.DEFAULT);
        wrapper.like(StringUtils.isNotBlank(orderUniversityName), "order_university_name", orderUniversityName, SqlLike.DEFAULT);
        wrapper.eq(StringUtils.isNotBlank(status), "status", state);
        wrapper.ge(StringUtils.isNotBlank(startTime), "orderDate", startTime);
        wrapper.le(StringUtils.isNotBlank(endTime), "orderDate", endTime);
-        List<Map<String, Object>> OrderViews = orderViewMapper.downloadOrderView(wrapper);
+        wrapper.in("hehuoren_id",userIds);*//*
+        BroadBandOrder broadBandOrder = new BroadBandOrder();
+        if (StringUtils.isNotBlank(orderseq)){
+            broadBandOrder.setOrderSeq(orderseq);
+        }
+        if (StringUtils.isNotBlank(ordername)){
+            broadBandOrder.setOrderName(ordername);
+        }
+        if (StringUtils.isNotBlank(orderUniversityName)){
+            broadBandOrder.setOrderUniversityName(orderUniversityName);
+        }
+        if (StringUtils.isNotBlank(state)){
+            broadBandOrder.setStatus(state);
+        }
+        broadBandOrder.setHehuorenIds(userIds);
+        List<Map<String, Object>> OrderViews = orderMapper.selectBroadBandOrderList2(broadBandOrder,startTime,endTime);
+        //List<Map<String, Object>> OrderViews = orderViewMapper.downloadOrderView(wrapper);;
        List<String> tops = new ArrayList<>();
        tops.add("订单id");
        tops.add("订单编号");
@@ -201,5 +240,7 @@ public class OrderViewController extends BaseController {
        } finally {
            IOUtils.closeQuite(workbook, os);
        }
-    }
+        return ResponseData.success("导出成功");
+    }*/
 }
--- a/task/src/main/java/com/winsun/service/ExportService.java
+++ b/task/src/main/java/com/winsun/service/ExportService.java
@@ -132,10 +132,16 @@ public class ExportService extends BaseController {
            isDelivery = map.get("isDelivery").toString();
        }
-        ShiroUser user = getShiroUser();
+        Integer userId = null;
+        if (map.containsKey("userId")){
+            userId = Integer.parseInt(map.get("userId").toString());
+        }
-        // 添加查询权限
+        List<Integer> userIds = (List<Integer>) map.get("userIds");
-        List<Integer> userIds = hhrUserService.getUserIds(user.getId(), user.getRoleNames());
        EntityWrapper<Order> wrapper = new EntityWrapper();
        wrapper.setSqlSelect("customer_name, business_number, order_status, create_time, " +