Reapply "fix:报税（零申报），收票导出添加列"

This reverts commit 3325c798a3627422422f29b659a4cab4b4630649.

src/main/java/cn/ezhizao/project/business/keepAccounts/controller/BizFinancialKeepAccountController.java

@@ -175,6 +175,8 @@ public class BizFinancialKeepAccountController extends BaseController {
                 l.setServiceName("");
             }else {
                 detail=details.get(0);
+                BizFinancialReportTaxDetail financialReportTaxDetail = financialReportTaxDetailService.query().eq("company_id", l.getCompanyId()).le("year", detail.getYear()).le("month", detail.getMonth()).orderByDesc("year").orderByDesc("month").last("limit 1").one();
+                l.setPreviousAnnualLosses(financialReportTaxDetail.getPreviousAnnualLosses());
                 List<BizWorkOrderRecord> records = bizWorkOrderRecordService.query().eq("work_order_id", l.getWorkOrderId()).eq("year", conditions.getYear()).eq("month", conditions.getMonth()).eq("from_id", 0).list();
                 if(records.size()>0){
                     SysUser sysUser = sysUserMapper.selectUserById(records.get(0).getRecorderId());

src/main/java/cn/ezhizao/project/business/keepAccounts/domain/BizFinancialKeepAccount.java

@@ -152,7 +152,9 @@ public class BizFinancialKeepAccount extends BaseEntity {
     private String finishUserName;
     @TableField(exist = false)
     private List<String> dateFilterFinish;
-
+    @TableField(exist = false)
+    @Excel(name = "可弥补之前年度的亏损", sort = 12)
+    private BigDecimal previousAnnualLosses;
     @TableField(exist = false)
     private String toTenantName;
 

src/main/java/cn/ezhizao/project/business/reportTax/controller/BizFinancialReportTaxNonZeroController.java

@@ -231,6 +231,7 @@ public class BizFinancialReportTaxNonZeroController extends BaseController {
             List<BizFinancialReportTaxDetailNonZero> details = financialReportTaxDetailService.getList(detail);
             l.setZero(l.getIsZero() == 1 ? "是" : "否");
             if (details.size() >0) {
+                l.setDetail(details.get(0));
                 detail=details.get(0);
                 SysUser sysUser = sysUserMapper.selectUserById(detail.getVerifierId());
                 l.setServiceName(sysUser==null?"":sysUser.getNickName());
@@ -254,6 +255,7 @@ public class BizFinancialReportTaxNonZeroController extends BaseController {
                 l.setStatusText("未开始");
                 l.setMakeOut("未填写");
             }
+
         }
         ExcelUtil<BizFinancialReportTaxNonZero> util = new ExcelUtil<BizFinancialReportTaxNonZero>(BizFinancialReportTaxNonZero.class);
         util.exportExcel(response, list, "报税非零申报数据");

src/main/java/cn/ezhizao/project/business/reportTax/domain/BizFinancialReportTaxNonZero.java

@@ -66,6 +66,7 @@ public class BizFinancialReportTaxNonZero extends BaseEntity {
     @TableField(exist = false)
     private List<BizFinancialReportTaxDetailNonZero> details;
     @TableField(exist = false)
+    @Excel(sort = 12 ,targetAttr = "previousAnnualLosses",name="可弥补之前年度的亏损")
     private BizFinancialReportTaxDetailNonZero detail;
 
     @Excel(name = "税号",sort = 3)