|
@@ -686,9 +686,16 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
|
.andEqualTo(ProduceReport::getDate, date);
|
|
|
ProduceReport danhao = mapper.selectOneByExample(weekendDanhao);
|
|
|
|
|
|
+ // 默认977
|
|
|
+ String sclNo = "scl_0300027";
|
|
|
+ BigDecimal rate = new BigDecimal(0.3);
|
|
|
+ if(no.equals("0100010_hy") || no.equals("0100065_hy")|| no.equals("0100120_hy")|| no.equals("0100160_hy")|| no.equals("0100086_hy")) {
|
|
|
+ sclNo = "scl_0600032";// 902
|
|
|
+ rate = new BigDecimal(1);
|
|
|
+ }
|
|
|
Weekend<ProduceReport> weekend977 = new Weekend<>(ProduceReport.class);
|
|
|
WeekendCriteria<ProduceReport, Object> weekendCriteria977 = weekend977.weekendCriteria();
|
|
|
- weekendCriteria977.andEqualTo(ProduceReport::getNo, "scl_0600032")
|
|
|
+ weekendCriteria977.andEqualTo(ProduceReport::getNo, sclNo)
|
|
|
.andEqualTo(ProduceReport::getYear, date.getYear())
|
|
|
.andEqualTo(ProduceReport::getMonth, date.getMonthValue())
|
|
|
.andEqualTo(ProduceReport::getDay, date.getDayOfMonth())
|
|
@@ -698,7 +705,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()), RoundingMode.HALF_UP).multiply(new BigDecimal(0.3)).setScale(2,RoundingMode.HALF_UP).toString());
|
|
|
+ danhao.setValue(total.divide(new BigDecimal(cs077.getValue()), RoundingMode.HALF_UP).multiply(rate).setScale(2,RoundingMode.HALF_UP).toString());
|
|
|
}
|
|
|
this.modModelByPrimaryKey(danhao);
|
|
|
|
|
@@ -724,7 +731,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
|
|
|
|
Weekend<ProduceReport> weekend977Month = new Weekend<>(ProduceReport.class);
|
|
|
WeekendCriteria<ProduceReport, Object> weekendCriteria977Month = weekend977Month.weekendCriteria();
|
|
|
- weekendCriteria977Month.andEqualTo(ProduceReport::getNo, "scl_0600032_month")
|
|
|
+ weekendCriteria977Month.andEqualTo(ProduceReport::getNo, sclNo + "_month")
|
|
|
.andEqualTo(ProduceReport::getYear, date.getYear())
|
|
|
.andEqualTo(ProduceReport::getMonth, date.getMonthValue())
|
|
|
.andEqualTo(ProduceReport::getDay, date.getDayOfMonth())
|
|
@@ -734,7 +741,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()), RoundingMode.HALF_UP).multiply(new BigDecimal(0.3)).setScale(2,RoundingMode.HALF_UP).toString());
|
|
|
+ danhaoMonth.setValue(new BigDecimal(month.getValue()).divide(new BigDecimal(cs077Month.getValue()), RoundingMode.HALF_UP).multiply(rate).setScale(2,RoundingMode.HALF_UP).toString());
|
|
|
}
|
|
|
this.modModelByPrimaryKey(danhaoMonth);
|
|
|
} else {
|