Skip to content

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

多表查询及分页代码修改

parent 4d9c6720
Showing with 231 additions and 383 deletions
common/src/main/java/com/winsun/bean/SalesOrder.java deleted 100644 → 0
package com.winsun.bean;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
@TableName("hhr_sales_order")
public class SalesOrder implements Serializable {
private static final long serialVersionUID = -1093416820114819143L;
/**
* 主键
*/
private Integer id;
/**
* 放号号码
*/
private String orderPhone;
/**
* 用户id
*/
private String userId;
/**
* 放号人
*/
private String name;
/**
* 放号人账号
*/
private String account;
/**
* 创建时间
*/
private Date createTime;
/**
* 审核状态 1：未审核 2：系统审核不通过 3：充值审核通过 4、 充值审核不通过
*/
private String status;
/**
* 审核备注
*/
private String remark;
/**
* 销售县分
*/
private String salesSubst;
/**
* 销售学校
*/
private String salesSchool;
/**
* 审核时间
*/
private Date auditTime ;
/**
* 佣金状态
*/
private String bonusStatus;
/**
* 订单类型
*/
private String orderType;
/**
* 订单编码
*/
private String orderNum;
/**
* 升级套餐
*/
private String upgradeCombo;
/**
* 原套餐
*/
private String oldCombo;
/**
* 删除标价 0:未删除 1：已删除
*/
private String delFlag;
/**
* 号码激活时间
*/
private Date activateTime;
/**
* 网点编码
*/
private String networkCode;
/**
* 网点名称
*/
private String networkName;
/**
* 总激励
*/
private Double allBonus;
/**
* 未发放激励
*/
private Double nonSendBonus;
/**
* 已发放激励
*/
private Double sendBonus;
/**
* 最近充值金额
*/
private Double recentlyAmount;
/**
* 最近充值激励
*/
private Double recentlyBonus;
/**
* 累计充值金额
*/
private Double monthAmount;
/**
* 累计充值激励
*/
private Double monthBonus;
/**
* 本金激励
*/
private Double capitalBonus;
@TableField(exist = false)
private String positionZW;
@TableField(exist = false)
private String positionZJL;
@TableField(exist = false)
private String positionSJ;
}
common/src/main/java/com/winsun/mapper/SalesOrderMapper.java
package com.winsun.mapper; 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.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.SalesOrder; import com.winsun.bean.SalesOrder;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
@Mapper @Mapper
@Component @Component
......
service-manager/src/main/java/com/winsun/controller/LzKpiController.java
...@@ -299,7 +299,7 @@ public class LzKpiController extends BaseController { ...@@ -299,7 +299,7 @@ public class LzKpiController extends BaseController {
if(lzKpis.size() < pageSize) { if(lzKpis.size() < pageSize) {
dataList = list; dataList = list;
}else { }else {
Integer endpageSize = (pageNo-1) == lzKpis.size()/10?(pageNo-1)*pageSize+lzKpis.size()%10:pageNo*pageSize; Integer endpageSize = (pageNo-1) == lzKpis.size()/pageSize?(pageNo-1)*pageSize+lzKpis.size()%pageSize:pageNo*pageSize;
dataList = list.subList((pageNo-1)*pageSize, endpageSize); dataList = list.subList((pageNo-1)*pageSize, endpageSize);
} }
......
service-manager/src/main/java/com/winsun/controller/LzSalaryController.java
...@@ -391,7 +391,7 @@ public class LzSalaryController extends BaseController { ...@@ -391,7 +391,7 @@ public class LzSalaryController extends BaseController {
if(lzWages.size() < pageSize) { if(lzWages.size() < pageSize) {
dataList = list; dataList = list;
}else { }else {
Integer endpageSize = (pageNo-1) == lzWages.size()/10?(pageNo-1)*pageSize+lzWages.size()%10:pageNo*pageSize; Integer endpageSize = (pageNo-1) == lzWages.size()/pageSize?(pageNo-1)*pageSize+lzWages.size()%pageSize:pageNo*pageSize;
dataList = list.subList((pageNo-1)*pageSize, endpageSize); dataList = list.subList((pageNo-1)*pageSize, endpageSize);
} }
......
service-manager/src/main/java/com/winsun/controller/SaleCensusController.java
...@@ -73,31 +73,42 @@ public class SaleCensusController extends BaseController{ ...@@ -73,31 +73,42 @@ 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>> dataList0 = new LinkedList<>(); List<Map<String,Object>> dataList = new LinkedList<>();
Wrapper<SalesOrder> wrapper = new EntityWrapper(); List<String> userIds = new ArrayList<>();
wrapper.like(StringUtils.isNotBlank(name), "name", name.trim(), SqlLike.DEFAULT); if(StringUtils.isNotBlank(leader)){
wrapper.eq(StringUtils.isNotBlank(account), "account", account.trim()); Wrapper<SysUser> sysUserWrapper = new EntityWrapper<>();
wrapper.eq(StringUtils.isNotBlank(salesSubst), "sales_subst", salesSubst.trim()); sysUserWrapper.like( "name", leader.trim(), SqlLike.DEFAULT);
wrapper.eq(StringUtils.isNotBlank(salesSchool), "sales_school", salesSchool.trim()); List<SysUser> sysUserList = sysUserMapper.selectList(sysUserWrapper);
wrapper.ge("recently_amount", 50); if(sysUserList.size()==0){
wrapper.eq( "del_flag", 0); page.setTotal(0);
if(StringUtils.isNotBlank(activateTime)){ return ResponseData.success(page, "没有数据！");
String[] months = activateTime.split("\\,"); }
if(!activateTime.equals(",") && StringUtils.isNotEmpty(activateTime)){ for (SysUser sysUser : sysUserList) {
String m1 = months[0].substring(0,7); userIds.add(sysUser.getId());
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); List<String> userIdst = new ArrayList<>();
wrapper.between("activate_time",month1,month2); if(StringUtils.isNotBlank(position)){
/*wrapper.ge(StringUtils.isNotBlank(month1),"activate_time",month1); Wrapper<HhrUser> hhrUserWrapper = new EntityWrapper<>();
wrapper.le(StringUtils.isNotBlank(month2),"activate_time",month2);*/ if(userIds.size()>0){
hhrUserWrapper.in("id",userIds);
}
hhrUserWrapper.eq( "position", position.trim());
List<HhrUser> hhrUserList = hhrUserMapper.selectList(hhrUserWrapper);
if(hhrUserList.size()==0){
page.setTotal(0);
return ResponseData.success(page, "没有数据！");
}
for (HhrUser hhrUser : hhrUserList) {
userIdst.add(hhrUser.getId());
} }
} }
List<SalesOrder> salesOrderList = salesOrderMapper.selectList(wrapper);
Wrapper<SalesOrder> wrapper0 = new EntityWrapper(); Wrapper<SalesOrder> wrapper0 = new EntityWrapper();
wrapper0.setSqlSelect("user_id userId,COUNT(*) recentlyNum"); wrapper0.setSqlSelect("user_id userId,COUNT(*) recentlyNum");
if(userIdst.size()>0){
wrapper0.in("user_id",userIdst);
}
wrapper0.like(StringUtils.isNotBlank(name), "name", name.trim(), SqlLike.DEFAULT); wrapper0.like(StringUtils.isNotBlank(name), "name", name.trim(), SqlLike.DEFAULT);
wrapper0.eq(StringUtils.isNotBlank(account), "account", account.trim()); wrapper0.eq(StringUtils.isNotBlank(account), "account", account.trim());
wrapper0.eq(StringUtils.isNotBlank(salesSubst), "sales_subst", salesSubst.trim()); wrapper0.eq(StringUtils.isNotBlank(salesSubst), "sales_subst", salesSubst.trim());
...@@ -115,65 +126,49 @@ public class SaleCensusController extends BaseController{ ...@@ -115,65 +126,49 @@ public class SaleCensusController extends BaseController{
wrapper0.between("activate_time",month1,month2); wrapper0.between("activate_time",month1,month2);
} }
} }
List<Map<String,Object>> list0 = salesOrderMapper.selectMaps(wrapper0); dataList = salesOrderMapper.selectMaps(wrapper0);
if(list0.size()==0){ if(dataList.size()==0){
page.setTotal(0); page.setTotal(0);
return ResponseData.success(page, "没有数据！"); return ResponseData.success(page, "没有数据！");
} }
List<String> userIds = new ArrayList<>(); page.setTotal(dataList.size());
for (Map<String,Object> map : list0) { if(dataList.size() >= pageSize) {
userIds.add(map.get("userId").toString()); Integer endpageSize = (pageNo-1) == dataList.size()/pageSize?(pageNo-1)*pageSize+dataList.size()%pageSize:pageNo*pageSize;
dataList = dataList.subList((pageNo-1)*pageSize, endpageSize);
} }
Wrapper<HhrUser> hhrUserWrapper = new EntityWrapper<>(); List<String> ids = new ArrayList<>();
hhrUserWrapper.in("id",userIds); for (Map<String, Object> objectMap : dataList) {
hhrUserWrapper.eq(StringUtils.isNotBlank(position), "position", position.trim()); ids.add(objectMap.get("userId").toString());
List<HhrUser> userList = hhrUserMapper.selectList(hhrUserWrapper);
if(userList.size()==0){
page.setTotal(0);
return ResponseData.success(page, "没有数据！");
} }
for (HhrUser hhrUser : userList) { Wrapper<HhrUser> hhrUserWrapper1 = new EntityWrapper<>();
for (SalesOrder salesOrder : salesOrderList) { hhrUserWrapper1.in("id",ids);
if(hhrUser.getId().equals(salesOrder.getUserId())){ List<HhrUser> hhrUsers = hhrUserMapper.selectList(hhrUserWrapper1);
Map<String,Object> objectMap = new HashMap<>();
for (Map<String, Object> objectMap : dataList) {
String userId = objectMap.get("userId").toString();
Wrapper<SalesOrder> salesOrderWrapper = new EntityWrapper();
salesOrderWrapper.eq("user_id",userId);
List<SalesOrder> salesOrderList = salesOrderMapper.selectList(salesOrderWrapper);
SalesOrder salesOrder = salesOrderList.get(0);
objectMap.put("id",salesOrder.getId()); objectMap.put("id",salesOrder.getId());
objectMap.put("userId",salesOrder.getUserId()); 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());
for (HhrUser hhrUser : hhrUsers) {
if(hhrUser.getId().equals(userId)){
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<>(); SysUser sysUser = sysUserMapper.selectById(hhrUser.getParentId());
wrapper01.eq("id",hhrUser.getParentId()); if(sysUser != null){
wrapper01.like(StringUtils.isNotBlank(leader), "name", leader.trim(), SqlLike.DEFAULT); objectMap.put("leader",sysUser.getName());
List<SysUser> list = sysUserMapper.selectList(wrapper01);
if(list.size()>0){
objectMap.put("leader",list.get(0).getName());
}else {
break;
}
} }
dataList0.add(objectMap);
} }
}
}
List<Map<String,Object>> dataList = new LinkedList<>();
for (Map<String, Object> objectMap : list0) {
String userId = objectMap.get("userId").toString();
for (Map<String, Object> map : dataList0) {
if(userId.equals(map.get("userId").toString())){
map.put("recentlyNum",objectMap.get("recentlyNum"));
dataList.add(map);
break; break;
} }
} }
} }
if(dataList.size() < pageSize) {
dataList = dataList;
}else {
dataList = dataList.subList((pageNo-1)*pageSize, pageNo*pageSize);
}
page.setRecords(dataList); page.setRecords(dataList);
return ResponseData.success(page, "查询完毕！"); return ResponseData.success(page, "查询完毕！");
} }
...@@ -198,31 +193,40 @@ public class SaleCensusController extends BaseController{ ...@@ -198,31 +193,40 @@ 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>> dataList0 = new LinkedList<>(); List<Map<String,Object>> dataList = new LinkedList<>();
Wrapper<SalesOrder> wrapper = new EntityWrapper(); List<String> userIds = new ArrayList<>();
// wrapper.like(StringUtils.isNotBlank(name), "name", name.trim(), SqlLike.DEFAULT); if(StringUtils.isNotBlank(leader)){
// wrapper.eq(StringUtils.isNotBlank(account), "account", account.trim()); Wrapper<SysUser> sysUserWrapper = new EntityWrapper<>();
// wrapper.eq(StringUtils.isNotBlank(salesSubst), "sales_subst", salesSubst.trim()); sysUserWrapper.like( "name", leader.trim(), SqlLike.DEFAULT);
// wrapper.eq(StringUtils.isNotBlank(salesSchool), "sales_school", salesSchool.trim()); List<SysUser> sysUserList = sysUserMapper.selectList(sysUserWrapper);
wrapper.ge("recently_amount", 50); if(sysUserList.size()==0){
wrapper.eq( "del_flag", 0); log.info("没有数据");
/*if(StringUtils.isNotBlank(activateTime)){ }
String[] months = activateTime.split("\\,"); for (SysUser sysUser : sysUserList) {
if(!activateTime.equals(",") && StringUtils.isNotEmpty(activateTime)){ userIds.add(sysUser.getId());
String m1 = months[0].substring(0,7); }
String month1 = m1.substring(0,4) + m1.substring(5); }
String m2 = months[1].substring(0,7); List<String> userIdst = new ArrayList<>();
String month2 = m2.substring(0,4) + m2.substring(5); if(StringUtils.isNotBlank(position)){
wrapper.between("activate_time",month1,month2); Wrapper<HhrUser> hhrUserWrapper = new EntityWrapper<>();
*//*wrapper.ge(StringUtils.isNotBlank(month1),"activate_time",month1); if(userIds.size()>0){
wrapper.le(StringUtils.isNotBlank(month2),"activate_time",month2);*//* hhrUserWrapper.in("id",userIds);
}
hhrUserWrapper.eq( "position", position.trim());
List<HhrUser> hhrUserList = hhrUserMapper.selectList(hhrUserWrapper);
if(hhrUserList.size()==0){
log.info("没有数据");
}
for (HhrUser hhrUser : hhrUserList) {
userIdst.add(hhrUser.getId());
}
} }
}*/
List<SalesOrder> salesOrderList = salesOrderMapper.selectList(wrapper);
Wrapper<SalesOrder> wrapper0 = new EntityWrapper(); Wrapper<SalesOrder> wrapper0 = new EntityWrapper();
wrapper0.setSqlSelect("user_id userId,COUNT(*) recentlyNum"); wrapper0.setSqlSelect("user_id userId,COUNT(*) recentlyNum");
if(userIdst.size()>0){
wrapper0.in("user_id",userIdst);
}
wrapper0.like(StringUtils.isNotBlank(name), "name", name.trim(), SqlLike.DEFAULT); wrapper0.like(StringUtils.isNotBlank(name), "name", name.trim(), SqlLike.DEFAULT);
wrapper0.eq(StringUtils.isNotBlank(account), "account", account.trim()); wrapper0.eq(StringUtils.isNotBlank(account), "account", account.trim());
wrapper0.eq(StringUtils.isNotBlank(salesSubst), "sales_subst", salesSubst.trim()); wrapper0.eq(StringUtils.isNotBlank(salesSubst), "sales_subst", salesSubst.trim());
...@@ -240,54 +244,39 @@ public class SaleCensusController extends BaseController{ ...@@ -240,54 +244,39 @@ public class SaleCensusController extends BaseController{
wrapper0.between("activate_time",month1,month2); wrapper0.between("activate_time",month1,month2);
} }
} }
List<Map<String,Object>> list0 = salesOrderMapper.selectMaps(wrapper0); dataList = salesOrderMapper.selectMaps(wrapper0);
if(list0.size()==0){ if(dataList.size()==0){
log.info("没有数据"); log.info("没有数据");
} }
List<String> userIds = new ArrayList<>(); List<String> ids = new ArrayList<>();
for (Map<String,Object> map : list0) { for (Map<String, Object> objectMap : dataList) {
userIds.add(map.get("userId").toString()); ids.add(objectMap.get("userId").toString());
}
Wrapper<HhrUser> hhrUserWrapper = new EntityWrapper<>();
hhrUserWrapper.in("id",userIds);
//hhrUserWrapper.eq(StringUtils.isNotBlank(position), "position", position.trim());
List<HhrUser> userList = hhrUserMapper.selectList(hhrUserWrapper);
if(userList.size()==0){
log.info("没有数据");
} }
for (HhrUser hhrUser : userList) { Wrapper<HhrUser> hhrUserWrapper1 = new EntityWrapper<>();
for (SalesOrder salesOrder : salesOrderList) { hhrUserWrapper1.in("id",ids);
if(hhrUser.getId().equals(salesOrder.getUserId())){ List<HhrUser> hhrUsers = hhrUserMapper.selectList(hhrUserWrapper1);
Map<String,Object> objectMap = new HashMap<>();
for (Map<String, Object> objectMap : dataList) {
String userId = objectMap.get("userId").toString();
Wrapper<SalesOrder> salesOrderWrapper = new EntityWrapper();
salesOrderWrapper.eq("user_id",userId);
List<SalesOrder> salesOrderList = salesOrderMapper.selectList(salesOrderWrapper);
SalesOrder salesOrder = salesOrderList.get(0);
objectMap.put("id",salesOrder.getId()); objectMap.put("id",salesOrder.getId());
objectMap.put("userId",salesOrder.getUserId()); 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());
for (HhrUser hhrUser : hhrUsers) {
if(hhrUser.getId().equals(userId)){
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<>(); SysUser sysUser = sysUserMapper.selectById(hhrUser.getParentId());
wrapper01.eq("id",hhrUser.getParentId()); if(sysUser != null){
//wrapper01.like(StringUtils.isNotBlank(leader), "name", leader.trim(), SqlLike.DEFAULT); objectMap.put("leader",sysUser.getName());
List<SysUser> list = sysUserMapper.selectList(wrapper01);
if(list.size()>0){
objectMap.put("leader",list.get(0).getName());
}else {
break;
}
} }
dataList0.add(objectMap);
} }
}
}
List<Map<String,Object>> dataList = new LinkedList<>();
for (Map<String, Object> objectMap : list0) {
String userId = objectMap.get("userId").toString();
for (Map<String, Object> map : dataList0) {
if(userId.equals(map.get("userId").toString())){
map.put("recentlyNum",objectMap.get("recentlyNum"));
dataList.add(map);
break; break;
} }
} }
......
service-manager/src/main/java/com/winsun/controller/SalesOrderController.java
...@@ -8,7 +8,6 @@ import com.winsun.auth.core.annotion.Permission; ...@@ -8,7 +8,6 @@ import com.winsun.auth.core.annotion.Permission;
import com.winsun.auth.core.base.controller.BaseController; import com.winsun.auth.core.base.controller.BaseController;
import com.winsun.auth.core.common.model.ResponseData; import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.auth.core.shiro.ShiroUser; import com.winsun.auth.core.shiro.ShiroUser;
import com.winsun.auth.core.util.DateUtil;
import com.winsun.auth.core.util.IOUtils; import com.winsun.auth.core.util.IOUtils;
import com.winsun.bean.HhrUser; import com.winsun.bean.HhrUser;
import com.winsun.bean.SalesOrder; import com.winsun.bean.SalesOrder;
...@@ -100,9 +99,40 @@ public class SalesOrderController extends BaseController{ ...@@ -100,9 +99,40 @@ public class SalesOrderController extends BaseController{
@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>> dataList = new LinkedList<>();
System.out.println("");
Wrapper<SalesOrder> wrapper = new EntityWrapper<SalesOrder>(); List<String> userIds1 = new ArrayList<>();
if(StringUtils.isNotBlank(position)){
Wrapper<HhrUser> hhrUserWrapper = new EntityWrapper<>();
hhrUserWrapper.eq("position", position.trim());
List<HhrUser> hhrUserList = hhrUserMapper.selectList(hhrUserWrapper);
if(hhrUserList.size()==0){
page.setTotal(0);
return ResponseData.success(page, "没有数据！");
}
for (HhrUser hhrUser : hhrUserList) {
userIds1.add(hhrUser.getId());
}
}
List<String> userIds = new ArrayList<>();
if(StringUtils.isNotBlank(leader)){
Wrapper<SysUser> sysUserWrapper = new EntityWrapper<>();
if(userIds.size()>0){
sysUserWrapper.in("id",userIds1);
}
sysUserWrapper.like("name", leader.trim(), SqlLike.DEFAULT);
List<SysUser> sysUserList = sysUserMapper.selectList(sysUserWrapper);
if(sysUserList.size()==0){
page.setTotal(0);
return ResponseData.success(page, "没有数据！");
}
for (SysUser sysUser : sysUserList) {
userIds.add(sysUser.getId());
}
}
Wrapper<SalesOrder> wrapper = new EntityWrapper<>();
if(userIds.size()>0){
wrapper.in("user_id",userIds);
}
wrapper.like(StringUtils.isNotBlank(name), "name", name.trim(), SqlLike.DEFAULT); wrapper.like(StringUtils.isNotBlank(name), "name", name.trim(), SqlLike.DEFAULT);
wrapper.eq(StringUtils.isNotBlank(account), "account", account.trim()); wrapper.eq(StringUtils.isNotBlank(account), "account", account.trim());
wrapper.eq(StringUtils.isNotBlank(salesSubst), "sales_subst", salesSubst.trim()); wrapper.eq(StringUtils.isNotBlank(salesSubst), "sales_subst", salesSubst.trim());
...@@ -117,30 +147,27 @@ public class SalesOrderController extends BaseController{ ...@@ -117,30 +147,27 @@ public class SalesOrderController extends BaseController{
String m2 = months[1].substring(0,7); String m2 = months[1].substring(0,7);
String month2 = m2.substring(0,4) + m2.substring(5); String month2 = m2.substring(0,4) + m2.substring(5);
wrapper.between("activate_time",month1,month2); wrapper.between("activate_time",month1,month2);
/*wrapper.ge(StringUtils.isNotBlank(month1),"activate_time",month1);
wrapper.le(StringUtils.isNotBlank(month2),"activate_time",month2);*/
} }
} }
wrapper.orderBy("activate_time",false);
List<SalesOrder> salesOrderList = salesOrderMapper.selectList(wrapper); List<SalesOrder> salesOrderList = salesOrderMapper.selectList(wrapper);
if(salesOrderList.size()==0){ if(salesOrderList.size()==0){
page.setTotal(0); page.setTotal(0);
return ResponseData.success(page, "没有数据！"); return ResponseData.success(page, "没有数据！");
} }
List<String> userIds = new ArrayList<>(); page.setTotal(salesOrderList.size());
for (SalesOrder salesOrder : salesOrderList) { if(salesOrderList.size() >= pageSize) {
userIds.add(salesOrder.getUserId()); Integer endpageSize = (pageNo-1) == salesOrderList.size()/pageSize?(pageNo-1)*pageSize+salesOrderList.size()%pageSize:pageNo*pageSize;
salesOrderList = salesOrderList.subList((pageNo-1)*pageSize, endpageSize);
} }
Wrapper<HhrUser> hhrUserWrapper = new EntityWrapper<>(); List<String> ids = new ArrayList<>();
hhrUserWrapper.in("id",userIds); for (SalesOrder salesOrder : salesOrderList) {
hhrUserWrapper.eq(StringUtils.isNotBlank(position), "position", position.trim()); ids.add(salesOrder.getUserId());
List<HhrUser> userList = hhrUserMapper.selectList(hhrUserWrapper);
if(userList.size()==0){
page.setTotal(0);
return ResponseData.success(page, "没有数据！");
} }
for (HhrUser hhrUser : userList) { Wrapper<HhrUser> hhrUserWrapper1 = new EntityWrapper<>();
hhrUserWrapper1.in("id",ids);
List<HhrUser> hhrUsers = hhrUserMapper.selectList(hhrUserWrapper1);
for (SalesOrder salesOrder : salesOrderList) { for (SalesOrder salesOrder : salesOrderList) {
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("orderPhone",salesOrder.getOrderPhone());
...@@ -150,41 +177,28 @@ public class SalesOrderController extends BaseController{ ...@@ -150,41 +177,28 @@ public class SalesOrderController extends BaseController{
objectMap.put("salesSchool",salesOrder.getSalesSchool()); objectMap.put("salesSchool",salesOrder.getSalesSchool());
objectMap.put("createTime",salesOrder.getCreateTime()); objectMap.put("createTime",salesOrder.getCreateTime());
objectMap.put("activateTime",salesOrder.getActivateTime()); objectMap.put("activateTime",salesOrder.getActivateTime());
for (HhrUser hhrUser : hhrUsers) {
if(salesOrder.getUserId().equals(hhrUser.getId())){
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<>(); SysUser sysUser = sysUserMapper.selectById(hhrUser.getParentId());
wrapper01.eq("id",hhrUser.getParentId()); if(sysUser != null){
wrapper01.like(StringUtils.isNotBlank(leader), "name", leader.trim(), SqlLike.DEFAULT); objectMap.put("leader",sysUser.getName());
List<SysUser> list = sysUserMapper.selectList(wrapper01);
if(list.size()>0){
objectMap.put("leader",list.get(0).getName());
}else {
break;
} }
} }
if(StringUtils.isNotBlank(hhrUser.getParentIds())){ if(StringUtils.isNotBlank(hhrUser.getParentIds())){
String[] parentid = hhrUser.getParentIds().split("\\,"); String[] parentid = hhrUser.getParentIds().split("\\,");
if(parentid.length >= 2){ if(parentid.length >= 2){
Wrapper<SysUser> wrapper01 = new EntityWrapper<>(); SysUser sysUser = sysUserMapper.selectById(parentid[1]);
wrapper01.eq("id",parentid[1]); if(sysUser != null){
wrapper01.like(StringUtils.isNotBlank(president), "name", president.trim(), SqlLike.DEFAULT); objectMap.put("leader",sysUser.getName());
List<SysUser> list = sysUserMapper.selectList(wrapper01);
if(list.size()>0){
objectMap.put("president",list.get(0).getName());
}else {
break;
} }
} }
} }
dataList.add(objectMap); break;
}
} }
} }
dataList.add(objectMap);
if(dataList.size() < pageSize) {
dataList = dataList;
}else {
dataList = dataList.subList((pageNo-1)*pageSize, pageNo*pageSize);
} }
page.setRecords(dataList); page.setRecords(dataList);
return ResponseData.success(page, "查询完毕！"); return ResponseData.success(page, "查询完毕！");
...@@ -212,16 +226,46 @@ public class SalesOrderController extends BaseController{ ...@@ -212,16 +226,46 @@ public class SalesOrderController extends BaseController{
@RequestParam(name = "leader", required = false) String leader, @RequestParam(name = "leader", required = false) String leader,
@RequestParam(name = "president", required = false) String president, @RequestParam(name = "president", required = false) String president,
@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>> dataList = new LinkedList<>();
Wrapper<SalesOrder> wrapper = new EntityWrapper(); List<String> userIds1 = new ArrayList<>();
// wrapper.like(StringUtils.isNotBlank(name), "name", name.trim(), SqlLike.DEFAULT); if(StringUtils.isNotBlank(position)){
// wrapper.eq(StringUtils.isNotBlank(account), "account", account.trim()); Wrapper<HhrUser> hhrUserWrapper = new EntityWrapper<>();
// wrapper.eq(StringUtils.isNotBlank(salesSubst), "sales_subst", salesSubst.trim()); hhrUserWrapper.eq("position", position.trim());
// wrapper.eq(StringUtils.isNotBlank(salesSchool), "sales_school", salesSchool.trim()); List<HhrUser> hhrUserList = hhrUserMapper.selectList(hhrUserWrapper);
if(hhrUserList.size()==0){
log.info("没有数据");
}
for (HhrUser hhrUser : hhrUserList) {
userIds1.add(hhrUser.getId());
}
}
List<String> userIds = new ArrayList<>();
if(StringUtils.isNotBlank(leader)){
Wrapper<SysUser> sysUserWrapper = new EntityWrapper<>();
if(userIds.size()>0){
sysUserWrapper.in("id",userIds1);
}
sysUserWrapper.like("name", leader.trim(), SqlLike.DEFAULT);
List<SysUser> sysUserList = sysUserMapper.selectList(sysUserWrapper);
if(sysUserList.size()==0){
log.info("没有数据");
}
for (SysUser sysUser : sysUserList) {
userIds.add(sysUser.getId());
}
}
Wrapper<SalesOrder> wrapper = new EntityWrapper<>();
if(userIds.size()>0){
wrapper.in("user_id",userIds);
}
wrapper.like(StringUtils.isNotBlank(name), "name", name.trim(), SqlLike.DEFAULT);
wrapper.eq(StringUtils.isNotBlank(account), "account", account.trim());
wrapper.eq(StringUtils.isNotBlank(salesSubst), "sales_subst", salesSubst.trim());
wrapper.eq(StringUtils.isNotBlank(salesSchool), "sales_school", salesSchool.trim());
wrapper.ge("recently_amount", 50); wrapper.ge("recently_amount", 50);
wrapper.eq( "del_flag", 0); wrapper.eq( "del_flag", 0);
/*if(StringUtils.isNotBlank(activateTime)){ if(StringUtils.isNotBlank(activateTime)){
String[] months = activateTime.split("\\,"); String[] months = activateTime.split("\\,");
if(!activateTime.equals(",") && StringUtils.isNotEmpty(activateTime)){ if(!activateTime.equals(",") && StringUtils.isNotEmpty(activateTime)){
String m1 = months[0].substring(0,7); String m1 = months[0].substring(0,7);
...@@ -229,28 +273,21 @@ public class SalesOrderController extends BaseController{ ...@@ -229,28 +273,21 @@ public class SalesOrderController extends BaseController{
String m2 = months[1].substring(0,7); String m2 = months[1].substring(0,7);
String month2 = m2.substring(0,4) + m2.substring(5); String month2 = m2.substring(0,4) + m2.substring(5);
wrapper.between("activate_time",month1,month2); wrapper.between("activate_time",month1,month2);
*//*wrapper.ge(StringUtils.isNotBlank(month1),"activate_time",month1);
wrapper.le(StringUtils.isNotBlank(month2),"activate_time",month2);*//*
} }
}*/ }
wrapper.orderBy("activate_time",false);
List<SalesOrder> salesOrderList = salesOrderMapper.selectList(wrapper); List<SalesOrder> salesOrderList = salesOrderMapper.selectList(wrapper);
if(salesOrderList.size()==0){ if(salesOrderList.size()==0){
log.info("没有数据"); log.info("没有数据");
} }
List<String> userIds = new ArrayList<>(); List<String> ids = new ArrayList<>();
for (SalesOrder salesOrder : salesOrderList) { for (SalesOrder salesOrder : salesOrderList) {
userIds.add(salesOrder.getUserId()); ids.add(salesOrder.getUserId());
}
Wrapper<HhrUser> hhrUserWrapper = new EntityWrapper<>();
hhrUserWrapper.in("id",userIds);
//hhrUserWrapper.eq(StringUtils.isNotBlank(position), "position", position.trim());
List<HhrUser> userList = hhrUserMapper.selectList(hhrUserWrapper);
if(userList.size()==0){
log.info("没有数据");
} }
for (HhrUser hhrUser : userList) { Wrapper<HhrUser> hhrUserWrapper1 = new EntityWrapper<>();
hhrUserWrapper1.in("id",ids);
List<HhrUser> hhrUsers = hhrUserMapper.selectList(hhrUserWrapper1);
for (SalesOrder salesOrder : salesOrderList) { for (SalesOrder salesOrder : salesOrderList) {
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("orderPhone",salesOrder.getOrderPhone());
...@@ -258,37 +295,30 @@ public class SalesOrderController extends BaseController{ ...@@ -258,37 +295,30 @@ public class SalesOrderController extends BaseController{
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", DateUtil.formatDate(salesOrder.getCreateTime(),"yyyy-mm-dd")); objectMap.put("createTime",salesOrder.getCreateTime());
objectMap.put("activateTime",DateUtil.formatDate(salesOrder.getActivateTime(),"yyyy-mm-dd")); objectMap.put("activateTime",salesOrder.getActivateTime());
for (HhrUser hhrUser : hhrUsers) {
if(salesOrder.getUserId().equals(hhrUser.getId())){
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<>(); SysUser sysUser = sysUserMapper.selectById(hhrUser.getParentId());
wrapper01.eq("id",hhrUser.getParentId()); if(sysUser != null){
//wrapper01.like(StringUtils.isNotBlank(leader), "name", leader.trim(), SqlLike.DEFAULT); objectMap.put("leader",sysUser.getName());
List<SysUser> list = sysUserMapper.selectList(wrapper01);
if(list.size()>0){
objectMap.put("leader",list.get(0).getName());
}else {
break;
} }
} }
if(StringUtils.isNotBlank(hhrUser.getParentIds())){ if(StringUtils.isNotBlank(hhrUser.getParentIds())){
String[] parentid = hhrUser.getParentIds().split("\\,"); String[] parentid = hhrUser.getParentIds().split("\\,");
if(parentid.length >= 2){ if(parentid.length >= 2){
Wrapper<SysUser> wrapper01 = new EntityWrapper<>(); SysUser sysUser = sysUserMapper.selectById(parentid[1]);
wrapper01.eq("id",parentid[1]); if(sysUser != null){
//wrapper01.like(StringUtils.isNotBlank(president), "name", president.trim(), SqlLike.DEFAULT); objectMap.put("leader",sysUser.getName());
List<SysUser> list = sysUserMapper.selectList(wrapper01);
if(list.size()>0){
objectMap.put("president",list.get(0).getName());
}else {
break;
} }
} }
} }
dataList.add(objectMap); break;
} }
} }
dataList.add(objectMap);
} }
ServletOutputStream os = null; ServletOutputStream os = null;
List<Integer> columnWidths = new ArrayList<>(); List<Integer> columnWidths = new ArrayList<>();
...@@ -322,10 +352,10 @@ public class SalesOrderController extends BaseController{ ...@@ -322,10 +352,10 @@ public class SalesOrderController extends BaseController{
public ResponseData<String> deleteOrder(@RequestParam("id") String id){ public ResponseData<String> deleteOrder(@RequestParam("id") String id){
SalesOrder salesOrder = salesOrderMapper.selectById(id); SalesOrder salesOrder = salesOrderMapper.selectById(id);
String status = salesOrder.getStatus(); String status = salesOrder.getStatus().toString();
String orderPhone = salesOrder.getOrderPhone(); String orderPhone = salesOrder.getOrderPhone();
String salesSchool = salesOrder.getSalesSchool(); String salesSchool = salesOrder.getSalesSchool();
salesOrder.setDelFlag("1"); salesOrder.setDelFlag(1);
int num = salesOrderMapper.updateById(salesOrder); int num = salesOrderMapper.updateById(salesOrder);
if(num > 0) { if(num > 0) {
...@@ -543,7 +573,7 @@ public class SalesOrderController extends BaseController{ ...@@ -543,7 +573,7 @@ public class SalesOrderController extends BaseController{
order.setCreateTime(new Date()); order.setCreateTime(new Date());
order.setSalesSubst((String)map.get("salesSubst")); order.setSalesSubst((String)map.get("salesSubst"));
order.setSalesSchool((String)map.get("salesSchool")); order.setSalesSchool((String)map.get("salesSchool"));
order.setOrderType("1"); order.setOrderType(1);
order.setName((String)map.get("name")); order.setName((String)map.get("name"));
order.setAccount((String)map.get("account")); order.setAccount((String)map.get("account"));
...@@ -757,7 +787,7 @@ public class SalesOrderController extends BaseController{ ...@@ -757,7 +787,7 @@ public class SalesOrderController extends BaseController{
for(Map<String, Object> map : list) { for(Map<String, Object> map : list) {
SalesOrder order = new SalesOrder(); SalesOrder order = new SalesOrder();
order.setId((int)map.get("id")); order.setId((int)map.get("id"));
order.setStatus((String)map.get("status")); order.setStatus(Integer.valueOf(map.get("status").toString()));
order.setRemark((String)map.get("remark")); order.setRemark((String)map.get("remark"));
order.setAuditTime(new Date()); order.setAuditTime(new Date());
......
service-manager/src/main/java/com/winsun/controller/YxtOrderController.java
...@@ -260,15 +260,15 @@ public class YxtOrderController extends BaseController { ...@@ -260,15 +260,15 @@ public class YxtOrderController extends BaseController {
} }
} }
if (yxtOrders.size() < pageSize) { if (list.size() < pageSize) {
dataList = list; dataList = list;
} else { } else {
Integer endpageSize = (pageNo-1) == yxtOrders.size()/10?(pageNo-1)*pageSize+yxtOrders.size()%10:pageNo*pageSize; Integer endpageSize = (pageNo-1) == yxtOrders.size()/pageSize?(pageNo-1)*pageSize+yxtOrders.size()%pageSize:pageNo*pageSize;
dataList = list.subList((pageNo-1)*pageSize, endpageSize); dataList = list.subList((pageNo-1)*pageSize, endpageSize);
} }
page.setRecords(dataList); page.setRecords(dataList);
page.setTotal(yxtOrders.size()); page.setTotal(list.size());
return ResponseData.success(page, "查询成功！"); return ResponseData.success(page, "查询成功！");
} }
......
service-manager/src/main/java/com/winsun/controller/school/SchoolAllocationController.java
...@@ -84,7 +84,8 @@ public class SchoolAllocationController extends BaseController { ...@@ -84,7 +84,8 @@ public class SchoolAllocationController extends BaseController {
* @return * @return
*/ */
@Permission(menuname = "查询学校分配", value = "findByList", method = RequestMethod.POST) @Permission(menuname = "查询学校分配", value = "findByList", method = RequestMethod.POST)
public ResponseData<Page<Map<String,Object>>> listSchool(@RequestParam("account") String account, @RequestParam("name") String name, public ResponseData<Page<Map<String,Object>>> listSchool(
@RequestParam("account") String account, @RequestParam("name") String name,
@RequestParam("substName") String substName, @RequestParam("schoolName") String schoolName, @RequestParam("substName") String substName, @RequestParam("schoolName") String schoolName,
@RequestParam(name = "pageNo", required = false) int pageIndex, @RequestParam(name = "pageNo", required = false) int pageIndex,
@RequestParam(name = "pageSize", required = false) int pageSize) { @RequestParam(name = "pageSize", required = false) int pageSize) {
...@@ -123,7 +124,6 @@ public class SchoolAllocationController extends BaseController { ...@@ -123,7 +124,6 @@ public class SchoolAllocationController extends BaseController {
for(Map<String, Object> map : dataList) { for(Map<String, Object> map : dataList) {
int theSchoolId = Integer.parseInt((String)map.get("schoolId")); int theSchoolId = Integer.parseInt((String)map.get("schoolId"));
for(School school : schoolList) { for(School school : schoolList) {
if(school.getId() == theSchoolId) { if(school.getId() == theSchoolId) {
map.put("substName", school.getSubName()); map.put("substName", school.getSubName());
......
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