Skip to content

G
gdtel-gztel-school-center
Commit 7c0e6fb9 by 陈浩建
Options

存量订单导出字段修改

parent c815d560
Showing with 61 additions and 20 deletions
apply-net/src/main/java/com/winsun/controller/RongHeController.java
......@@ -221,7 +221,7 @@ public class RongHeController {
}
}else {
index = Integer.parseInt(setMealIndex);
mealStr = mealArry[index];
// mealStr = mealArry[index];
byStr = rateArry[index];
prices = priceArry[index] + "元";
}
......
common/src/main/java/com/winsun/constant/UserType.java
......@@ -11,13 +11,17 @@ import java.util.Map;
*/
public enum UserType {
//1：老客户；0新客户;2:老客户续约3：融合 4：抽奖；5：单宽；6：羊城通卡
OLDCUSTOMER("1", "老客户"),
NEWCUSTOMER("0", "新客户"),
NEWCUSTOMER("0", "新客户办理"),
OLDCUSTOMER("1", "老客户办理"),
OLDCUSTOMERRENEW ("2", "老客户续约"),
RH("3", "融合"),
RH("3", "融合办理"),
LUCKYDRAW("4", "抽奖"),
DY("5", "单宽"),
YCTK("6", "羊城通卡");
DY("5", "单宽业务"),
YCTK("6", "羊城通业务"),
TYY("7", "天翼云"),
YZF("8", "翼支付"),
BYSTH("9", "毕业生融合"),
DKJR("10", "单宽进融");
UserType(String id, String name) {
this.id = id;
this.name = name;
......
service-manager/src/main/java/com/winsun/controller/NewUserController.java
......@@ -284,8 +284,6 @@ public class NewUserController extends BaseController {
schoolWrapper.eq(StringUtils.isNotBlank(substName),"sub_name",substName);
schoolWrapper.groupBy("school_name");
List<School> list = schoolMapper.selectList(schoolWrapper);
return ResponseData.success(list);
}
}
service-manager/src/main/java/com/winsun/controller/OrderController.java
......@@ -16,6 +16,7 @@ import com.winsun.auth.core.util.IOUtils;
import com.winsun.bean.Package;
import com.winsun.bean.*;
import com.winsun.constant.FilePath;
import com.winsun.constant.UserType;
import com.winsun.mapper.*;
import com.winsun.rabbitmq.RabbitProducer;
import com.winsun.service.IHhrUserService;
......@@ -854,11 +855,15 @@ public class OrderController extends BaseController {
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("customer_name");
columns.add("order_number");
......@@ -870,11 +875,15 @@ public class OrderController extends BaseController {
columns.add("hehuoren_phone");
columns.add("now_package");
columns.add("business_package");
columns.add("create_time");
columns.add("accept_date");
columns.add("lz_user");
columns.add("lzgh");
columns.add("order_status");
columns.add("user_type");
columns.add("site");
columns.add("address");
columns.add("student_card_checkStatus");
// columns.add("site");
// columns.add("address");
// columns.add("student_card_checkStatus");
ServletOutputStream os = null;
XSSFWorkbook workbook = new XSSFWorkbook();
try {
......@@ -899,14 +908,22 @@ public class OrderController extends BaseController {
sheet.setColumnWidth(13, 6500);
sheet.setColumnWidth(14, 6500);
sheet.setColumnWidth(15, 6500);
sheet.setColumnWidth(16, 6500);
//第一行字段名称
tops.forEach(column -> {
XSSFCell cell = row.createCell(Math.max(row.getLastCellNum(), 0));
cell.setCellValue(column);
});
//数据
School school = new School();
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 userTypeSrt = UserType.findById(maps.get("user_type").toString()).getName();
maps.put("user_type",userTypeSrt);
final XSSFRow rowdata = sheet.createRow(++rowIndex);
for (String column : columns) {
XSSFCell cell = rowdata.createCell(Math.max(rowdata.getLastCellNum(), 0));
......
task/src/main/java/com/winsun/service/ExportService.java
......@@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
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.constant.FilePath;
import com.winsun.constant.UserType;
import com.winsun.mapper.ExportExcelMapper;
import com.winsun.mapper.OrderMapper;
import com.winsun.mapper.SchoolMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.xssf.usermodel.XSSFCell;
......@@ -36,6 +39,9 @@ public class ExportService extends BaseController {
private OrderMapper orderMapper;
@Autowired
private SchoolMapper schoolMapper;
private ExportExcelMapper exportExcelMapper;
@Autowired
......@@ -138,11 +144,15 @@ public class ExportService extends BaseController {
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("customer_name");
columns.add("order_number");
......@@ -154,11 +164,15 @@ public class ExportService extends BaseController {
columns.add("hehuoren_phone");
columns.add("now_package");
columns.add("business_package");
columns.add("create_time");
columns.add("accept_date");
columns.add("lz_user");
columns.add("lzgh");
columns.add("order_status");
columns.add("user_type");
columns.add("site");
columns.add("address");
columns.add("student_card_checkStatus");
// columns.add("site");
// columns.add("address");
// columns.add("student_card_checkStatus");
SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
String formatPath = format.format(new Date());
String filePath = FilePath.IMPORTPATH.getValue()+formatPath;
......@@ -193,14 +207,22 @@ public class ExportService extends BaseController {
sheet.setColumnWidth(13, 6500);
sheet.setColumnWidth(14, 6500);
sheet.setColumnWidth(15, 6500);
sheet.setColumnWidth(16, 6500);
//第一行字段名称
tops.forEach(column -> {
XSSFCell cell = row.createCell(Math.max(row.getLastCellNum(), 0));
cell.setCellValue(column);
});
//数据
School school = new School();
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 userTypeSrt = UserType.findById(maps.get("user_type").toString()).getName();
maps.put("user_type",userTypeSrt);
final XSSFRow rowdata = sheet.createRow(++rowIndex);
for (String column : columns) {
XSSFCell cell = rowdata.createCell(Math.max(rowdata.getLastCellNum(), 0));
......
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