Skip to content

G
gdtel-gztel-school-center
Commit 8fcd43be by 伍思炜
Options

优化导出宽带订单清单功能

parent 317fce09
Showing with 307 additions and 157 deletions
common/src/main/java/com/winsun/bean/Order.java
...@@ -332,7 +332,7 @@ public class Order implements Serializable{ ...@@ -332,7 +332,7 @@ public class Order implements Serializable{
private String hehuorenArea; private String hehuorenArea;
/** /**
* 合伙人县分 * 合伙人名字
*/ */
@TableField(value = "hehuoren_name") @TableField(value = "hehuoren_name")
private String hehuorenName; private String hehuorenName;
......
common/src/main/java/com/winsun/bean/Schools.java 0 → 100644
package com.winsun.bean;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.FieldFill;
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* < >
* @Author pxl
* @Date 2020-05-27
*/
@Data
@TableName ("hhr_school")
public class Schools implements Serializable {
private static final long serialVersionUID = 6941854875917339515L;
@TableId(value = "id" ,type = IdType.AUTO)
private Integer id;
/**
* 县分
*/
@TableField("sub_name" )
private String subName;
/**
* 学校
*/
@TableField("school_name" )
private String schoolName;
/**
* 是否禁用（0禁用；1使用）
*/
@TableField("status" )
private Integer status;
/**
* 二维码扫码后默认办理套餐
*/
@TableField("defaultPackage" )
private Integer defaultPackage;
/**
* 学校对应客服的二维码地址
*/
@TableField("service_qrcode" )
private String serviceQrcode;
/**
* 揽装人
*/
@TableField("lz_user" )
private String lzUser;
/**
* 揽装工号
*/
@TableField("lzgh" )
private String lzgh;
/**
* 网点id
*/
@TableField("net_id" )
private String netId;
/**
* 宽带速率
*/
@TableField("kdsl" )
private String kdsl;
/**
* 1包月2包年3包月包年
*/
@TableField("fee_type" )
private String feeType;
/**
* 生成二维码的url
*/
@TableField("url" )
private String url;
/**
* 是否新装融合(0:否 1:是)
*/
@TableField("net_type" )
private Integer netType;
/**
* 是否收到电信卡，0：否，1:是
*/
@TableField("is_recv" )
private Integer isRecv;
/**
* 是否显示0息购机0：否，1:是
*/
@TableField("net_phone" )
private Integer netPhone;
/**
* 单宽id
*/
@TableField("bandproduct_id" )
private String bandproductId;
/**
* 显示宽带
*/
@TableField("is_showband" )
private String isShowband;
/**
* 是否显示融合
*/
@TableField("is_showrh" )
private String isShowrh;
/**
* 是否显示优惠购机
*/
@TableField("is_showyhgj")
private String isShowyhgj;
/**
* 是否显示毕业生融合办理
*/
@TableField("bysrh" )
private String bysrh;
/**
* 网点编码
*/
@TableField("network_code" )
private String networkCode;
/**
* 网点名称
*/
@TableField("network_name" )
private String networkName;
/**
* 开学时间
*/
@TableField("start_date")
private Date startDate;
/**
* 结束时间
*/
@TableField("end_date")
private Date endDate;
/**
* 大于50元激励
*/
@TableField(value = "greater_fifty", fill = FieldFill.UPDATE)
private Double greaterFifty;
/**
* 大于100元激励
*/
@TableField(value = "greater_hundred", fill = FieldFill.UPDATE)
private Double greaterHundred;
/**
* 是否显示宽叠移按钮
*/
@TableField("kdy_btn")
private String kdyBtn;
/**
* 是否显示优惠购机按钮
*/
@TableField("is_showyhgj")
private String yhgj;
/**
* 宽带、融合是否甩单
*/
@TableField("jilt_kd")
private String jiltKd;
/**
* 宽叠移是否甩单
*/
@TableField("jilt_kdy")
private String jiltKdy;
/**
* 线上线下按钮是否显示
*/
@TableField("ud_btn")
private String udBtn;
/**
* 手机卡办理
*/
@TableField("sjkbl")
private String sjkbl;
/**
* 套餐升级
*/
@TableField("tcsj")
private String tcsj;
/**
* 手机卡套餐升级
*/
@TableField("sjktcsj")
private String sjktcsj;
/**
* 终端编码
*/
@TableField("app_id")
private String appId;
/**
* 终端密匙
*/
@TableField("app_key")
private String appKey;
private String userId;
}
service-manager/src/main/java/com/winsun/controller/OrderController.java
...@@ -118,15 +118,22 @@ public class OrderController extends BaseController { ...@@ -118,15 +118,22 @@ public class OrderController extends BaseController {
private static String ORDER_STATUS = "受理状态（已完成，异常单）"; private static String ORDER_STATUS = "受理状态（已完成，异常单）";
private static OrderMapper orderMapper; @Autowired
private static OrderViewMapper orderViewMapper; private OrderMapper orderMapper;
private static SchoolMapper schoolMapper; @Autowired
private OrderViewMapper orderViewMapper;
private static SysUserMapper sysUserMapper; @Autowired
private SchoolMapper schoolMapper;
private static AppMapper appMapper; @Autowired
private SysUserMapper sysUserMapper;
@Autowired
private AppMapper appMapper;
@Autowired
private ExportExcelMapper exportExcelMapper; private ExportExcelMapper exportExcelMapper;
@Autowired @Autowired
...@@ -153,18 +160,6 @@ public class OrderController extends BaseController { ...@@ -153,18 +160,6 @@ public class OrderController extends BaseController {
@Autowired @Autowired
private ISalesListService salesListService; private ISalesListService salesListService;
@Autowired
public OrderController(OrderMapper orderMapper, SchoolMapper schoolMapper, SysUserMapper sysUserMapper,
AppMapper appMapper, ExportExcelMapper exportExcelMapper, OrderViewMapper orderViewMapper) {
OrderController.orderMapper = orderMapper;
OrderController.schoolMapper = schoolMapper;
OrderController.sysUserMapper = sysUserMapper;
OrderController.appMapper = appMapper;
this.exportExcelMapper = exportExcelMapper;
OrderController.orderViewMapper = orderViewMapper;
}
/** /**
* 查询订单历史状态 * 查询订单历史状态
*/ */
...@@ -551,7 +546,6 @@ public class OrderController extends BaseController { ...@@ -551,7 +546,6 @@ public class OrderController extends BaseController {
*/ */
@Permission(menuname = "查询订单信息", value = "broadBandOrder", method = RequestMethod.POST) @Permission(menuname = "查询订单信息", value = "broadBandOrder", method = RequestMethod.POST)
public ResponseData<Page<BroadBandOrder>> getBroadBandOrder(BroadBandOrder broadBandOrder) { public ResponseData<Page<BroadBandOrder>> getBroadBandOrder(BroadBandOrder broadBandOrder) {
ShiroUser user = getShiroUser(); ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "系统管理员", "县分管理员（订单）", "修改身份证", "合伙人"))) { if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "系统管理员", "县分管理员（订单）", "修改身份证", "合伙人"))) {
return ResponseData.error("无权限查询订单"); return ResponseData.error("无权限查询订单");
...@@ -879,7 +873,7 @@ public class OrderController extends BaseController { ...@@ -879,7 +873,7 @@ public class OrderController extends BaseController {
} }
} }
public void ExportOrderView2(Map<String, Object> map) { /*public void ExportOrderView2(Map<String, Object> map) {
String createTimeStart = ""; String createTimeStart = "";
if (map.containsKey("createTimeStart")) { if (map.containsKey("createTimeStart")) {
createTimeStart = map.get("createTimeStart").toString(); createTimeStart = map.get("createTimeStart").toString();
...@@ -1104,8 +1098,8 @@ public class OrderController extends BaseController { ...@@ -1104,8 +1098,8 @@ public class OrderController extends BaseController {
} }
for (Map<String, Object> maps : Orders) { for (Map<String, Object> maps : Orders) {
/*String schoolId = schoolMapper.selectSchoolIdByUserId(maps.get("hehuoren_id").toString()); *//*String schoolId = schoolMapper.selectSchoolIdByUserId(maps.get("hehuoren_id").toString());
school = schoolMapper.selectById(schoolId);*/ school = schoolMapper.selectById(schoolId);*//*
schools.get(maps.get("hehuoren_id").toString()); schools.get(maps.get("hehuoren_id").toString());
maps.put("lz_user", school.getLzUser()); maps.put("lz_user", school.getLzUser());
maps.put("lzgh", school.getLzgh()); maps.put("lzgh", school.getLzgh());
...@@ -1151,7 +1145,7 @@ public class OrderController extends BaseController { ...@@ -1151,7 +1145,7 @@ public class OrderController extends BaseController {
} }
} }
} }
} }*/
@Permission(menuname = "一人一码统计数据", value = "getHhrOrderInfo", method = RequestMethod.POST) @Permission(menuname = "一人一码统计数据", value = "getHhrOrderInfo", method = RequestMethod.POST)
......
service-manager/src/main/java/com/winsun/controller/OrderViewController.java
...@@ -15,6 +15,10 @@ import com.winsun.constant.OrderStatus; ...@@ -15,6 +15,10 @@ import com.winsun.constant.OrderStatus;
import com.winsun.mapper.OrderMapper; import com.winsun.mapper.OrderMapper;
import com.winsun.mapper.OrderViewMapper; import com.winsun.mapper.OrderViewMapper;
import com.winsun.service.IHhrUserService; import com.winsun.service.IHhrUserService;
import com.winsun.utils.ExcelTreeNodeHelper;
import com.winsun.utils.ExportExcel;
import com.winsun.utils.TreeNode;
import com.winsun.utils.TreeNodeData;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFCell;
...@@ -45,14 +49,11 @@ import java.util.Map; ...@@ -45,14 +49,11 @@ import java.util.Map;
@RequestMapping("/orderView") @RequestMapping("/orderView")
public class OrderViewController extends BaseController { public class OrderViewController extends BaseController {
private static OrderViewMapper orderViewMapper; @Autowired
private OrderViewMapper orderViewMapper;
private static OrderMapper orderMapper;
@Autowired @Autowired
public OrderViewController(OrderViewMapper orderViewMapper) { private OrderMapper orderMapper;
OrderViewController.orderViewMapper = orderViewMapper;
}
@Autowired @Autowired
private IHhrUserService hhrUserService; private IHhrUserService hhrUserService;
...@@ -103,144 +104,28 @@ public class OrderViewController extends BaseController { ...@@ -103,144 +104,28 @@ public class OrderViewController extends BaseController {
return ResponseData.success(page, "查询成功！"); return ResponseData.success(page, "查询成功！");
} }
/*@Permission(menuname = "导出宽带订单", value = "download", method = RequestMethod.POST) @Permission(menuname = "导出宽带订单", value = "download", method = RequestMethod.POST)
public ResponseData<String> downloadOrderView(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime, public ResponseData<String> downloadOrderView2(BroadBandOrder broadBandOrder){
@RequestParam("orderseq") String orderseq, @RequestParam("orderUniversityName") String orderUniversityName,
@RequestParam("status") String status, @RequestParam("ordername") String ordername) throws ParseException {
ShiroUser user = getShiroUser(); ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "系统管理员", "县分管理员（订单）", "修改身份证", "合伙人"))) { if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "系统管理员", "县分管理员（订单）", "修改身份证", "合伙人"))) {
return ResponseData.error("无权限查询订单"); return ResponseData.error("无权限查询订单");
} }
List<Integer> userIds = hhrUserService.getUserIds(user.getId(), user.getRoleNames()); List<Integer> userIds = hhrUserService.getUserIds(user.getId(), user.getRoleNames());
if (userIds.size() != 0) {
String dateFormat = "YYYY-MM-DD"; broadBandOrder.setHehuorenIds(userIds);
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); };
if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) { List<Map<String, Object>> broadBandOrders = orderMapper.selectBroadBandOrderList2(broadBandOrder);
startTime = startTime.substring(0, dateFormat.length()) + " 00:00:00"; System.out.println(broadBandOrders.size());
endTime = endTime.substring(0, dateFormat.length()) + " 23:59:59";
} else {
startTime = null;
endTime = null;
}
String state = null;
if (StringUtils.isNotBlank(status)) {
state = OrderStatus.findById(status).getId();
}
*//*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);
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("订单编号");
tops.add("产品名称");
tops.add("产品价格");
tops.add("套餐");
tops.add("学校");
tops.add("区域");
tops.add("客户姓名");
tops.add("联系电话");
tops.add("订单状态");
tops.add("备注");
tops.add("创建时间");
tops.add("支付平台");
tops.add("支付方式");
tops.add("支付时间");
tops.add("穗易付订单号");
tops.add("接入商");
tops.add("支付平台流水号");
tops.add("智能平台订单号");
List<String> columns = new ArrayList<>();
columns.add("order_id");
columns.add("orderSeq");
columns.add("productName");
columns.add("webOrderAmount");
columns.add("order_set_meal");
columns.add("order_university_name");
columns.add("order_region");
columns.add("orderName");
columns.add("orderPhone");
columns.add("status");
columns.add("order_customer_remarks");
columns.add("orderDate");
columns.add("ipay");
columns.add("payType");
columns.add("order_payment_time");
columns.add("orderReqtranSeq");
columns.add("customeRid");
columns.add("uptranseq");
columns.add("orderSeqTHD");
ServletOutputStream os = null;
XSSFWorkbook workbook = new XSSFWorkbook();
try { try {
//创建工作表 TreeNode treeNode = TreeNodeData.getBroadbandOrder("宽带订单清单");
XSSFSheet sheet = workbook.createSheet("宽带订单清单"); XSSFWorkbook workbook = ExcelTreeNodeHelper.getWorkbook(treeNode, broadBandOrders);
//添加表头 ExportExcel.toDownLoad(workbook, getHttpServletRequest(), getHttpServletResponse(), "宽带订单清单");
final XSSFRow row = sheet.createRow(0);
//设置列宽度
sheet.setColumnWidth(1, 6500);
sheet.setColumnWidth(2, 6500);
sheet.setColumnWidth(5, 7000);
sheet.setColumnWidth(8, 4000);
sheet.setColumnWidth(10, 6500);
sheet.setColumnWidth(11, 6500);
sheet.setColumnWidth(14, 6500);
sheet.setColumnWidth(15, 7000);
sheet.setColumnWidth(17, 7500);
sheet.setColumnWidth(18, 600);
//第一行字段名称
tops.forEach(column -> {
XSSFCell cell = row.createCell(Math.max(row.getLastCellNum(), 0));
cell.setCellValue(column);
});
//数据
int rowIndex = row.getRowNum();
for (Map<String, Object> maps : OrderViews) {
final XSSFRow rowdata = sheet.createRow(++rowIndex);
for (String column : columns) {
XSSFCell cell = rowdata.createCell(Math.max(rowdata.getLastCellNum(), 0));
if (maps.get(column) != null) {
cell.setCellValue(maps.get(column).toString());
}
}
}
HttpServletResponse response = getHttpServletResponse();
response.reset();
response.setCharacterEncoding("UTF-8");
response.setContentType("application/octet-stream");
os = response.getOutputStream();
workbook.write(os);
os.flush();
} catch (Exception e) { } catch (Exception e) {
log.error("文件出错！" + e.getMessage(), e); log.error("文件出错！" + e.getMessage(), e);
} finally { return ResponseData.error("导出失败");
IOUtils.closeQuite(workbook, os);
} }
return ResponseData.success("导出成功"); return ResponseData.success("导出成功");
}*/ }
} }
service-manager/src/main/java/com/winsun/utils/TreeNodeData.java
...@@ -58,4 +58,36 @@ public class TreeNodeData { ...@@ -58,4 +58,36 @@ public class TreeNodeData {
return treeNode0; return treeNode0;
} }
/**
* 宽带订单表头
* @param actName
* @return
*/
public static TreeNode getBroadbandOrder(String actName){
TreeNode treeNode0 =new TreeNode(-1,"", null);
TreeNode treeNode =new TreeNode(0, actName, treeNode0);
TreeNode treeNode1 =new TreeNode(1, "订单id","order_id", treeNode);
TreeNode treeNode2 =new TreeNode(2, "订单编号","orderSeq", treeNode);
TreeNode treeNode3 =new TreeNode(3, "产品名称","productName", treeNode);
TreeNode treeNode4 =new TreeNode(4, "产品价格","webOrderAmount", treeNode);
TreeNode treeNode5 =new TreeNode(5, "套餐","order_set_meal", treeNode);
TreeNode treeNode6 =new TreeNode(6, "学校","order_university_name", treeNode);
TreeNode treeNode7 =new TreeNode(7, "区域","order_region", treeNode);
TreeNode treeNode8 =new TreeNode(8, "客户姓名","orderName", treeNode);
TreeNode treeNode9 =new TreeNode(9, "联系电话","orderPhone", treeNode);
TreeNode treeNode10 =new TreeNode(10, "订单状态","status", treeNode);
TreeNode treeNode11 =new TreeNode(11, "备注","order_customer_remarks", treeNode);
TreeNode treeNode12 =new TreeNode(12, "创建时间","orderDate", treeNode);
TreeNode treeNode13 =new TreeNode(13, "支付平台","ipay", treeNode);
TreeNode treeNode14 =new TreeNode(14, "支付方式","payType", treeNode);
TreeNode treeNode15 =new TreeNode(15, "支付时间","order_payment_time", treeNode);
TreeNode treeNode16 =new TreeNode(16, "穗易付订单号","orderReqtranSeq", treeNode);
TreeNode treeNode17 =new TreeNode(17, "接入商","customeRid", treeNode);
TreeNode treeNode18 =new TreeNode(18, "支付平台流水号","uptranseq", treeNode);
TreeNode treeNode19 =new TreeNode(19, "智能平台订单号","orderSeqTHD", treeNode);
treeNode0.calLeavesAmount(treeNode0);
treeNode0.calNodeLevel(treeNode0);
return treeNode0;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment