|
@@ -454,6 +454,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
|
report = BeanConverterUtil.copyObjectProperties(produceData, ProduceReport.class);
|
|
|
report.setDate(date);
|
|
|
report.setDataId(produceData.getId());
|
|
|
+ log.info(yearVO.getTotalValue());
|
|
|
report.setValue(new BigDecimal(yearVO.getTotalValue()).setScale(0,RoundingMode.HALF_UP).toString());
|
|
|
report.setYear(date.getYear());
|
|
|
report.setMonth(date.getMonthValue());
|
|
@@ -462,12 +463,13 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
|
this.saveModel(report);
|
|
|
|
|
|
// 本月耗用
|
|
|
- report.setMonth(date.getMonthValue());
|
|
|
+ month.setMonth(date.getMonthValue());
|
|
|
ProduceReportVO monthVO = this.sumMonthYear(month);
|
|
|
produceData = produceDataService.selectByNo(prefix + no + "_hy_month");
|
|
|
report = BeanConverterUtil.copyObjectProperties(produceData, ProduceReport.class);
|
|
|
report.setDate(date);
|
|
|
report.setDataId(produceData.getId());
|
|
|
+ log.info(monthVO.getTotalValue());
|
|
|
report.setValue(new BigDecimal(monthVO.getTotalValue()).setScale(0,RoundingMode.HALF_UP).toString());
|
|
|
report.setYear(date.getYear());
|
|
|
report.setMonth(date.getMonthValue());
|