单耗和月均单耗重新计算

platform-service/src/main/java/com/platform/service/produce/impl/ProduceReportServiceImpl.java

@@ -698,7 +698,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
             if(StringUtils.isBlank(cs077.getValue()) || new BigDecimal(cs077.getValue()).compareTo(new BigDecimal(0))==0){
                 danhao.setValue("0");
             }else{
-                danhao.setValue(total.divide(new BigDecimal(cs077.getValue())).setScale(2,RoundingMode.HALF_UP).toString());
+                danhao.setValue(total.divide(new BigDecimal(cs077.getValue()), RoundingMode.HALF_UP).multiply(new BigDecimal(0.3)).setScale(2,RoundingMode.HALF_UP).toString());
             }
             this.modModelByPrimaryKey(danhao);
 
@@ -712,9 +712,10 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
                     .andEqualTo(ProduceReport::getDate, date);
             ProduceReport danhaoMonth = mapper.selectOneByExample(weekendHyoMonth);
 
+            log.info("no: " +no);
             Weekend<ProduceReport> weekendDanhaoMonth = new Weekend<>(ProduceReport.class);
             WeekendCriteria<ProduceReport, Object> weekendCriteriaDanhaoMonth = weekendDanhaoMonth.weekendCriteria();
-            weekendCriteriaDanhaoMonth.andEqualTo(ProduceReport::getNo, "dl_" + no.replace("_hy", "_hy_month"))
+            weekendCriteriaDanhaoMonth.andEqualTo(ProduceReport::getNo, "ck_" + no.replace("_hy", "_hy_month"))
                     .andEqualTo(ProduceReport::getYear, date.getYear())
                     .andEqualTo(ProduceReport::getMonth, date.getMonthValue())
                     .andEqualTo(ProduceReport::getDay, date.getDayOfMonth())
@@ -733,7 +734,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
             if(StringUtils.isBlank(cs077Month.getValue()) || new BigDecimal(cs077Month.getValue()).compareTo(new BigDecimal(0))==0){
                 danhaoMonth.setValue("0");
             }else{
-                danhaoMonth.setValue(new BigDecimal(month.getValue()).divide(new BigDecimal(cs077Month.getValue())).setScale(2,RoundingMode.HALF_UP).toString());
+                danhaoMonth.setValue(new BigDecimal(month.getValue()).divide(new BigDecimal(cs077Month.getValue()), RoundingMode.HALF_UP).multiply(new BigDecimal(0.3)).setScale(2,RoundingMode.HALF_UP).toString());
             }
             this.modModelByPrimaryKey(danhaoMonth);
         } else {