|
@@ -209,14 +209,11 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
|
|
rs.setPlanProcedureTotals(totals);
|
|
rs.setPlanProcedureTotals(totals);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if(planSteelStampNumbers.size()>0){
|
|
|
|
- List<PlanSteelStampNumber> list = planSteelStampNumbers.stream().filter(ps -> ps.getPlanId().equals(rs.getId())).collect(Collectors.toList());
|
|
|
|
- if(list.size()<=0){
|
|
|
|
- list.add(new PlanSteelStampNumber());
|
|
|
|
- }
|
|
|
|
- rs.setSteelStampNumberList(list);
|
|
|
|
-
|
|
|
|
|
|
+ List<PlanSteelStampNumber> list = planSteelStampNumbers.stream().filter(ps -> ps.getPlanId().equals(rs.getId())).collect(Collectors.toList());
|
|
|
|
+ if(list.size()<=0){
|
|
|
|
+ list.add(new PlanSteelStampNumber());
|
|
}
|
|
}
|
|
|
|
+ rs.setSteelStampNumberList(list);
|
|
if(rs.getPlanType()==1){
|
|
if(rs.getPlanType()==1){
|
|
BigDecimal bigDecimal=new BigDecimal(String.valueOf(rs.getMoneyOfJob()));
|
|
BigDecimal bigDecimal=new BigDecimal(String.valueOf(rs.getMoneyOfJob()));
|
|
bigDecimal=bigDecimal.multiply(new BigDecimal(String.valueOf(rs.getPlanWorkHour())));
|
|
bigDecimal=bigDecimal.multiply(new BigDecimal(String.valueOf(rs.getPlanWorkHour())));
|