导出订单清单功能2.0

common/src/main/java/com/winsun/mapper/OrderMapper.java

@@ -94,8 +94,6 @@ public interface OrderMapper extends BaseMapper<Order> {
 
     List<BroadBandOrder> selectBroadBandOrderList(Page<BroadBandOrder> page, BroadBandOrder broadBandOrder);
 
-    //List<BroadBandOrder> selectBroadBandOrderList(BroadBandOrder broadBandOrder);
-
     //List<Map<String, Object>> selectBroadBandOrderList2(BroadBandOrder bao,String startTime,String endTime);
 
     /**

service-manager/src/main/java/com/winsun/controller/OrderController.java

@@ -850,9 +850,9 @@ public class OrderController extends BaseController {
         for (Map<String, Object> maps : Orders) {
             //String schoolId = schoolMapper.selectSchoolIdByUserId(maps.get("hehuoren_id").toString());
             //school = schoolMapper.selectById(schoolId);
-            schools.get(maps.get("hehuoren_id").toString());
-            maps.put("lz_user", school.getLzUser());
-            maps.put("lzgh", school.getLzgh());
+            Schools sc = schools.get(maps.get("hehuoren_id").toString());
+            maps.put("lz_user", sc.getLzUser());
+            maps.put("lzgh", sc.getLzgh());
             String userTypeSrt = UserType.findById(maps.get("user_type").toString()).getName();
             maps.put("user_type", userTypeSrt);
             if (maps.get("is_delivery") != null && StringUtils.isNotBlank(maps.get("is_delivery").toString())) {
@@ -1098,11 +1098,11 @@ public class OrderController extends BaseController {
             }
 
             for (Map<String, Object> maps : Orders) {
-                *//*String schoolId = schoolMapper.selectSchoolIdByUserId(maps.get("hehuoren_id").toString());
-                school = schoolMapper.selectById(schoolId);*//*
-                schools.get(maps.get("hehuoren_id").toString());
-                maps.put("lz_user", school.getLzUser());
-                maps.put("lzgh", school.getLzgh());
+                //String schoolId = schoolMapper.selectSchoolIdByUserId(maps.get("hehuoren_id").toString());
+                //school = schoolMapper.selectById(schoolId);
+                Schools sc = schools.get(maps.get("hehuoren_id").toString());
+                maps.put("lz_user",sc.getLzUser());
+                maps.put("lzgh",sc.getLzgh());
                 String userTypeSrt = UserType.findById(maps.get("user_type").toString()).getName();
                 maps.put("user_type", userTypeSrt);
                 if (maps.get("is_delivery") != null && StringUtils.isNotBlank(maps.get("is_delivery").toString())) {

service-manager/src/main/java/com/winsun/controller/OrderViewController.java

@@ -105,7 +105,7 @@ public class OrderViewController extends BaseController {
     }
 
     @Permission(menuname = "导出宽带订单", value = "download", method = RequestMethod.POST)
-    public ResponseData<String> downloadOrderView2(BroadBandOrder broadBandOrder){
+    public ResponseData<String> downloadOrderView(BroadBandOrder broadBandOrder){
         ShiroUser user = getShiroUser();
         if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "系统管理员",  "县分管理员（订单）", "修改身份证", "合伙人"))) {
             return ResponseData.error("无权限查询订单");

task/src/main/java/com/winsun/service/ExportService.java

@@ -6,6 +6,7 @@ import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.bean.ExportExcel;
 import com.winsun.bean.Order;
 import com.winsun.bean.School;
+import com.winsun.bean.Schools;
 import com.winsun.constant.DeliveryType;
 import com.winsun.constant.ExamineType;
 import com.winsun.constant.FilePath;
@@ -25,10 +26,7 @@ import org.springframework.stereotype.Service;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 导出
@@ -281,12 +279,18 @@ public class ExportService extends BaseController {
             });
             //数据
             School school = new School();
+            List<Schools> school1 = schoolMapper.selectHhrSchool();
+            HashMap<String, Schools> schools = new HashMap<>();
+            for (Schools school2 : school1) {
+                schools.put(school2.getUserId(), school2);
+            }
             int rowIndex = row.getRowNum();
             for (Map<String, Object> maps : Orders) {
-                String schoolId = schoolMapper.selectSchoolIdByUserId(maps.get("hehuoren_id").toString());
-                school = schoolMapper.selectById(schoolId);
-                maps.put("lz_user",school.getLzUser());
-                maps.put("lzgh",school.getLzgh());
+                /*String schoolId = schoolMapper.selectSchoolIdByUserId(maps.get("hehuoren_id").toString());
+                school = schoolMapper.selectById(schoolId);*/
+                Schools sc = schools.get(maps.get("hehuoren_id").toString());
+                maps.put("lz_user",sc.getLzUser());
+                maps.put("lzgh",sc.getLzgh());
                 String userTypeSrt = UserType.findById(maps.get("user_type").toString()).getName();
                 maps.put("user_type",userTypeSrt);
                 if(maps.get("is_delivery") != null && StringUtils.isNotBlank(maps.get("is_delivery").toString())){