|
@@ -425,7 +425,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
|
ProduceReport report = BeanConverterUtil.copyObjectProperties(produceData, ProduceReport.class);
|
|
|
report.setDate(date);
|
|
|
report.setDataId(produceData.getId());
|
|
|
- report.setValue(produceRecord.getNum().toString());
|
|
|
+ report.setValue(produceRecord.getNum().setScale(0,RoundingMode.HALF_UP).toString());
|
|
|
report.setYear(date.getYear());
|
|
|
report.setMonth(date.getMonthValue());
|
|
|
report.setDay(date.getDayOfMonth());
|
|
@@ -437,7 +437,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
|
report = BeanConverterUtil.copyObjectProperties(produceData, ProduceReport.class);
|
|
|
report.setDate(date);
|
|
|
report.setDataId(produceData.getId());
|
|
|
- report.setValue(produceRecord.getNum().toString());
|
|
|
+ report.setValue(produceRecord.getNum().setScale(0,RoundingMode.HALF_UP).toString());
|
|
|
report.setYear(date.getYear());
|
|
|
report.setMonth(date.getMonthValue());
|
|
|
report.setDay(date.getDayOfMonth());
|
|
@@ -454,7 +454,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
|
report = BeanConverterUtil.copyObjectProperties(produceData, ProduceReport.class);
|
|
|
report.setDate(date);
|
|
|
report.setDataId(produceData.getId());
|
|
|
- report.setValue(yearVO.getTotalValue());
|
|
|
+ report.setValue(new BigDecimal(yearVO.getTotalValue()).setScale(0,RoundingMode.HALF_UP).toString());
|
|
|
report.setYear(date.getYear());
|
|
|
report.setMonth(date.getMonthValue());
|
|
|
report.setDay(date.getDayOfMonth());
|
|
@@ -468,7 +468,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
|
report = BeanConverterUtil.copyObjectProperties(produceData, ProduceReport.class);
|
|
|
report.setDate(date);
|
|
|
report.setDataId(produceData.getId());
|
|
|
- report.setValue(monthVO.getTotalValue());
|
|
|
+ report.setValue(new BigDecimal(monthVO.getTotalValue()).setScale(0,RoundingMode.HALF_UP).toString());
|
|
|
report.setYear(date.getYear());
|
|
|
report.setMonth(date.getMonthValue());
|
|
|
report.setDay(date.getDayOfMonth());
|
|
@@ -488,9 +488,9 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
|
dayScl.setValue("1");
|
|
|
} else {
|
|
|
if (new BigDecimal(dayScl.getValue()).compareTo(new BigDecimal("0")) == 0) {
|
|
|
- report.setValue(produceRecord.getNum().setScale(2, RoundingMode.HALF_UP).toString());
|
|
|
+ report.setValue(produceRecord.getNum().setScale(0, RoundingMode.HALF_UP).toString());
|
|
|
} else {
|
|
|
- BigDecimal hyDayValue = new BigDecimal(produceRecord.getNum().toString()).divide(new BigDecimal(dayScl.getValue()).multiply(new BigDecimal(0.3)), BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(1000)).setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
+ BigDecimal hyDayValue = new BigDecimal(produceRecord.getNum().toString()).divide(new BigDecimal(dayScl.getValue()).multiply(new BigDecimal(0.3)), BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(1000)).setScale(0, BigDecimal.ROUND_HALF_UP);
|
|
|
report.setValue(hyDayValue.toString());
|
|
|
}
|
|
|
}
|
|
@@ -511,9 +511,9 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
|
monthScl.setValue("1");
|
|
|
} else {
|
|
|
if (new BigDecimal(monthScl.getValue()).compareTo(new BigDecimal("0")) == 0) {
|
|
|
- report.setValue(monthVO.getTotalValue());
|
|
|
+ report.setValue(new BigDecimal(monthVO.getTotalValue()).setScale(0, RoundingMode.HALF_UP).toString());
|
|
|
} else {
|
|
|
- BigDecimal hyDayValue = new BigDecimal(monthVO.getTotalValue()).divide(new BigDecimal(monthScl.getValue()).multiply(new BigDecimal(0.3)), BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(1000)).setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
+ BigDecimal hyDayValue = new BigDecimal(monthVO.getTotalValue()).divide(new BigDecimal(monthScl.getValue()).multiply(new BigDecimal(0.3)), BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(1000)).setScale(0, BigDecimal.ROUND_HALF_UP);
|
|
|
report.setValue(hyDayValue.toString());
|
|
|
}
|
|
|
}
|