问题优化

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -244,19 +244,21 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 finBillVehicleService.save(finBillVehicle);
             }
             //挂车开票信息
-            for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) {
-                FinBillTrailer finBillTrailer = new FinBillTrailer();
-                BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
-                finBillTrailer.setBillAppSid(finBillApplication.getSid());
-                for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
-                    if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())) {
-                        finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
-                        finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
-                        finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid());
-                        finBillTrailer.setOpenTickName(finBillVehicle.getOpenTickName());
+            if (finBillTrailers != null){
+                for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) {
+                    FinBillTrailer finBillTrailer = new FinBillTrailer();
+                    BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
+                    finBillTrailer.setBillAppSid(finBillApplication.getSid());
+                    for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
+                        if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())) {
+                            finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
+                            finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
+                            finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid());
+                            finBillTrailer.setOpenTickName(finBillVehicle.getOpenTickName());
+                        }
                     }
+                    finBillTrailerService.save(finBillTrailer);
                 }
-                finBillTrailerService.save(finBillTrailer);
             }
             //附件信息
             for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) {
@@ -1493,19 +1495,21 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillVehicleService.save(finBillVehicle);
         }
         finBillTrailerService.delByBillAppSid(dtoSid);
-        for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) {
-            FinBillTrailer finBillTrailer = new FinBillTrailer();
-            BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
-            finBillTrailer.setBillAppSid(dtoSid);
-            for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
-                if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())) {
-                    finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
-                    finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
-                    finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid());
-                    finBillTrailer.setOpenTickName(finBillVehicle.getOpenTickName());
+        if (finBillTrailers != null){
+            for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) {
+                FinBillTrailer finBillTrailer = new FinBillTrailer();
+                BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
+                finBillTrailer.setBillAppSid(dtoSid);
+                for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
+                    if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())) {
+                        finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
+                        finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
+                        finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid());
+                        finBillTrailer.setOpenTickName(finBillVehicle.getOpenTickName());
+                    }
                 }
+                finBillTrailerService.save(finBillTrailer);
             }
-            finBillTrailerService.save(finBillTrailer);
         }
         return rb.success().setMsg("修改成功").setData(dtoSid);
     }
@@ -1675,7 +1679,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             return rb.setMsg(resultBean.getMsg());
         }
         String businessSid = resultBean.getData();
-        FinBillApplication finBillApplication1 = fetchBySid(businessSid);
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。