|
|
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
|
|
|
import lombok.Data;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.math.RoundingMode;
|
|
|
|
|
|
@Data
|
|
|
public class RetailProportion {
|
|
|
@@ -48,15 +49,15 @@ public class RetailProportion {
|
|
|
}
|
|
|
|
|
|
public void setProportion(double disrate1,double disrate2,double disrate3){
|
|
|
- this.jqRetailLevel1Proportion = new BigDecimal(disrate1);
|
|
|
- this.jqRetailLevel2Proportion = new BigDecimal(disrate2);
|
|
|
- this.jqRetailLevel3Proportion = new BigDecimal(disrate3);
|
|
|
- this.syRetailLevel1Proportion = new BigDecimal(disrate1);
|
|
|
- this.syRetailLevel2Proportion = new BigDecimal(disrate2);
|
|
|
- this.syRetailLevel3Proportion = new BigDecimal(disrate3);
|
|
|
- this.noRetailLevel1Proportion = new BigDecimal(disrate1);
|
|
|
- this.noRetailLevel2Proportion = new BigDecimal(disrate2);
|
|
|
- this.noRetailLevel3Proportion = new BigDecimal(disrate3);
|
|
|
+ this.jqRetailLevel1Proportion = new BigDecimal(disrate1).setScale(5, RoundingMode.DOWN);
|
|
|
+ this.jqRetailLevel2Proportion = new BigDecimal(disrate2).setScale(5, RoundingMode.DOWN);
|
|
|
+ this.jqRetailLevel3Proportion = new BigDecimal(disrate3).setScale(5, RoundingMode.DOWN);
|
|
|
+ this.syRetailLevel1Proportion = new BigDecimal(disrate1).setScale(5, RoundingMode.DOWN);
|
|
|
+ this.syRetailLevel2Proportion = new BigDecimal(disrate2).setScale(5, RoundingMode.DOWN);
|
|
|
+ this.syRetailLevel3Proportion = new BigDecimal(disrate3).setScale(5, RoundingMode.DOWN);
|
|
|
+ this.noRetailLevel1Proportion = new BigDecimal(disrate1).setScale(5, RoundingMode.DOWN);
|
|
|
+ this.noRetailLevel2Proportion = new BigDecimal(disrate2).setScale(5, RoundingMode.DOWN);
|
|
|
+ this.noRetailLevel3Proportion = new BigDecimal(disrate3).setScale(5, RoundingMode.DOWN);
|
|
|
}
|
|
|
|
|
|
public void setProportion(ReCalcuLateProportion jqReCalcuLateProportion,ReCalcuLateProportion syReCalcuLateProportion,ReCalcuLateProportion noReCalcuLateProportion){
|