Skip to content

G
gdtel-gztel-school-center
Commit 52a7acf2 by 陈浩建
Options

院校管理调整

parent 607fae57
Showing with 116 additions and 73 deletions
common/src/main/java/com/winsun/mapper/ProductMapper.java
...@@ -26,4 +26,6 @@ public interface ProductMapper extends BaseMapper<Product> { ...@@ -26,4 +26,6 @@ public interface ProductMapper extends BaseMapper<Product> {
" WHERE u.`id`= #{id}") " WHERE u.`id`= #{id}")
List<Map<String,Object>> queryProductById(@Param("id")String id); List<Map<String,Object>> queryProductById(@Param("id")String id);
Map<String,Object> queryProductByIdMap(@Param("productId")String productId);
List<Map<String,Object>> queryProductMaps(@Param("productUniversity")String productUniversity);
} }
common/src/main/resources/com/winsun/mapper/mapping/ProductMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.winsun.mapper.ProductMapper">
<select id="queryProductByIdMap" resultType="HashMap" parameterType="String">
SELECT product_id as productId,product_university as productUniversity FROM product_manage a
where a.product_state = 0
and a.product_id = #{productId};
</select>
<select id="queryProductMaps" resultType="HashMap" parameterType="String">
SELECT product_id as productId,product_university as productUniversity FROM product_manage a
where a.product_state = 0
and a.product_university = #{productUniversity};
</select>
</mapper>
common/src/main/resources/com/winsun/mapper/mapping/SchoolMapper.xml
...@@ -9,29 +9,34 @@ ...@@ -9,29 +9,34 @@
<insert id="insertSchoolMap"> <insert id="insertSchoolMap">
INSERT INTO hhr_school INSERT INTO hhr_school
(sub_name,school_name,status,lz_user,lzgh,network_code,network_name,app_id,app_key) (sub_name,school_name,status,bandproduct_id,net_id,lzgh,lz_user,network_code,network_name,app_id,app_key)
VALUES (#{a},#{b},0,#{c},#{d},#{e},#{f},#{g},#{h}) VALUES (#{a},#{b},0,#{c},#{d},#{e},#{f},#{g},#{h},#{i},#{j})
</insert> </insert>
<update id="updateSchoolMap"> <update id="updateSchoolMap">
update hhr_school set update hhr_school set
<if test="c != null and c != ''"> <if test="c != null and c != ''">
lz_user = #{c}, bandproduct_id = #{c},
</if> </if>
<if test="d != null and d != ''"> <if test="d != null and d != ''">
lzgh = #{d}, net_id = #{d},
</if> </if>
<if test="e != null and e != ''"> <if test="e != null and e != ''">
network_code = #{e}, lzgh = #{e},
</if> </if>
<if test="f != null and f != ''"> <if test="f != null and f != ''">
network_name = #{f}, lz_user = #{f},
</if> </if>
<if test="g != null and g != ''"> <if test="g != null and g != ''">
app_id = #{g}, network_code = #{g},
</if> </if>
<if test="h != null and h != ''"> <if test="h != null and h != ''">
app_key = #{h}, network_name = #{h},
</if>
<if test="i != null and i != ''">
app_id = #{i},
</if>
<if test="j != null and j != ''">
app_key = #{j},
</if> </if>
sub_name = #{a},school_name = #{b} sub_name = #{a},school_name = #{b}
where where
...@@ -45,4 +50,4 @@ ...@@ -45,4 +50,4 @@
INSERT INTO hhr_network_info (area_name,school_name,network_code,network_name) INSERT INTO hhr_network_info (area_name,school_name,network_code,network_name)
VALUES (#{a},#{b},#{e},#{f}) VALUES (#{a},#{b},#{e},#{f})
</insert> </insert>
</mapper> </mapper>
\ No newline at end of file
service-manager/src/main/java/com/winsun/controller/SchoolManagementController.java
...@@ -56,18 +56,16 @@ public class SchoolManagementController extends BaseController { ...@@ -56,18 +56,16 @@ public class SchoolManagementController extends BaseController {
private static final int HEADER_NUM = -1; private static final int HEADER_NUM = -1;
private static final int SHEET_INDEX = 0; private static final int SHEET_INDEX = 0;
/** private static String SL_SUB_NAME = "县分（必填）";
* 受理单模板列名 private static String SL_SCHOOL = "学校名称（必填）";
* 校园名称（必填） 所属县分（必填） 揽装人 揽装工号 网点编码 网点名称 终端编码 终端密匙 private static String SL_productUniversity = "单宽学校名称";
*/ private static String SL_NetId = "网点id(合伙人id)";
private static String SL_SUB_NAME = "所属县分（必填）"; private static String SL_LZGH = "揽装工号（宽带）";
private static String SL_SCHOOL = "校园名称（必填）"; private static String SL_LZ_USER = "揽装人（宽带）";
private static String SL_LZ_USER = "揽装人";
private static String SL_LZGH = "揽装工号";
private static String SL_NET_CODE = "网点编码"; private static String SL_NET_CODE = "网点编码";
private static String SL_NET_NAME = "网点名称"; private static String SL_NET_NAME = "网点名称";
private static String SL_APP_ID = "终端编码"; private static String SL_APP_ID = "随身厅终端编码";
private static String SL_APP_KEY = "终端密匙"; private static String SL_APP_KEY = "随身厅终端密匙";
private static SchoolMapper schoolMapper; private static SchoolMapper schoolMapper;
...@@ -214,7 +212,7 @@ public class SchoolManagementController extends BaseController { ...@@ -214,7 +212,7 @@ public class SchoolManagementController extends BaseController {
wrapper.eq(StringUtils.isNotBlank(status), "status", status); wrapper.eq(StringUtils.isNotBlank(status), "status", status);
Page<Map<String,Object>> page = new Page<>(pageIndex, pageSize); Page<Map<String,Object>> page = new Page<>(pageIndex, pageSize);
List<Map<String, Object>> maps = schoolMapper.selectMapsPage(page, wrapper); List<Map<String, Object>> maps = schoolMapper.selectMapsPage(page, wrapper);
//查询县分列表 //查询县分列表
Wrapper<School> wrapperSubName = new EntityWrapper(); Wrapper<School> wrapperSubName = new EntityWrapper();
wrapperSubName.setSqlSelect("sub_name as subNameList").groupBy("sub_name"); wrapperSubName.setSqlSelect("sub_name as subNameList").groupBy("sub_name");
...@@ -248,7 +246,7 @@ public class SchoolManagementController extends BaseController { ...@@ -248,7 +246,7 @@ public class SchoolManagementController extends BaseController {
schoolPackages.forEach(val->{ schoolPackages.forEach(val->{
arrayList.add(val.getPackageId()); arrayList.add(val.getPackageId());
}); });
hashMap.put("choosepages",arrayList); hashMap.put("choosepages",arrayList);
return ResponseData.success(hashMap, "查询完毕！"); return ResponseData.success(hashMap, "查询完毕！");
} }
...@@ -313,7 +311,7 @@ public class SchoolManagementController extends BaseController { ...@@ -313,7 +311,7 @@ public class SchoolManagementController extends BaseController {
return ResponseData.success(substNameList, "查询完毕！"); return ResponseData.success(substNameList, "查询完毕！");
} }
@RequestMapping(name = "获取学校下拉列表", value = "schoolList", method = RequestMethod.POST) @RequestMapping(name = "获取学校下拉列表", value = "schoolList", method = RequestMethod.POST)
public ResponseData<List<Map<String, Object>>> schoolList(@RequestParam("substName") String substName) { public ResponseData<List<Map<String, Object>>> schoolList(@RequestParam("substName") String substName) {
// ShiroUser user = getShiroUser(); // ShiroUser user = getShiroUser();
...@@ -368,22 +366,28 @@ public class SchoolManagementController extends BaseController { ...@@ -368,22 +366,28 @@ public class SchoolManagementController extends BaseController {
if (!listMap.get(0).get("b").toString().equals(SL_SCHOOL)) { if (!listMap.get(0).get("b").toString().equals(SL_SCHOOL)) {
return ResponseData.error("模板不对，请选择正确的模板！"); return ResponseData.error("模板不对，请选择正确的模板！");
} }
if (!listMap.get(0).get("c").toString().equals(SL_LZ_USER)) { if (!listMap.get(0).get("c").toString().equals(SL_productUniversity)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
if (!listMap.get(0).get("d").toString().equals(SL_NetId)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
if (!listMap.get(0).get("e").toString().equals(SL_LZGH)) {
return ResponseData.error("模板不对，请选择正确的模板！"); return ResponseData.error("模板不对，请选择正确的模板！");
} }
if (!listMap.get(0).get("d").toString().equals(SL_LZGH)) { if (!listMap.get(0).get("f").toString().equals(SL_LZ_USER)) {
return ResponseData.error("模板不对，请选择正确的模板！"); return ResponseData.error("模板不对，请选择正确的模板！");
} }
if (!listMap.get(0).get("e").toString().equals(SL_NET_CODE)) { if (!listMap.get(0).get("g").toString().equals(SL_NET_CODE)) {
return ResponseData.error("模板不对，请选择正确的模板！"); return ResponseData.error("模板不对，请选择正确的模板！");
} }
if (!listMap.get(0).get("f").toString().equals(SL_NET_NAME)) { if (!listMap.get(0).get("h").toString().equals(SL_NET_NAME)) {
return ResponseData.error("模板不对，请选择正确的模板！"); return ResponseData.error("模板不对，请选择正确的模板！");
} }
if (!listMap.get(0).get("g").toString().equals(SL_APP_ID)) { if (!listMap.get(0).get("i").toString().equals(SL_APP_ID)) {
return ResponseData.error("模板不对，请选择正确的模板！"); return ResponseData.error("模板不对，请选择正确的模板！");
} }
if (!listMap.get(0).get("h").toString().equals(SL_APP_KEY)) { if (!listMap.get(0).get("j").toString().equals(SL_APP_KEY)) {
return ResponseData.error("模板不对，请选择正确的模板！"); return ResponseData.error("模板不对，请选择正确的模板！");
} }
if (listMap.get(0).size() != 8) { if (listMap.get(0).size() != 8) {
...@@ -424,6 +428,12 @@ public class SchoolManagementController extends BaseController { ...@@ -424,6 +428,12 @@ public class SchoolManagementController extends BaseController {
if (!temp.containsKey("h")) { if (!temp.containsKey("h")) {
listMap.get(i).put("h",""); listMap.get(i).put("h","");
} }
if (!temp.containsKey("i")) {
listMap.get(i).put("i","");
}
if (!temp.containsKey("j")) {
listMap.get(i).put("j","");
}
} }
//检查excel表中是否有重复人员编号 //检查excel表中是否有重复人员编号
int size = listMap.size(); int size = listMap.size();
...@@ -440,22 +450,18 @@ public class SchoolManagementController extends BaseController { ...@@ -440,22 +450,18 @@ public class SchoolManagementController extends BaseController {
return ResponseData.error("导入异常！"); return ResponseData.error("导入异常！");
} }
int number = 0; int number = 0;
Date acceptDate = new Date();
Date successTime = acceptDate;
StringBuffer subName = new StringBuffer();
StringBuffer schoolName = new StringBuffer();
Integer integer = 0; Integer integer = 0;
Map<String,Object> schoolMap = new HashMap<>(); Map<String,Object> schoolMap = new HashMap<>();
Map<String,Object> productmap = new HashMap<>();
for (int i = 1; i < listMap.size(); i++) { for (int i = 1; i < listMap.size(); i++) {
Map<String, Object> map = listMap.get(i); Map<String, Object> map = listMap.get(i);
subName = new StringBuffer(map.get("a").toString());
schoolName = new StringBuffer(map.get("b").toString());
integer = 0; integer = 0;
schoolMap = schoolMapper.querySchoolMap(subName.toString(),schoolName.toString()); schoolMap = schoolMapper.querySchoolMap(map.get("a").toString(),map.get("b").toString());
productmap = productMapper.queryProductMaps(map.get("c").toString()).get(0);
map.put("c",productmap.get("productId").toString());
try{ try{
if(schoolMap != null && schoolMap.size() != 0){ if(schoolMap != null && schoolMap.size() != 0){
integer = schoolMapper.updateSchoolMap(map); integer = schoolMapper.updateSchoolMap(map);
...@@ -467,7 +473,7 @@ public class SchoolManagementController extends BaseController { ...@@ -467,7 +473,7 @@ public class SchoolManagementController extends BaseController {
e.printStackTrace(); e.printStackTrace();
} }
if (integer == 1) { if (integer > 0) {
number++; number++;
} else { } else {
error.append("第" + (i + 1) + "行的更新失败,"); error.append("第" + (i + 1) + "行的更新失败,");
...@@ -482,9 +488,9 @@ public class SchoolManagementController extends BaseController { ...@@ -482,9 +488,9 @@ public class SchoolManagementController extends BaseController {
*/ */
@Permission(menuname = "导出学校列表信息", value = "excelOut", method = RequestMethod.POST) @Permission(menuname = "导出学校列表信息", value = "excelOut", method = RequestMethod.POST)
public void excelOut(@Param("networkName") String networkName, public void excelOut(@Param("networkName") String networkName,
@Param("networkName") String status, @Param("status") String status,
@Param("networkName") String subName, @Param("subName") String subName,
@Param("networkName") String schoolName){ @Param("schoolName") String schoolName){
Wrapper<School> wrapper = new EntityWrapper(); Wrapper<School> wrapper = new EntityWrapper();
wrapper.like(StringUtils.isNotBlank(networkName), "network_name", networkName, SqlLike.DEFAULT); wrapper.like(StringUtils.isNotBlank(networkName), "network_name", networkName, SqlLike.DEFAULT);
...@@ -492,9 +498,20 @@ public class SchoolManagementController extends BaseController { ...@@ -492,9 +498,20 @@ public class SchoolManagementController extends BaseController {
wrapper.eq(StringUtils.isNotBlank(subName), "sub_name", subName); wrapper.eq(StringUtils.isNotBlank(subName), "sub_name", subName);
wrapper.eq(StringUtils.isNotBlank(status), "status", status); wrapper.eq(StringUtils.isNotBlank(status), "status", status);
List<Map<String, Object>> maps = schoolMapper.selectMaps(wrapper); List<Map<String, Object>> maps = schoolMapper.selectMaps(wrapper);
List<Map<String, Object>> schoolmaps = new ArrayList<>();
Map<String,Object> productMap = new HashMap<>();
for (Map<String,Object> map:maps){
map.put("productUniversity","");
if(null != map.get("bandproductId") && StringUtils.isNotBlank(map.get("bandproductId").toString())){
productMap = productMapper.queryProductByIdMap(map.get("bandproductId").toString());
if(productMap != null && productMap.size() != 0){
map.put("productUniversity",productMap.get("productUniversity"));
}
}
schoolmaps.add(map);
}
ServletOutputStream os = null; ServletOutputStream os = null;
XSSFWorkbook workbook = ExcelDealUtils.getWorkBook(ExcelDealUtils.schoolExcel("校园列表"), maps); XSSFWorkbook workbook = ExcelDealUtils.getWorkBook(ExcelDealUtils.schoolExcel("校园列表"), schoolmaps);
try { try {
HttpServletResponse response = getHttpServletResponse(); HttpServletResponse response = getHttpServletResponse();
response.reset(); response.reset();
...@@ -515,8 +532,9 @@ public class SchoolManagementController extends BaseController { ...@@ -515,8 +532,9 @@ public class SchoolManagementController extends BaseController {
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
map.put("subName", ""); map.put("subName", "");
map.put("schoolName", ""); map.put("schoolName", "");
map.put("lzUser", ""); map.put("netId", "");
map.put("lzgh", ""); map.put("lzgh", "");
map.put("lzUser", "");
map.put("networkCode", ""); map.put("networkCode", "");
map.put("networkName", ""); map.put("networkName", "");
map.put("appId", ""); map.put("appId", "");
......
service-manager/src/main/java/com/winsun/utils/ExcelDealUtils.java
...@@ -6,8 +6,8 @@ import org.apache.poi.xssf.usermodel.*; ...@@ -6,8 +6,8 @@ import org.apache.poi.xssf.usermodel.*;
import java.util.*; import java.util.*;
public class ExcelDealUtils { public class ExcelDealUtils {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static XSSFWorkbook getWorkBook(Map<String, Object> headData,List<Map<String,Object>> list) { public static XSSFWorkbook getWorkBook(Map<String, Object> headData,List<Map<String,Object>> list) {
String sheetName = headData.get("sheetName").toString(); String sheetName = headData.get("sheetName").toString();
...@@ -42,7 +42,7 @@ public class ExcelDealUtils { ...@@ -42,7 +42,7 @@ public class ExcelDealUtils {
} }
} }
} }
return workbook; return workbook;
} }
...@@ -143,23 +143,23 @@ public class ExcelDealUtils { ...@@ -143,23 +143,23 @@ public class ExcelDealUtils {
return workbook; return workbook;
} }
public static Map<String, Object> dealHeadMap(Map<String, Object> map){ public static Map<String, Object> dealHeadMap(Map<String, Object> map){
Map<String, Object> resultMap = new HashMap<String, Object>(); Map<String, Object> resultMap = new HashMap<String, Object>();
List<String> names = new ArrayList<>(); List<String> names = new ArrayList<>();
List<String> columns = new ArrayList<>(); List<String> columns = new ArrayList<>();
for(Map.Entry<String, Object> theMap : map.entrySet()) { for(Map.Entry<String, Object> theMap : map.entrySet()) {
names.add(theMap.getKey()); names.add(theMap.getKey());
columns.add(theMap.getValue().toString()); columns.add(theMap.getValue().toString());
} }
resultMap.put("names", names); resultMap.put("names", names);
resultMap.put("columns", columns); resultMap.put("columns", columns);
return resultMap; return resultMap;
} }
// 活动导出excel表头 // 活动导出excel表头
public static Map<String, Object> activityExcel(String sheetName){ public static Map<String, Object> activityExcel(String sheetName){
Map<String, Object> headMap = new LinkedHashMap<String, Object>(); Map<String, Object> headMap = new LinkedHashMap<String, Object>();
...@@ -173,10 +173,10 @@ public class ExcelDealUtils { ...@@ -173,10 +173,10 @@ public class ExcelDealUtils {
headMap.put("县分", "substName"); headMap.put("县分", "substName");
headMap.put("学校", "schoolName"); headMap.put("学校", "schoolName");
headMap.put("创建时间", "createTime"); headMap.put("创建时间", "createTime");
Map<String, Object> resultMap = dealHeadMap(headMap); Map<String, Object> resultMap = dealHeadMap(headMap);
resultMap.put("sheetName", sheetName); resultMap.put("sheetName", sheetName);
return resultMap; return resultMap;
} }
// kpi管理导出excel表头 // kpi管理导出excel表头
...@@ -451,7 +451,7 @@ public class ExcelDealUtils { ...@@ -451,7 +451,7 @@ public class ExcelDealUtils {
resultMap.put("sheetName", sheetName); resultMap.put("sheetName", sheetName);
return resultMap; return resultMap;
} }
// 账单导出excel表头 // 账单导出excel表头
public static Map<String, Object> billExcel(String sheetName){ public static Map<String, Object> billExcel(String sheetName){
Map<String, Object> headMap = new LinkedHashMap<String, Object>(); Map<String, Object> headMap = new LinkedHashMap<String, Object>();
...@@ -467,13 +467,13 @@ public class ExcelDealUtils { ...@@ -467,13 +467,13 @@ public class ExcelDealUtils {
headMap.put("不含税金额", "amount"); headMap.put("不含税金额", "amount");
headMap.put("含税金额", "taxAmount"); headMap.put("含税金额", "taxAmount");
headMap.put("税点", "taxPoint"); headMap.put("税点", "taxPoint");
Map<String, Object> resultMap = dealHeadMap(headMap); Map<String, Object> resultMap = dealHeadMap(headMap);
resultMap.put("sheetName", sheetName); resultMap.put("sheetName", sheetName);
return resultMap; return resultMap;
} }
// 账单汇总导出excel表头 // 账单汇总导出excel表头
public static Map<String, Object> billStatisExcel(String sheetName){ public static Map<String, Object> billStatisExcel(String sheetName){
...@@ -487,13 +487,13 @@ public class ExcelDealUtils { ...@@ -487,13 +487,13 @@ public class ExcelDealUtils {
headMap.put("收支详情", "billDetailExpense"); headMap.put("收支详情", "billDetailExpense");
headMap.put("不含税金额", "amountExpense"); headMap.put("不含税金额", "amountExpense");
headMap.put("含税金额", "taxAmount"); headMap.put("含税金额", "taxAmount");
Map<String, Object> resultMap = dealHeadMap(headMap); Map<String, Object> resultMap = dealHeadMap(headMap);
resultMap.put("sheetName", sheetName); resultMap.put("sheetName", sheetName);
return resultMap; return resultMap;
} }
// 奖励结算导出excel表头 // 奖励结算导出excel表头
public static Map<String, Object> bonusExcel(String sheetName){ public static Map<String, Object> bonusExcel(String sheetName){
Map<String, Object> headMap = new LinkedHashMap<String, Object>(); Map<String, Object> headMap = new LinkedHashMap<String, Object>();
...@@ -503,13 +503,13 @@ public class ExcelDealUtils { ...@@ -503,13 +503,13 @@ public class ExcelDealUtils {
headMap.put("学校", "schoolName"); headMap.put("学校", "schoolName");
headMap.put("金额", "bonus"); headMap.put("金额", "bonus");
headMap.put("佣金状态", "state"); headMap.put("佣金状态", "state");
Map<String, Object> resultMap = dealHeadMap(headMap); Map<String, Object> resultMap = dealHeadMap(headMap);
resultMap.put("sheetName", sheetName); resultMap.put("sheetName", sheetName);
return resultMap; return resultMap;
} }
// 合伙人管理导出excel表头 // 合伙人管理导出excel表头
public static Map<String, Object> hhrUserExcel(String sheetName){ public static Map<String, Object> hhrUserExcel(String sheetName){
Map<String, Object> headMap = new LinkedHashMap<String, Object>(); Map<String, Object> headMap = new LinkedHashMap<String, Object>();
...@@ -523,23 +523,25 @@ public class ExcelDealUtils { ...@@ -523,23 +523,25 @@ public class ExcelDealUtils {
headMap.put("状态", "status"); headMap.put("状态", "status");
headMap.put("活跃状态", "isActive"); headMap.put("活跃状态", "isActive");
headMap.put("性别", "sex"); headMap.put("性别", "sex");
Map<String, Object> resultMap = dealHeadMap(headMap); Map<String, Object> resultMap = dealHeadMap(headMap);
resultMap.put("sheetName", sheetName); resultMap.put("sheetName", sheetName);
return resultMap; return resultMap;
} }
// 管理导出excel表头 // 管理导出excel表头
public static Map<String, Object> schoolExcel(String sheetName){ public static Map<String, Object> schoolExcel(String sheetName){
Map<String, Object> headMap = new LinkedHashMap<String, Object>(); Map<String, Object> headMap = new LinkedHashMap<String, Object>();
headMap.put("所属县分（必填）", "subName"); headMap.put("县分（必填）", "subName");
headMap.put("校园名称（必填）", "schoolName"); headMap.put("学校名称（必填）", "schoolName");
headMap.put("揽装人", "lzUser"); headMap.put("单宽学校名称", "productUniversity");
headMap.put("揽装工号", "lzgh"); headMap.put("网点id(合伙人id)", "netId");
headMap.put("揽装工号（宽带）", "lzgh");
headMap.put("揽装人（宽带）", "lzUser");
headMap.put("网点编码", "networkCode"); headMap.put("网点编码", "networkCode");
headMap.put("网点名称", "networkName"); headMap.put("网点名称", "networkName");
headMap.put("终端编码", "appId"); headMap.put("随身厅终端编码", "appId");
headMap.put("终端密匙", "appKey"); headMap.put("随身厅终端密匙", "appKey");
Map<String, Object> resultMap = dealHeadMap(headMap); Map<String, Object> resultMap = dealHeadMap(headMap);
resultMap.put("sheetName", sheetName); resultMap.put("sheetName", sheetName);
......
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