Merge branch 'feature-bieao' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/service/PaymentService.java

@@ -111,13 +111,17 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
         List<Payment> deleteList = new ArrayList<>();
         //新增付款项
         List<Payment> insertList = paymentList.stream().filter(entry -> Objects.isNull(entry.getId())).collect(Collectors.toList());
-        //比较原有收款项
-        for (Payment payment : oldPaymentList) {
-            Optional<Payment> optional = paymentList.stream().filter(entry -> payment.getId().equals(entry.getId())).findFirst();
-            if (optional.isPresent()) {
-                updateList.add(payment);
-            } else {
-                deleteList.add(payment);
+        if (CollUtil.isEmpty(oldPaymentList)) {
+            updateList.addAll(paymentList);
+        } else {
+            //比较原有收款项
+            for (Payment payment : oldPaymentList) {
+                Optional<Payment> newPayment = paymentList.stream().filter(entry -> payment.getId().equals(entry.getId())).findFirst();
+                if (newPayment.isPresent()) {
+                    updateList.add(newPayment.get());
+                } else {
+                    deleteList.add(payment);
+                }
             }
         }
         if (CollUtil.isNotEmpty(deleteList)) {
@@ -138,7 +142,7 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
                 return RestResponse.fail(MessageUtils.get("msg.add.batch.fail"));
             }
         }
-        return RestResponse.success(MessageUtils.get("msg.modify.success"));
+        return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
     }
 
     /**

lift-business-service/src/main/java/cn/com/ty/lift/business/library/service/LiftService.java

@@ -440,7 +440,7 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
     public void export(ExportRequest request, HttpServletResponse response) {
         List<String> ids = request.getIds();
         List<Map<String, String>> liftList = exportList(ids);
-        ExcelWriter writer = ExcelUtil.getWriterWithSheet("电梯");
+        ExcelWriter writer = new ExcelWriter(true, "电梯");
         //设置列别名
         headsMap.forEach(writer::addHeaderAlias);
         String fileName = DateUtils.generateCode() + ".xlsx";

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

@@ -503,7 +503,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
     public void export(ExportRequest request, HttpServletResponse response) {
         List<String> ids = request.getIds();
         List<Map<String, String>> planList = exportList(ids);
-        ExcelWriter writer = ExcelUtil.getWriterWithSheet("维保计划");
+        ExcelWriter writer = new ExcelWriter(true, "维保计划");
         //设置列别名
         headsMap.forEach(writer::addHeaderAlias);
         String fileName = DateUtils.generateCode() + ".xlsx";

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectService.java

@@ -422,7 +422,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
         List<String> ids = request.getIds();
         List<Map<String, String>> projectList = exportList(ids);
         List<Map<String, String>> liftList = exportLiftList(ids);
-        ExcelWriter writer = ExcelUtil.getWriterWithSheet("项目");
+        ExcelWriter writer = new ExcelWriter(true,"项目");
         //设置列别名
         projectHeadsMap.forEach(writer::addHeaderAlias);
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");