倍率统计报表算法调整

yb

21 小时以前 ec33a83aa39eedaf39675d4ef7be5f133f556846

倍率统计报表算法调整

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentMagnificationDto.java

@@ -24,10 +24,10 @@
    private String theDate;


    public MdcEquipmentMagnificationDto(String theDate, BigDecimal spindlebeilv, BigDecimal feedbeilv) {
    public MdcEquipmentMagnificationDto(String theDate,BigDecimal feedbeilv, BigDecimal spindlebeilv) {
        this.theDate = theDate;
        this.spindlebeilv = spindlebeilv;
        this.feedbeilv = feedbeilv;
        this.spindlebeilv = spindlebeilv;
    }

    public MdcEquipmentMagnificationDto() {

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentMagnificationServiceImpl.java

@@ -366,8 +366,8 @@
                            a.getSpindlebeilv().add(b.getSpindlebeilv()))).ifPresent(result::add);
                });
        for (MdcEquipmentMagnificationDto mdcEquipmentMagnificationDto : result) {
            mdcEquipmentMagnificationDto.setSpindlebeilv(mdcEquipmentMagnificationDto.getSpindlebeilv().divide(new BigDecimal(mdcMagnificationVos.size()), 2, RoundingMode.HALF_UP));
            mdcEquipmentMagnificationDto.setFeedbeilv(mdcEquipmentMagnificationDto.getFeedbeilv().divide(new BigDecimal(mdcMagnificationVos.size()), 2, RoundingMode.HALF_UP));
            mdcEquipmentMagnificationDto.setSpindlebeilv(mdcEquipmentMagnificationDto.getSpindlebeilv().divide(new BigDecimal(mdcMagnificationVos.size()), 2, RoundingMode.HALF_UP));
        }
        result.sort(Comparator.comparing(MdcEquipmentMagnificationDto::getTheDate));
        return result;