提交

src/main/java/cn/ezhizao/project/business/order/domain/OrderExcelImportLoopModel.java

@@ -111,9 +111,9 @@ public class OrderExcelImportLoopModel {
     // 返税赠送月数
     @Excel(name = "返税赠送月数")
     private Integer returnTaxFreeMonth;
-    @Excel(name = "记账开始月")
+    @Excel(name = "返税开始月")
     private Date returnTaxStartMonth;
-    @Excel(name ="记账结束月")
+    @Excel(name ="返税结束月")
     private Date returnTaxEndMonth;
     // 返税总金额
     @Excel(name= "返税总金额")

src/main/java/cn/ezhizao/project/business/order/service/impl/BizArchiveInputServiceImpl.java

@@ -802,6 +802,7 @@ public class BizArchiveInputServiceImpl extends ServiceImpl<BizArchiveInputMappe
                     workOrder.setTenantId(tenantId);
                     int monthNum = (item.getKeepAccountMonth() == null ? 0 : item.getKeepAccountMonth()) + (item.getKeepAccountFreeMonth() == null ? 0 : item.getKeepAccountFreeMonth());
                     workOrder.setMonthNum(monthNum);
+                    bizWorkOrders.add(workOrder);
                 } else {
                     int monthNum = (item.getKeepAccountMonth() == null ? 0 : item.getKeepAccountMonth()) + (item.getKeepAccountFreeMonth() == null ? 0 : item.getKeepAccountFreeMonth());
                     workOrder.setMonthNum(workOrder.getMonthNum() + monthNum);

src/main/java/cn/ezhizao/project/business/recycleBin/controller/BizRecycleBinController.java

@@ -90,7 +90,7 @@ public class BizRecycleBinController extends BaseController {
 
     //订单关联的数据表
     @Getter
-    private String[] ordertabs = {"biz_archive_input_detail", "biz_archive_input_detail_process", "biz_work_order", "biz_work_order_detail"
+    private String[] ordertabs = {"biz_archive_input_detail", "biz_archive_input_detail_process", "biz_work_order", "biz_work_order_detail","biz_collection","biz_collection_detail"
 
     };