Commit 100d53ce by 陶光胜

门店控件查询

parent 5954c0fc
...@@ -105,7 +105,11 @@ public class BaseSalesController { ...@@ -105,7 +105,11 @@ public class BaseSalesController {
} }
ServiceResponse<Page<BaseSalesDTO>> totalResponse = this.baseSalesApiService.pageBaseSales(dto); ServiceResponse<Page<BaseSalesDTO>> totalResponse = this.baseSalesApiService.pageBaseSales(dto);
log.info("totalResponse:{}", JSON.toJSONString(totalResponse)); log.info("totalResponse:{}", JSON.toJSONString(totalResponse));
this.goDownComponent.parseTotal(totalResponse, vo); if(qo.getDataType() == 2){
this.goDownComponent.parseTotal(totalResponse, vo, "单效");
} else {
this.goDownComponent.parseTotal(totalResponse, vo);
}
if(qo.getChannel().equals(StoreChannelEnum.OFFLINE.getChannel()) && qo.getLevel().equals(levelVo.getLevel()) && wgs == 1){ if(qo.getChannel().equals(StoreChannelEnum.OFFLINE.getChannel()) && qo.getLevel().equals(levelVo.getLevel()) && wgs == 1){
//无归属 //无归属
dto.setCountType(3); dto.setCountType(3);
......
...@@ -20,6 +20,8 @@ public class BaseSalesParamQo { ...@@ -20,6 +20,8 @@ public class BaseSalesParamQo {
private Integer sortType; private Integer sortType;
private Integer pageNum; private Integer pageNum;
private Integer pageSize; private Integer pageSize;
/**1基础业绩 2单效**/
private Integer dataType = 1;
public Integer getChannel() { public Integer getChannel() {
if(channel == null){ if(channel == null){
...@@ -131,4 +133,12 @@ public class BaseSalesParamQo { ...@@ -131,4 +133,12 @@ public class BaseSalesParamQo {
public void setPageSize(Integer pageSize) { public void setPageSize(Integer pageSize) {
this.pageSize = pageSize; this.pageSize = pageSize;
} }
public Integer getDataType() {
return dataType;
}
public void setDataType(Integer dataType) {
this.dataType = dataType;
}
} }
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