Commit b78e2790 by guojuxing

单效取值配置:默认数据设置

parent 274ed71d
......@@ -3,6 +3,7 @@ package com.gic.enterprise.web.controller;
import java.util.List;
import java.util.stream.Collectors;
import com.gic.enterprise.web.vo.data.DataSingleEffectConfigVO;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -51,10 +52,7 @@ public class DataConfigController {
}
Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
List<DataActuallyPaidConfigDTO> dtoList = JSON.parseArray(jsonArr, DataActuallyPaidConfigDTO.class);
dtoList = dtoList
.stream()
.map(e -> e.setEnterpriseId(enterpriseId))
.collect(Collectors.toList());
dtoList = dtoList.stream().map(e -> e.setEnterpriseId(enterpriseId)).collect(Collectors.toList());
return OperationResultUtils.operationResult(dataConfigApiService.configActuallyPaid(dtoList),
OperationResultUtils.LOG_EDIT + "数据统计配置-实付配置",
UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseName());
......@@ -62,8 +60,9 @@ public class DataConfigController {
@RequestMapping("/get-actually-paid-config")
public RestResponse getActuallyPaidConfig() {
return ResultControllerUtils.commonResult(dataConfigApiService
.listActuallyPaidConfig(UserDetailUtils.getUserDetail().getEnterpriseId()), ActuallyPaidConfigVO.class);
return ResultControllerUtils.commonResult(
dataConfigApiService.listActuallyPaidConfig(UserDetailUtils.getUserDetail().getEnterpriseId()),
ActuallyPaidConfigVO.class);
}
@RequestMapping("/config-single-effect")
......@@ -76,7 +75,8 @@ public class DataConfigController {
@RequestMapping("/get-single-effect-config")
public RestResponse getSingleEffectConfig() {
return ResultControllerUtils.commonResult(dataConfigApiService
.getSingleEffectConfig(UserDetailUtils.getUserDetail().getEnterpriseId()));
return ResultControllerUtils.commonResult(
dataConfigApiService.getSingleEffectConfig(UserDetailUtils.getUserDetail().getEnterpriseId()),
DataSingleEffectConfigVO.class);
}
}
package com.gic.enterprise.web.vo.data;
import java.io.Serializable;
public class DataSingleEffectConfigVO implements Serializable{
private static final long serialVersionUID = 2186479171518586895L;
/**
* 单效销售额 指标 1:『应付总额』or『实付总额』2:『销售单应付总额』 or『销售单实付总额』 3:有效应付额』 or『有效实付额』
*/
private Integer sale;
/**
* 单效吊牌价 1:『吊牌价总额』 2:『销售单吊牌价』 3:『有效吊牌价』
*/
private Integer tag;
/**
* 单效订单数 1:『订单总数』 2:『销售单数』 3:『有效订单数』 4:『成交单数』
*/
private Integer orderNumber;
/**
* 单效销售件数 是否剔除物料,默认是 1:是 0:否
*/
private Integer saleNumber;
/**
* 单效销售件数 1:『净销售件数』 2:『销售件数』3:『有效销售件数』
*/
private Integer saleNumberTarget;
public Integer getSale() {
return sale;
}
public DataSingleEffectConfigVO setSale(Integer sale) {
this.sale = sale;
return this;
}
public Integer getTag() {
return tag;
}
public DataSingleEffectConfigVO setTag(Integer tag) {
this.tag = tag;
return this;
}
public Integer getOrderNumber() {
return orderNumber;
}
public DataSingleEffectConfigVO setOrderNumber(Integer orderNumber) {
this.orderNumber = orderNumber;
return this;
}
public Integer getSaleNumber() {
return saleNumber;
}
public DataSingleEffectConfigVO setSaleNumber(Integer saleNumber) {
this.saleNumber = saleNumber;
return this;
}
public Integer getSaleNumberTarget() {
return saleNumberTarget;
}
public DataSingleEffectConfigVO setSaleNumberTarget(Integer saleNumberTarget) {
this.saleNumberTarget = saleNumberTarget;
return this;
}
}
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