Skip to content

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

多表查询及分页代码修改

parent 4d9c6720
Showing with 12 additions and 183 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;
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.SalesOrder;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
@Mapper
@Component
......
service-manager/src/main/java/com/winsun/controller/LzKpiController.java
......@@ -299,7 +299,7 @@ public class LzKpiController extends BaseController {
if(lzKpis.size() < pageSize) {
dataList = list;
}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);
}
......
service-manager/src/main/java/com/winsun/controller/LzSalaryController.java
......@@ -391,7 +391,7 @@ public class LzSalaryController extends BaseController {
if(lzWages.size() < pageSize) {
dataList = list;
}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);
}
......
service-manager/src/main/java/com/winsun/controller/YxtOrderController.java
......@@ -260,15 +260,15 @@ public class YxtOrderController extends BaseController {
}
}
if (yxtOrders.size() < pageSize) {
if (list.size() < pageSize) {
dataList = list;
} 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);
}
page.setRecords(dataList);
page.setTotal(yxtOrders.size());
page.setTotal(list.size());
return ResponseData.success(page, "查询成功！");
}
......
service-manager/src/main/java/com/winsun/controller/school/SchoolAllocationController.java
......@@ -84,7 +84,8 @@ public class SchoolAllocationController extends BaseController {
* @return
*/
@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(name = "pageNo", required = false) int pageIndex,
@RequestParam(name = "pageSize", required = false) int pageSize) {
......@@ -123,7 +124,6 @@ public class SchoolAllocationController extends BaseController {
for(Map<String, Object> map : dataList) {
int theSchoolId = Integer.parseInt((String)map.get("schoolId"));
for(School school : schoolList) {
if(school.getId() == theSchoolId) {
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