Skip to content

G
gdtel-gztel-school-center
Commit 92acbd17 by 罗承锋
Options

修改学校配置

parent 9b337b56
Showing with 561 additions and 30 deletions
common/src/main/java/com/winsun/bean/Package.java
......@@ -97,6 +97,14 @@ public class Package implements Serializable {
*/
private int isXbCard;
/**
* 创建时间
*/
private String createTime;
/**
* 创建用户
*/
private String createUser;
}
common/src/main/java/com/winsun/bean/SalesList.java
......@@ -163,6 +163,16 @@ public class SalesList {
@TableField(exist = false)
private String positionSJ;
/**
* 自定义备注
*/
private String customRemark;
/**
* 锁定状态
*/
private String lockState;
}
common/src/main/java/com/winsun/bean/School.java
......@@ -185,4 +185,22 @@ public class School implements Serializable {
*/
@TableField("ud_btn")
private String udBtn;
/**
* 手机卡办理
*/
@TableField("sjkbl")
private String sjkbl;
/**
* 套餐升级
*/
@TableField("tcsj")
private String tcsj;
/**
* 手机卡套餐升级
*/
@TableField("sjktcsj")
private String sjktcsj;
}
common/src/main/java/com/winsun/mapper/SalesListMapper.java
package com.winsun.mapper;
import java.util.List;
import java.util.Map;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import org.springframework.stereotype.Component;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.SalesList;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
@Mapper
@Component
......@@ -34,5 +28,4 @@ public interface SalesListMapper extends BaseMapper<SalesList> {
@Delete("delete from hhr_phone_school where order_phone = #{orderPhone} ")
int deletePhoneSchool(@Param("orderPhone") String orderPhone);
}
service-manager/src/main/java/com/winsun/controller/PackageController.java
......@@ -25,10 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.regex.Pattern;
/**
......@@ -152,6 +149,7 @@ public class PackageController extends BaseController {
dataMapping.put("xb_id", xbId);
dataMapping.put("warm_tip", warmTip);
dataMapping.put("explains", explains);
dataMapping.put("create_time", new Date());
Integer integer = packageMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
if (integer == 1) {
log.info("成功修改完毕套餐信息");
......
service-manager/src/main/java/com/winsun/controller/SalesListController.java
......@@ -11,6 +11,7 @@ import com.winsun.auth.core.util.IOUtils;
import com.winsun.bean.SalesList;
import com.winsun.bean.School;
import com.winsun.bean.SysUser;
import com.winsun.constant.OrderType;
import com.winsun.mapper.SalesListMapper;
import com.winsun.mapper.SchoolMapper;
import com.winsun.mapper.SysUserMapper;
......@@ -33,6 +34,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.TimeUnit;
......@@ -76,6 +78,28 @@ public class SalesListController extends BaseController{
private static String CZ_NETWORK_NAME = "所属网点";
private static String CZ_AMOUNT = "充值金额";
// 批量更新
private static String PL_SALES_SUBST = "销售县分";
private static String PL_SALES_SCHOOL = "销售学校";
private static String PL_ORDER_PHONE = "电信激活号码";
private static String PL_NAME = "销售员";
private static String PL_ACCOUNT = "销售账号";
private static String PL_CREATE_TIME = "上传时间";
private static String PL_ORDER_TYPE = "订单类型";
private static String PL_LOCK_STATE = "是否锁定";
private static String PL_AUDIT_TIME = "系统匹配时间";
private static String PL_NETWORK_CODE = "系统所属网点";
private static String PL_NETWORK_NAME = "网点名称";
private static String PL_ACTIVATE_TIME = "系统激活时间";
private static String PL_RECENTLY_AMOUNT = "最近充值金额";
private static String PL_RECENTLY_BONUS = "最近充值激励";
private static String PL_ALL_BONUS = "应发总激励";
private static String PL_SEND_BONUS = "已发激励";
private static String PL_NONSEND_BONUS = "未发激励";
private static String SD_ORDER_NUMBER = "电信激活号码";
private static String SD_LOCK_STATE = "是否锁定";
private static SalesListMapper salesListMapper;
private static SysUserMapper sysUserMapper;
private static SchoolMapper schoolMapper;
......@@ -96,6 +120,8 @@ public class SalesListController extends BaseController{
@RequestParam("status") String status,@RequestParam("orderType") String orderType,
@RequestParam("createTimeStart") String createTimeStart,@RequestParam("createTimeEnd") String createTimeEnd,
@RequestParam("activateTimeStart") String activateTimeStart,@RequestParam("activateTimeEnd") String activateTimeEnd,
@RequestParam("salesSubst") String salesSubst,@RequestParam("salesSchool") String salesSchool,
@RequestParam("preType") String preType,@RequestParam("lockState") String lockState,
@RequestParam(name = "pageNo", required = false) int pageIndex,
@RequestParam(name = "pageSize", required = false) int pageSize){
Page<SalesList> page = new Page<>(pageIndex, pageSize);
......@@ -105,6 +131,14 @@ public class SalesListController extends BaseController{
wrapperOrder.eq(StringUtils.isNotBlank(status), "status", status);
wrapperOrder.eq(StringUtils.isNotBlank(name), "name", name);
wrapperOrder.eq(StringUtils.isNotBlank(account), "account", account);
wrapperOrder.eq(StringUtils.isNotBlank(preType), "pre_type", preType);
wrapperOrder.eq(StringUtils.isNotBlank(salesSubst), "sales_subst", salesSubst);
wrapperOrder.eq(StringUtils.isNotBlank(salesSchool), "sales_school", salesSchool);
wrapperOrder.gt(StringUtils.isNotBlank(createTimeStart), "create_time", createTimeStart);
wrapperOrder.lt(StringUtils.isNotBlank(createTimeEnd), "create_time", createTimeEnd);
wrapperOrder.gt(StringUtils.isNotBlank(activateTimeStart), "activate_time", activateTimeStart);
wrapperOrder.lt(StringUtils.isNotBlank(activateTimeEnd), "activate_time", activateTimeEnd);
wrapperOrder.eq(StringUtils.isNotBlank(lockState), "lock_state", lockState);
wrapperOrder.eq("del_flag", 0);
wrapperOrder.orderBy("create_time", false);
List<SalesList> orderList = salesListMapper.selectPage(page, wrapperOrder);
......@@ -113,6 +147,20 @@ public class SalesListController extends BaseController{
return ResponseData.success(page, "查询完毕！");
}
@Permission(menuname = "自定义备注", value = "/customRemark", method = RequestMethod.POST)
public ResponseData<String> customRemark(@RequestParam("id") Integer id, @RequestParam("customRemark") String customRemark ) {
SalesList salesList = new SalesList();
salesList.setId(id);
salesList.setCustomRemark(customRemark);
Integer integer = salesListMapper.updateById(salesList);
if (integer > -1) {
return ResponseData.success("更新成功");
}else{
return ResponseData.error("更新失败！");
}
}
@Permission(menuname = "删除销售订单", value ="/deleteOrder", method = RequestMethod.POST)
public ResponseData<String> deleteOrder(@RequestParam("id") String id){
......@@ -254,9 +302,6 @@ public class SalesListController extends BaseController{
if (!listMap.get(0).get("g").toString().equals(FH_ORDER_TYPE)) {
return ResponseData.error("g列不对，请选择正确的模板！");
}
// if (listMap.get(0).size() != 7) {
// return ResponseData.error("模板不对，请选择正确的模板！");
// }
//校验数据
try {
//校验数据
......@@ -413,6 +458,7 @@ public class SalesListController extends BaseController{
order.setOrderPhone((String)map.get("orderPhone"));
order.setUserId(Integer.toString((int)map.get("userId")));
order.setCreateTime(new Date());
order.setLockState("否");
order.setSalesSubst((String)map.get("salesSubst"));
order.setSalesSchool((String)map.get("salesSchool"));
order.setOrderType((String)map.get("orderType"));
......@@ -690,6 +736,305 @@ public class SalesListController extends BaseController{
return num;
}
/**
* 审核锁定
*
* @param file 上传的数据文件
* @return
*/
@Permission(menuname = "审核锁定", value = "importAuditLock", method = RequestMethod.POST)
public ResponseData<String> importAuditLock(@RequestParam(name = "file") MultipartFile file) {
if (!StringUtils.endsWithAny(file.getOriginalFilename(), "xlsx", "xls")) {
return ResponseData.error("手工上传数据仅支持Excel文件，其他格式不支持！");
}
if ( (double)file.getSize()/1048576 > 100) {
return ResponseData.error("文件过大，无法上传");
}
ShiroUser user = getShiroUser();
// 当前是否有数据权限
boolean hasDataPermission = user.getRoleNames().stream().anyMatch(data -> StringUtils.equalsAny(data, "活动上单员", "数据管理员", "超级管理员"));
if (!hasDataPermission) {
return ResponseData.error("无数据权限！");
}
ImportExcel importExcel = null;
try {
importExcel = new ImportExcel(file, HEADER_NUM, SHEET_INDEX);
} catch (Exception e) {
log.error("审核锁定导入异常", e.getMessage());
return ResponseData.error("导入异常！");
}
List<Map<String, Object>> listMap = importExcel.getDataListMap();
if (listMap.size() == 1) {
return ResponseData.error("文件不能为空");
}
if (!listMap.get(0).get("a").toString().equals(SD_ORDER_NUMBER)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
if (!listMap.get(0).get("b").toString().equals(SD_LOCK_STATE)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
//校验数据
try {
//校验数据
for (int i = 1; i < listMap.size(); i++) {
Map<String, Object> temp = listMap.get(i);
if (StringUtils.isBlank(temp.get("a").toString())) {
return ResponseData.error("第" + (i + 1) + "行的电信激活号码不能为空");
}
if (StringUtils.isBlank(temp.get("b").toString())) {
return ResponseData.error("第" + (i + 1) + "行的是否锁定不能为空");
}
}
} catch (Exception e) {
log.error("审核锁定导入异常" + e.getMessage(), e);
return ResponseData.error("导入异常！");
}
// 去掉首行标题
listMap.remove(0);
int count = updateLockState(listMap);
return ResponseData.success("修改完成，修改"+ count +"条订单！");
}
// 更新锁定状态
public Integer updateLockState(List<Map<String, Object>> listMap) {
Wrapper<SalesList> wrapper = null;
Integer count = 0;
List<String> lock = new ArrayList<>();
List<String> unlock = new ArrayList<>();
for(Map<String, Object> map : listMap) {
if ("是".equals(map.get("b"))) {
lock.add(map.get("a").toString());
}else if ("否".equals(map.get("b"))){
unlock.add(map.get("a").toString());
}
}
if (lock.size() != 0) {
wrapper = new EntityWrapper<>();
wrapper.in("order_phone", lock.toArray());
SalesList salesList = new SalesList();
salesList.setLockState("是");
count += salesListMapper.update(salesList, wrapper);
}
if (unlock.size() != 0) {
wrapper = new EntityWrapper<>();
wrapper.in("order_phone", unlock.toArray());
SalesList salesList = new SalesList();
salesList.setLockState("否");
count += salesListMapper.update(salesList, wrapper);
}
return count;
}
/**
* 批量更新
*
* @param file 上传的数据文件
* @return
*/
@Permission(menuname = "批量更新", value = "importBatchUpdate", method = RequestMethod.POST)
public ResponseData<String> importBatchUpdate(@RequestParam(name = "file") MultipartFile file) {
if (!StringUtils.endsWithAny(file.getOriginalFilename(), "xlsx", "xls")) {
return ResponseData.error("手工上传数据仅支持Excel文件，其他格式不支持！");
}
if ( (double)file.getSize()/1048576 > 100) {
return ResponseData.error("文件过大，无法上传");
}
ShiroUser user = getShiroUser();
// 当前是否有数据权限
boolean hasDataPermission = user.getRoleNames().stream().anyMatch(data -> StringUtils.equalsAny(data, "活动上单员", "数据管理员", "超级管理员"));
if (!hasDataPermission) {
return ResponseData.error("无数据权限！");
}
ImportExcel importExcel = null;
try {
importExcel = new ImportExcel(file, HEADER_NUM, SHEET_INDEX);
} catch (Exception e) {
log.error("批量修改导入异常", e.getMessage());
return ResponseData.error("导入异常！");
}
List<Map<String, Object>> listMap = importExcel.getDataListMap();
if (listMap.size() == 1) {
return ResponseData.error("文件不能为空");
}
if (!listMap.get(0).get("a").toString().equals(PL_SALES_SUBST)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
if (!listMap.get(0).get("b").toString().equals(PL_SALES_SCHOOL)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
if (!listMap.get(0).get("c").toString().equals(PL_ORDER_PHONE)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
if (!listMap.get(0).get("d").toString().equals(PL_NAME)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
if (!listMap.get(0).get("e").toString().equals(PL_ACCOUNT)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
if (!listMap.get(0).get("f").toString().equals(PL_CREATE_TIME)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
if (!listMap.get(0).get("g").toString().equals(PL_ORDER_TYPE)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
if (!listMap.get(0).get("h").toString().equals(PL_LOCK_STATE)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
if (!listMap.get(0).get("i").toString().equals(PL_AUDIT_TIME)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
if (!listMap.get(0).get("j").toString().equals(PL_NETWORK_CODE)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
if (!listMap.get(0).get("k").toString().equals(PL_NETWORK_NAME)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
if (!listMap.get(0).get("l").toString().equals(PL_ACTIVATE_TIME)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
if (!listMap.get(0).get("m").toString().equals(PL_RECENTLY_AMOUNT)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
if (!listMap.get(0).get("n").toString().equals(PL_RECENTLY_BONUS)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
if (!listMap.get(0).get("o").toString().equals(PL_ALL_BONUS)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
if (!listMap.get(0).get("p").toString().equals(PL_SEND_BONUS)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
if (!listMap.get(0).get("q").toString().equals(PL_NONSEND_BONUS)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
//校验数据
try {
//校验数据
for (int i = 1; i < listMap.size(); i++) {
Map<String, Object> temp = listMap.get(i);
if (!temp.containsKey("a")) {
return ResponseData.error("第" + (i + 1) + "行的销售县分不能为空");
}
if (StringUtils.isBlank(temp.get("b").toString())) {
return ResponseData.error("第" + (i + 1) + "行的销售学校不能为空");
}
if (StringUtils.isBlank(temp.get("c").toString())) {
return ResponseData.error("第" + (i + 1) + "行的电信激活号码不能为空");
}
if (StringUtils.isBlank(temp.get("d").toString())) {
return ResponseData.error("第" + (i + 1) + "行的销售员不能为空");
}
if (StringUtils.isBlank(temp.get("e").toString())) {
return ResponseData.error("第" + (i + 1) + "行的销售账号不能为空");
}
if (StringUtils.isBlank(temp.get("f").toString())) {
return ResponseData.error("第" + (i + 1) + "行的上传时间不能为空");
}
if (StringUtils.isBlank(temp.get("g").toString())) {
return ResponseData.error("第" + (i + 1) + "行的订单类型不能为空");
}
}
} catch (Exception e) {
log.error("批量修改导入异常" + e.getMessage(), e);
return ResponseData.error("导入异常！");
}
// 去掉首行标题
listMap.remove(0);
int count = 0;
try {
count = batchUpdateData(listMap);
}catch (ParseException p) {
return ResponseData.error("修改失败，日期格式转换失败，请确认正确的日期格式！");
}
return ResponseData.success("修改完成，修改"+ count +"条订单！");
}
/**
* 处理批量导入数据(每条要更新的数据都不一样，只能一条条修改)
* @param list
* @return
*/
public Integer batchUpdateData(List<Map<String, Object>> list) throws ParseException {
// 转换对象
List<SalesList> salesLists = mapToObejct(list);
int updateCount = 0;
Wrapper<SalesList> wrapper = null;
for(SalesList salesList : salesLists) {
wrapper = new EntityWrapper<>();
wrapper.eq("order_phone", salesList.getOrderPhone());
Integer update = salesListMapper.update(salesList, wrapper);
updateCount += update;
}
return updateCount;
}
// 订单数据对象转换
public List<SalesList> mapToObejct(List<Map<String, Object>> listMap) throws ParseException {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
List<SalesList> list = new ArrayList<>();
SalesList salesList = null;
for(Map<String, Object> map : listMap) {
salesList = new SalesList();
salesList.setSalesSubst(map.get("a").toString());
salesList.setSalesSchool(map.get("b").toString());
salesList.setOrderPhone(map.get("c").toString());
salesList.setName(map.get("d").toString());
salesList.setAccount(map.get("e").toString());
if (map.get("f") != null) {
salesList.setCreateTime(simpleDateFormat.parse(map.get("f").toString()));
}
if (map.get("g") != null) {
salesList.setOrderType(OrderType.getCodeByName(map.get("g").toString()));
}
if (map.get("h") != null) {
salesList.setLockState(map.get("h").toString());
}
if (map.get("i") != null) {
salesList.setAuditTime(simpleDateFormat.parse(map.get("i").toString()));
}
if (map.get("j") != null) {
salesList.setNetworkCode(map.get("j").toString());
}
if (map.get("k") != null) {
salesList.setNetworkName(map.get("k").toString());
}
if (map.get("l") != null) {
salesList.setActivateTime(simpleDateFormat.parse(map.get("l").toString()));
}
if (map.get("m") != null) {
salesList.setRecentlyAmount(Double.parseDouble(map.get("m").toString()));
}
if (map.get("n") != null) {
salesList.setRecentlyBonus(Double.parseDouble(map.get("n").toString()));
}
if (map.get("o") != null) {
salesList.setAllBonus(Double.parseDouble(map.get("o").toString()));
}
if (map.get("p") != null) {
salesList.setSendBonus(Double.parseDouble(map.get("p").toString()));
}
if (map.get("q") != null) {
salesList.setNonSendBonus(Double.parseDouble(map.get("q").toString()));
}
list.add(salesList);
}
return list;
}
@Permission(menuname = "放号上传模板", method = RequestMethod.POST, value = "downloadTemplateFH")
public ResponseData<String> downloadTemplateFH() {
ArrayList<String> columns = new ArrayList<>();
......@@ -779,6 +1124,114 @@ public class SalesListController extends BaseController{
return ResponseData.error("充值审核清单模板出错");
}
@Permission(menuname = "批量修改模板下载", method = RequestMethod.POST, value = "downloadTemplatePL")
public ResponseData<String> downloadTemplatePL() {
ArrayList<String> columns = new ArrayList<>();
columns.add("销售县分");
columns.add("销售学校");
columns.add("电信激活号码");
columns.add("销售员");
columns.add("销售账号");
columns.add("上传时间");
columns.add("订单类型");
columns.add("是否锁定");
columns.add("系统匹配时间");
columns.add("系统所属网点");
columns.add("网点名称");
columns.add("系统激活时间");
columns.add("最近充值金额");
columns.add("最近充值激励");
columns.add("应发总激励");
columns.add("已发激励");
columns.add("未发激励");
columns.add("销售员学校");
columns.add("销售员县分");
ServletOutputStream os = null;
XSSFWorkbook workbook = new XSSFWorkbook();
try {
//创建工作表
XSSFSheet sheet = workbook.createSheet("批量修改清单");
sheet.setColumnWidth(1, 6500);
sheet.setColumnWidth(2, 6500);
sheet.setColumnWidth(3, 4500);
sheet.setColumnWidth(4, 3500);
sheet.setColumnWidth(5, 7000);
sheet.setColumnWidth(6, 4000);
sheet.setColumnWidth(7, 4500);
sheet.setColumnWidth(8, 6500);
sheet.setColumnWidth(9, 6500);
sheet.setColumnWidth(10, 7000);
sheet.setColumnWidth(11, 4000);
sheet.setColumnWidth(12, 4500);
sheet.setColumnWidth(13, 4500);
sheet.setColumnWidth(14, 2000);
sheet.setColumnWidth(15, 2000);
sheet.setColumnWidth(16, 2000);
sheet.setColumnWidth(17, 2000);
sheet.setColumnWidth(18, 6500);
sheet.setColumnWidth(19, 6500);
//添加表头
final XSSFRow row = sheet.createRow(0);
XSSFCellStyle cellStyle = workbook.createCellStyle();
cellStyle.setAlignment(HorizontalAlignment.CENTER);
columns.forEach(val -> {
XSSFCell cell = row.createCell(Math.max(row.getLastCellNum(), 0));
cell.setCellValue(val);
});
HttpServletResponse response = getHttpServletResponse();
response.reset();
response.setCharacterEncoding("UTF-8");
response.setContentType("application/vnd.ms-excel");
response.setHeader("Content-Disposition", "attachment;fileName=data.xlsx");
os = response.getOutputStream();
workbook.write(os);
os.flush();
} catch (IOException e) {
log.error("批量修改模板文件出错！" + e.getMessage(), e);
} finally {
IOUtils.closeQuite(workbook, os);
}
return ResponseData.error("批量修改清单模板出错");
}
@Permission(menuname = "审核锁定模板", method = RequestMethod.POST, value = "downloadTemplateSD")
public ResponseData<String> downloadTemplateSD() {
ArrayList<String> columns = new ArrayList<>();
columns.add(SD_ORDER_NUMBER);
columns.add(SD_LOCK_STATE);
ServletOutputStream os = null;
XSSFWorkbook workbook = new XSSFWorkbook();
try {
//创建工作表
XSSFSheet sheet = workbook.createSheet("审核锁定清单");
sheet.setColumnWidth(0, 5000);
sheet.setColumnWidth(2, 4000);
//添加表头
final XSSFRow row = sheet.createRow(0);
XSSFCellStyle cellStyle = workbook.createCellStyle();
cellStyle.setAlignment(HorizontalAlignment.CENTER);
columns.forEach(val -> {
XSSFCell cell = row.createCell(Math.max(row.getLastCellNum(), 0));
cell.setCellValue(val);
});
HttpServletResponse response = getHttpServletResponse();
response.reset();
response.setCharacterEncoding("UTF-8");
response.setContentType("application/vnd.ms-excel");
response.setHeader("Content-Disposition", "attachment;fileName=data.xlsx");
os = response.getOutputStream();
workbook.write(os);
os.flush();
} catch (IOException e) {
log.error("审核锁定清单模板文件出错！" + e.getMessage(), e);
} finally {
IOUtils.closeQuite(workbook, os);
}
return ResponseData.error("审核锁定清单模板出错");
}
@Permission(menuname = "导出导入结果", value = "exportResult", method = RequestMethod.POST)
public void exportResult(String key) {
......@@ -865,24 +1318,47 @@ public class SalesListController extends BaseController{
@RequestParam("name") String name,@RequestParam("account") String account,
@RequestParam("status") String status,@RequestParam("orderType") String orderType,
@RequestParam("createTimeStart") String createTimeStart,@RequestParam("createTimeEnd") String createTimeEnd,
@RequestParam("activateTimeStart") String activateTimeStart,@RequestParam("activateTimeEnd") String activateTimeEnd
@RequestParam("activateTimeStart") String activateTimeStart,@RequestParam("activateTimeEnd") String activateTimeEnd,
@RequestParam("salesSubst") String salesSubst,@RequestParam("salesSchool") String salesSchool,
@RequestParam("preType") String preType
) throws IOException {
Wrapper<SalesList> wrapperOrder = new EntityWrapper<SalesList>();
Wrapper<SalesList> wrapperOrder = new EntityWrapper<>();
wrapperOrder.eq(StringUtils.isNotBlank(orderPhone), "order_phone", orderPhone);
wrapperOrder.eq(StringUtils.isNotBlank(orderType), "order_type", orderType);
wrapperOrder.eq(StringUtils.isNotBlank(status), "status", status);
wrapperOrder.eq(StringUtils.isNotBlank(name), "name", name);
wrapperOrder.eq(StringUtils.isNotBlank(account), "account", account);
wrapperOrder.eq(StringUtils.isNotBlank(preType), "pre_type", preType);
wrapperOrder.eq(StringUtils.isNotBlank(salesSubst), "sales_subst", salesSubst);
wrapperOrder.eq(StringUtils.isNotBlank(salesSchool), "sales_school", salesSchool);
wrapperOrder.gt(StringUtils.isNotBlank(createTimeStart), "create_time", createTimeStart);
wrapperOrder.lt(StringUtils.isNotBlank(createTimeEnd), "create_time", createTimeEnd);
wrapperOrder.gt(StringUtils.isNotBlank(activateTimeStart), "activate_time", activateTimeStart);
wrapperOrder.lt(StringUtils.isNotBlank(activateTimeEnd), "activate_time", activateTimeEnd);
wrapperOrder.eq("del_flag", 0);
wrapperOrder.orderBy("create_time", false);
List<Map<String, Object>> orderList = salesListMapper.selectMaps(wrapperOrder);
List<String> tops = new ArrayList<>();
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("最近充值金额");
tops.add("最近充值激励");
tops.add("应发总激励");
tops.add("已发激励");
tops.add("未发激励");
List<String> columns = new ArrayList<>();
columns.add("salesSubst");
columns.add("salesSchool");
......@@ -890,6 +1366,18 @@ public class SalesListController extends BaseController{
columns.add("name");
columns.add("account");
columns.add("createTime");
columns.add("orderType");
columns.add("lockState");
columns.add("auditTime");
columns.add("networkCode");
columns.add("networkName");
columns.add("activateTime");
columns.add("recentlyAmount");
columns.add("recentlyBonus");
columns.add("allBonus");
columns.add("sendBonus");
columns.add("nonSendBonus");
ServletOutputStream os = null;
XSSFWorkbook workbook = new XSSFWorkbook();
try {
......@@ -900,10 +1388,21 @@ public class SalesListController extends BaseController{
//设置列宽度
sheet.setColumnWidth(1, 6500);
sheet.setColumnWidth(2, 6500);
sheet.setColumnWidth(3, 6500);
sheet.setColumnWidth(4, 6500);
sheet.setColumnWidth(3, 4500);
sheet.setColumnWidth(4, 3500);
sheet.setColumnWidth(5, 7000);
sheet.setColumnWidth(6, 4000);
sheet.setColumnWidth(7, 4500);
sheet.setColumnWidth(8, 6500);
sheet.setColumnWidth(9, 6500);
sheet.setColumnWidth(10, 7000);
sheet.setColumnWidth(11, 4000);
sheet.setColumnWidth(12, 4500);
sheet.setColumnWidth(13, 4500);
sheet.setColumnWidth(14, 2000);
sheet.setColumnWidth(15, 2000);
sheet.setColumnWidth(16, 2000);
sheet.setColumnWidth(17, 2000);
//第一行字段名称
tops.forEach(column -> {
XSSFCell cell = row.createCell(Math.max(row.getLastCellNum(), 0));
......@@ -916,10 +1415,15 @@ public class SalesListController extends BaseController{
for (String column : columns) {
XSSFCell cell = rowdata.createCell(Math.max(rowdata.getLastCellNum(), 0));
if (maps.get(column) != null) {
if ("orderType".equals(column)) {
cell.setCellValue(OrderType.getNameByCode(maps.get(column).toString()));
}else{
// 订单类型数据替换
cell.setCellValue(maps.get(column).toString());
}
}
}
}
HttpServletResponse response = getHttpServletResponse();
response.reset();
......@@ -936,5 +1440,4 @@ public class SalesListController extends BaseController{
}
}
service-manager/src/main/java/com/winsun/controller/SchoolManagementController.java
......@@ -198,6 +198,7 @@ public class SchoolManagementController extends BaseController {
List<Map<String, Object>> selectMaps = schoolMapper.selectMaps(wrapperSubName);
EntityWrapper<Package> packagewrapper = new EntityWrapper<>();
packagewrapper.setSqlSelect("id,package_name as packageName");
packagewrapper.orderBy(true, "create_time", false);
List<Map<String, Object>> packageselectMaps = packageMapper.selectMaps(packagewrapper);
//查询单宽学校名称
Wrapper<Product> productwrapper = new EntityWrapper();
......
service-manager/src/main/resources/com/winsun/mapper/mapping/UniversityInfoMapper.xml
......@@ -12,7 +12,7 @@
(
select
bandproduct_id,
concat(school_name, '：', case kdsl when 1 then '已显示' when 0 then '未显示' else '未设置' end) kdsl,
concat(school_name, '：', case is_showband when 1 then '已显示' when 0 then '未显示' else '未设置' end) kdsl,
concat(school_name, '：', case kdy_btn when 1 then '已显示' when 0 then '未显示' else '未设置' end) kdy_btn
from hhr_school where bandproduct_id != '') hs
on pm.product_id = hs.bandproduct_id
......
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