Merge branch 'wanghaicheng' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenanceRecordService.java

@@ -359,13 +359,23 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
     public RestResponse tofill(MaintenanceRecord entity) {
         //总计 partsCost, manCost, 拼接sparepart
         List<MtRecordCost> mtRecordCosts = entity.getMtRecordCosts();
+        //修复空指针异常，赋值默认值
         ArrayList<MtRecordCost> removeList = new ArrayList<>();
         for (MtRecordCost mtRecordCost : mtRecordCosts) {
             if (mtRecordCost.getSparepart() == null || "".equals(mtRecordCost.getSparepart())) {
                 removeList.add(mtRecordCost);
+                continue;
+            }
+            if (mtRecordCost.getManCost() == null) {
+                mtRecordCost.setManCost(new BigDecimal("0.00"));
+            }
+            if (mtRecordCost.getPartsCost() == null) {
+                mtRecordCost.setPartsCost(new BigDecimal("0.00"));
             }
         }
+        //将未设置零配件名字的从配件列表中移除
         mtRecordCosts.retainAll(removeList);
+
         if (IterUtil.isNotEmpty(mtRecordCosts)) {
             BigDecimal partsCost = mtRecordCosts.stream().map(MtRecordCost::getPartsCost).reduce(BigDecimal.ZERO, (m1, m2) -> m1.add(m2));
             BigDecimal manCost = mtRecordCosts.stream().map(MtRecordCost::getManCost).reduce(BigDecimal.ZERO, (m1, m2) -> m1.add(m2));