Skip to content

G
gdtel-gztel-school-center
Commit b293ad0f by 彭祥礼
Options

新增学子公司销量统计

parent b1c2e83f
Showing with 101 additions and 140 deletions
common/src/main/java/com/winsun/bean/PayRequest.java
package com.winsun.bean; package com.winsun.bean;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
/** /**
...@@ -8,6 +10,7 @@ import java.io.Serializable; ...@@ -8,6 +10,7 @@ import java.io.Serializable;
* @author PXL * @author PXL
* @create 2020/5/12 15:17 * @create 2020/5/12 15:17
*/ */
@Data
public class PayRequest implements Serializable { public class PayRequest implements Serializable {
private static final long serialVersionUID = -7878937183538920548L; private static final long serialVersionUID = -7878937183538920548L;
...@@ -24,91 +27,4 @@ public class PayRequest implements Serializable { ...@@ -24,91 +27,4 @@ public class PayRequest implements Serializable {
private String trade_type; private String trade_type;
public String getAppid() {
return appid;
}
public void setAppid(String appid) {
this.appid = appid;
}
public String getMch_id() {
return mch_id;
}
public void setMch_id(String mch_id) {
this.mch_id = mch_id;
}
public String getNonce_str() {
return nonce_str;
}
public void setNonce_str(String nonce_str) {
this.nonce_str = nonce_str;
}
public String getSign() {
return sign;
}
public void setSign(String sign) {
this.sign = sign;
}
public String getBody() {
return body;
}
public void setBody(String body) {
this.body = body;
}
public String getOut_trade_no() {
return out_trade_no;
}
public void setOut_trade_no(String out_trade_no) {
this.out_trade_no = out_trade_no;
}
public String getTotal_fee() {
return total_fee;
}
public void setTotal_fee(String total_fee) {
this.total_fee = total_fee;
}
public String getSpbill_create_ip() {
return spbill_create_ip;
}
public void setSpbill_create_ip(String spbill_create_ip) {
this.spbill_create_ip = spbill_create_ip;
}
public String getNotify_url() {
return notify_url;
}
public void setNotify_url(String notify_url) {
this.notify_url = notify_url;
}
public String getTrade_type() {
return trade_type;
}
public void setTrade_type(String trade_type) {
this.trade_type = trade_type;
}
public String getOpenid() {
return openid;
}
public void setOpenid(String openid) {
this.openid = openid;
}
} }
common/src/main/java/com/winsun/bean/School.java
...@@ -26,11 +26,13 @@ public class School implements Serializable { ...@@ -26,11 +26,13 @@ public class School implements Serializable {
/** /**
*县分 *县分
*/ */
@TableField("sub_name")
private String subName; private String subName;
/** /**
* 学校 * 学校
*/ */
@TableField("school_name")
private String schoolName; private String schoolName;
/** /**
......
service-manager/src/main/java/com/winsun/controller/LzKpiController.java
...@@ -351,8 +351,8 @@ public class LzKpiController extends BaseController { ...@@ -351,8 +351,8 @@ public class LzKpiController extends BaseController {
} }
List<Integer> schoolIds = new ArrayList<>(); List<Integer> schoolIds = new ArrayList<>();
Wrapper<School> schoolWrapper = new EntityWrapper<>(); Wrapper<School> schoolWrapper = new EntityWrapper<>();
schoolWrapper.eq(StringUtils.isNotBlank(substName), "substName", substName); schoolWrapper.eq(StringUtils.isNotBlank(substName), "sub_name", substName);
schoolWrapper.eq(StringUtils.isNotBlank(schoolName), "schoolName", schoolName); schoolWrapper.eq(StringUtils.isNotBlank(schoolName), "school_name", schoolName);
List<School> schoolList = schoolMapper.selectList(schoolWrapper); List<School> schoolList = schoolMapper.selectList(schoolWrapper);
for (School school : schoolList) { for (School school : schoolList) {
schoolIds.add(school.getId()); schoolIds.add(school.getId());
......
service-manager/src/main/java/com/winsun/controller/SaleCensusController.java
...@@ -74,7 +74,7 @@ public class SaleCensusController extends BaseController{ ...@@ -74,7 +74,7 @@ public class SaleCensusController extends BaseController{
@RequestParam(name = "pageNo", required = false) int pageNo, @RequestParam(name = "pageNo", required = false) int pageNo,
@RequestParam(name = "pageSize", required = false) int pageSize){ @RequestParam(name = "pageSize", required = false) int pageSize){
Page<Map<String,Object>> page = new Page<>(pageNo, pageSize); Page<Map<String,Object>> page = new Page<>(pageNo, pageSize);
List<Map<String,Object>> dataList = new LinkedList<>(); List<Map<String,Object>> dataList0 = new LinkedList<>();
Wrapper<SalesOrder> wrapper = new EntityWrapper(); Wrapper<SalesOrder> wrapper = new EntityWrapper();
wrapper.like(StringUtils.isNotBlank(name), "name", name.trim(), SqlLike.DEFAULT); wrapper.like(StringUtils.isNotBlank(name), "name", name.trim(), SqlLike.DEFAULT);
...@@ -96,13 +96,34 @@ public class SaleCensusController extends BaseController{ ...@@ -96,13 +96,34 @@ public class SaleCensusController extends BaseController{
} }
} }
List<SalesOrder> salesOrderList = salesOrderMapper.selectList(wrapper); List<SalesOrder> salesOrderList = salesOrderMapper.selectList(wrapper);
if(salesOrderList.size()==0){
Wrapper<SalesOrder> wrapper0 = new EntityWrapper();
wrapper0.setSqlSelect("user_id userId,COUNT(*) recentlyNum");
wrapper0.like(StringUtils.isNotBlank(name), "name", name.trim(), SqlLike.DEFAULT);
wrapper0.eq(StringUtils.isNotBlank(account), "account", account.trim());
wrapper0.eq(StringUtils.isNotBlank(salesSubst), "sales_subst", salesSubst.trim());
wrapper0.eq(StringUtils.isNotBlank(salesSchool), "sales_school", salesSchool.trim());
wrapper0.ge("recently_amount", 50);
wrapper0.eq( "del_flag", 0);
wrapper0.groupBy("user_id");
if(StringUtils.isNotBlank(activateTime)){
String[] months = activateTime.split("\\,");
if(!activateTime.equals(",") && StringUtils.isNotEmpty(activateTime)){
String m1 = months[0].substring(0,7);
String month1 = m1.substring(0,4) + m1.substring(5);
String m2 = months[1].substring(0,7);
String month2 = m2.substring(0,4) + m2.substring(5);
wrapper0.between("activate_time",month1,month2);
}
}
List<Map<String,Object>> list0 = salesOrderMapper.selectMaps(wrapper0);
if(list0.size()==0){
page.setTotal(0); page.setTotal(0);
return ResponseData.success(page, "没有数据！"); return ResponseData.success(page, "没有数据！");
} }
List<String> userIds = new ArrayList<>(); List<String> userIds = new ArrayList<>();
for (SalesOrder salesOrder : salesOrderList) { for (Map<String,Object> map : list0) {
userIds.add(salesOrder.getUserId()); userIds.add(map.get("userId").toString());
} }
Wrapper<HhrUser> hhrUserWrapper = new EntityWrapper<>(); Wrapper<HhrUser> hhrUserWrapper = new EntityWrapper<>();
hhrUserWrapper.in("id",userIds); hhrUserWrapper.in("id",userIds);
...@@ -117,13 +138,11 @@ public class SaleCensusController extends BaseController{ ...@@ -117,13 +138,11 @@ public class SaleCensusController extends BaseController{
if(hhrUser.getId().equals(salesOrder.getUserId())){ if(hhrUser.getId().equals(salesOrder.getUserId())){
Map<String,Object> objectMap = new HashMap<>(); Map<String,Object> objectMap = new HashMap<>();
objectMap.put("id",salesOrder.getId()); objectMap.put("id",salesOrder.getId());
objectMap.put("orderPhone",salesOrder.getOrderPhone()); objectMap.put("userId",salesOrder.getUserId());
objectMap.put("name",salesOrder.getName()); objectMap.put("name",salesOrder.getName());
objectMap.put("account",salesOrder.getAccount()); objectMap.put("account",salesOrder.getAccount());
objectMap.put("salesSubst",salesOrder.getSalesSubst()); objectMap.put("salesSubst",salesOrder.getSalesSubst());
objectMap.put("salesSchool",salesOrder.getSalesSchool()); objectMap.put("salesSchool",salesOrder.getSalesSchool());
objectMap.put("createTime",salesOrder.getCreateTime());
objectMap.put("activateTime",salesOrder.getActivateTime());
objectMap.put("position",hhrUser.getPosition()); objectMap.put("position",hhrUser.getPosition());
if(StringUtils.isNotBlank(hhrUser.getParentId())){ if(StringUtils.isNotBlank(hhrUser.getParentId())){
Wrapper<SysUser> wrapper01 = new EntityWrapper<>(); Wrapper<SysUser> wrapper01 = new EntityWrapper<>();
...@@ -136,24 +155,21 @@ public class SaleCensusController extends BaseController{ ...@@ -136,24 +155,21 @@ public class SaleCensusController extends BaseController{
break; break;
} }
} }
if(StringUtils.isNotBlank(hhrUser.getParentIds())){ dataList0.add(objectMap);
String[] parentid = hhrUser.getParentIds().split("\\,"); }
if(parentid.length >= 2){ }
Wrapper<SysUser> wrapper01 = new EntityWrapper<>(); }
wrapper01.eq("id",parentid[1]); List<Map<String,Object>> dataList = new LinkedList<>();
List<SysUser> list = sysUserMapper.selectList(wrapper01); for (Map<String, Object> objectMap : list0) {
if(list.size()>0){ String userId = objectMap.get("userId").toString();
objectMap.put("president",list.get(0).getName()); for (Map<String, Object> map : dataList0) {
}else { if(userId.equals(map.get("userId").toString())){
break; map.put("recentlyNum",objectMap.get("recentlyNum"));
} dataList.add(map);
} break;
}
dataList.add(objectMap);
} }
} }
} }
if(dataList.size() < pageSize) { if(dataList.size() < pageSize) {
dataList = dataList; dataList = dataList;
}else { }else {
...@@ -183,7 +199,7 @@ public class SaleCensusController extends BaseController{ ...@@ -183,7 +199,7 @@ public class SaleCensusController extends BaseController{
@RequestParam(name = "activateTime", required = false) String activateTime, @RequestParam(name = "activateTime", required = false) String activateTime,
@RequestParam(name = "leader", required = false) String leader, @RequestParam(name = "leader", required = false) String leader,
@RequestParam(name = "position", required = false) String position) throws IOException { @RequestParam(name = "position", required = false) String position) throws IOException {
List<Map<String, Object>> dataList = new LinkedList<>(); List<Map<String, Object>> dataList0 = new LinkedList<>();
Wrapper<SalesOrder> wrapper = new EntityWrapper(); Wrapper<SalesOrder> wrapper = new EntityWrapper();
// wrapper.like(StringUtils.isNotBlank(name), "name", name.trim(), SqlLike.DEFAULT); // wrapper.like(StringUtils.isNotBlank(name), "name", name.trim(), SqlLike.DEFAULT);
...@@ -205,12 +221,33 @@ public class SaleCensusController extends BaseController{ ...@@ -205,12 +221,33 @@ public class SaleCensusController extends BaseController{
} }
}*/ }*/
List<SalesOrder> salesOrderList = salesOrderMapper.selectList(wrapper); List<SalesOrder> salesOrderList = salesOrderMapper.selectList(wrapper);
if(salesOrderList.size()==0){
Wrapper<SalesOrder> wrapper0 = new EntityWrapper();
wrapper0.setSqlSelect("user_id userId,COUNT(*) recentlyNum");
wrapper0.like(StringUtils.isNotBlank(name), "name", name.trim(), SqlLike.DEFAULT);
wrapper0.eq(StringUtils.isNotBlank(account), "account", account.trim());
wrapper0.eq(StringUtils.isNotBlank(salesSubst), "sales_subst", salesSubst.trim());
wrapper0.eq(StringUtils.isNotBlank(salesSchool), "sales_school", salesSchool.trim());
wrapper0.ge("recently_amount", 50);
wrapper0.eq( "del_flag", 0);
wrapper0.groupBy("user_id");
if(StringUtils.isNotBlank(activateTime)){
String[] months = activateTime.split("\\,");
if(!activateTime.equals(",") && StringUtils.isNotEmpty(activateTime)){
String m1 = months[0].substring(0,7);
String month1 = m1.substring(0,4) + m1.substring(5);
String m2 = months[1].substring(0,7);
String month2 = m2.substring(0,4) + m2.substring(5);
wrapper0.between("activate_time",month1,month2);
}
}
List<Map<String,Object>> list0 = salesOrderMapper.selectMaps(wrapper0);
if(list0.size()==0){
log.info("没有数据"); log.info("没有数据");
} }
List<String> userIds = new ArrayList<>(); List<String> userIds = new ArrayList<>();
for (SalesOrder salesOrder : salesOrderList) { for (Map<String,Object> map : list0) {
userIds.add(salesOrder.getUserId()); userIds.add(map.get("userId").toString());
} }
Wrapper<HhrUser> hhrUserWrapper = new EntityWrapper<>(); Wrapper<HhrUser> hhrUserWrapper = new EntityWrapper<>();
hhrUserWrapper.in("id",userIds); hhrUserWrapper.in("id",userIds);
...@@ -224,13 +261,11 @@ public class SaleCensusController extends BaseController{ ...@@ -224,13 +261,11 @@ public class SaleCensusController extends BaseController{
if(hhrUser.getId().equals(salesOrder.getUserId())){ if(hhrUser.getId().equals(salesOrder.getUserId())){
Map<String,Object> objectMap = new HashMap<>(); Map<String,Object> objectMap = new HashMap<>();
objectMap.put("id",salesOrder.getId()); objectMap.put("id",salesOrder.getId());
objectMap.put("orderPhone",salesOrder.getOrderPhone()); objectMap.put("userId",salesOrder.getUserId());
objectMap.put("name",salesOrder.getName()); objectMap.put("name",salesOrder.getName());
objectMap.put("account",salesOrder.getAccount()); objectMap.put("account",salesOrder.getAccount());
objectMap.put("salesSubst",salesOrder.getSalesSubst()); objectMap.put("salesSubst",salesOrder.getSalesSubst());
objectMap.put("salesSchool",salesOrder.getSalesSchool()); objectMap.put("salesSchool",salesOrder.getSalesSchool());
objectMap.put("createTime",salesOrder.getCreateTime());
objectMap.put("activateTime",salesOrder.getActivateTime());
objectMap.put("position",hhrUser.getPosition()); objectMap.put("position",hhrUser.getPosition());
if(StringUtils.isNotBlank(hhrUser.getParentId())){ if(StringUtils.isNotBlank(hhrUser.getParentId())){
Wrapper<SysUser> wrapper01 = new EntityWrapper<>(); Wrapper<SysUser> wrapper01 = new EntityWrapper<>();
...@@ -243,37 +278,31 @@ public class SaleCensusController extends BaseController{ ...@@ -243,37 +278,31 @@ public class SaleCensusController extends BaseController{
break; break;
} }
} }
if(StringUtils.isNotBlank(hhrUser.getParentIds())){ dataList0.add(objectMap);
String[] parentid = hhrUser.getParentIds().split("\\,"); }
if(parentid.length >= 2){ }
Wrapper<SysUser> wrapper01 = new EntityWrapper<>(); }
wrapper01.eq("id",parentid[1]); List<Map<String,Object>> dataList = new LinkedList<>();
//wrapper01.like(StringUtils.isNotBlank(president), "name", president.trim(), SqlLike.DEFAULT); for (Map<String, Object> objectMap : list0) {
List<SysUser> list = sysUserMapper.selectList(wrapper01); String userId = objectMap.get("userId").toString();
if(list.size()>0){ for (Map<String, Object> map : dataList0) {
objectMap.put("president",list.get(0).getName()); if(userId.equals(map.get("userId").toString())){
}else { map.put("recentlyNum",objectMap.get("recentlyNum"));
break; dataList.add(map);
} break;
}
}
dataList.add(objectMap);
} }
} }
} }
ServletOutputStream os = null; ServletOutputStream os = null;
List<Integer> columnWidths = new ArrayList<>(); List<Integer> columnWidths = new ArrayList<>();
columnWidths.add(3500); columnWidths.add(4000);
columnWidths.add(5000); columnWidths.add(4000);
columnWidths.add(3000);
columnWidths.add(3000); columnWidths.add(3000);
columnWidths.add(5000); columnWidths.add(5000);
columnWidths.add(2500); columnWidths.add(4000);
columnWidths.add(3000); columnWidths.add(3000);
columnWidths.add(3000); columnWidths.add(3000);
columnWidths.add(5000); XSSFWorkbook workbook = ExcelDealUtils.getWorkBook2(ExcelDealUtils.salesCensusExcel("放号充值达标清单"), dataList,columnWidths);
columnWidths.add(5000);
XSSFWorkbook workbook = ExcelDealUtils.getWorkBook2(ExcelDealUtils.salesOrderExcel("放号充值达标清单"), dataList,columnWidths);
try { try {
HttpServletResponse response = getHttpServletResponse(); HttpServletResponse response = getHttpServletResponse();
response.reset(); response.reset();
......
service-manager/src/main/java/com/winsun/utils/ExcelDealUtils.java
...@@ -200,6 +200,20 @@ public class ExcelDealUtils { ...@@ -200,6 +200,20 @@ public class ExcelDealUtils {
resultMap.put("sheetName", sheetName); resultMap.put("sheetName", sheetName);
return resultMap; return resultMap;
} }
// 导出学子公司销量统计清单excel表头
public static Map<String, Object> salesCensusExcel(String sheetName){
Map<String, Object> headMap = new LinkedHashMap<String, Object>();
headMap.put("放号人", "name");
headMap.put("放号人账号", "account");
headMap.put("放号县分", "salesSubst");
headMap.put("放号学校", "salesSchool");
headMap.put("达标充值数", "recentlyNum");
headMap.put("职位", "position");
headMap.put("上级领导", "leader");
Map<String, Object> resultMap = dealHeadMap(headMap);
resultMap.put("sheetName", sheetName);
return resultMap;
}
// 总经理薪酬管理导出excel表头 // 总经理薪酬管理导出excel表头
public static Map<String, Object> zjlWageExcel(String sheetName){ public static Map<String, Object> zjlWageExcel(String 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