1、添加四张表的数据预览（导出待做）

2、fixbug

atms-api/src/main/java/pwc/taxtech/atms/controller/DataPreviewController.java

@@ -55,6 +55,30 @@ public class DataPreviewController extends BaseController {
         return dataPreviewSerivceImpl.getBSDataForDisplay(param);
     }
 
+    @PostMapping("getIRDataForDisplay")
+    public PageInfo<InvoiceRecordDto> getIRDataForDisplay(@RequestBody InvoiceRecordParam param) {
+        logger.debug(String.format("发票记录表查询 Condition:%s", JSON.toJSONString(param)));
+        return dataPreviewSerivceImpl.getIRDataForDisplay(param);
+    }
+
+    @PostMapping("getRLITDataForDisplay")
+    public PageInfo<RedLetterInfoTableDto> getRLITDataForDisplay(@RequestBody RedLetterInfoTableParam param) {
+        logger.debug(String.format("红字信息表查询 Condition:%s", JSON.toJSONString(param)));
+        return dataPreviewSerivceImpl.getRLITDataForDisplay(param);
+    }
+
+    @PostMapping("getCPRDataForDisplay")
+    public PageInfo<CoupaPurchasingReportDto> getCPRDataForDisplay(@RequestBody CoupaPurchasingReportParam param) {
+        logger.debug(String.format("Coupa发票报告表查询 Condition:%s", JSON.toJSONString(param)));
+        return dataPreviewSerivceImpl.getCPRDataForDisplay(param);
+    }
+
+    @PostMapping("getCILDataForDisplay")
+    public PageInfo<CertifiedInvoicesListDto> getCILDataForDisplay(@RequestBody CertifiedInvoicesListParam param) {
+        logger.debug(String.format("已认证发票清单查询 Condition:%s", JSON.toJSONString(param)));
+        return dataPreviewSerivceImpl.getCILDataForDisplay(param);
+    }
+
     @RequestMapping(value = "exportCFData/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public void downloadCFQueryData(@RequestBody CashFlowParam param, HttpServletResponse response) {
         logger.debug("enter downloadCFQueryData");

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/CertifiedInvoicesListParam.java

+package pwc.taxtech.atms.dto.vatdto;
+
+import pwc.taxtech.atms.dpo.PagingDto;
+
+public class CertifiedInvoicesListParam {
+
+    private PagingDto pageInfo;
+
+    private String orgId;
+
+    private Integer periodStart;
+
+    private Integer periodEnd;
+
+    public Integer getPeriodStart() {
+        return periodStart;
+    }
+
+    public void setPeriodStart(Integer periodStart) {
+        this.periodStart = periodStart;
+    }
+
+    public Integer getPeriodEnd() {
+        return periodEnd;
+    }
+
+    public void setPeriodEnd(Integer periodEnd) {
+        this.periodEnd = periodEnd;
+    }
+
+    public String getOrgId() {
+        return this.orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
+    public PagingDto getPageInfo() {
+        return pageInfo;
+    }
+
+    public void setPageInfo(PagingDto pageInfo) {
+        this.pageInfo = pageInfo;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/CoupaPurchasingReportParam.java

+package pwc.taxtech.atms.dto.vatdto;
+
+import pwc.taxtech.atms.dpo.PagingDto;
+
+public class CoupaPurchasingReportParam {
+
+    private PagingDto pageInfo;
+
+    private String orgId;
+
+    private Integer periodStart;
+
+    private Integer periodEnd;
+
+    public Integer getPeriodStart() {
+        return periodStart;
+    }
+
+    public void setPeriodStart(Integer periodStart) {
+        this.periodStart = periodStart;
+    }
+
+    public Integer getPeriodEnd() {
+        return periodEnd;
+    }
+
+    public void setPeriodEnd(Integer periodEnd) {
+        this.periodEnd = periodEnd;
+    }
+
+    public String getOrgId() {
+        return this.orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
+    public PagingDto getPageInfo() {
+        return pageInfo;
+    }
+
+    public void setPageInfo(PagingDto pageInfo) {
+        this.pageInfo = pageInfo;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/InvoiceRecordParam.java

+package pwc.taxtech.atms.dto.vatdto;
+
+import pwc.taxtech.atms.dpo.PagingDto;
+
+public class InvoiceRecordParam {
+
+    private PagingDto pageInfo;
+
+    private String orgId;
+
+    private Integer periodStart;
+
+    private Integer periodEnd;
+
+    public Integer getPeriodStart() {
+        return periodStart;
+    }
+
+    public void setPeriodStart(Integer periodStart) {
+        this.periodStart = periodStart;
+    }
+
+    public Integer getPeriodEnd() {
+        return periodEnd;
+    }
+
+    public void setPeriodEnd(Integer periodEnd) {
+        this.periodEnd = periodEnd;
+    }
+
+    public String getOrgId() {
+        return this.orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
+    public PagingDto getPageInfo() {
+        return pageInfo;
+    }
+
+    public void setPageInfo(PagingDto pageInfo) {
+        this.pageInfo = pageInfo;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/RedLetterInfoTableParam.java

+package pwc.taxtech.atms.dto.vatdto;
+
+import pwc.taxtech.atms.dpo.PagingDto;
+
+public class RedLetterInfoTableParam {
+
+    private PagingDto pageInfo;
+
+    private String orgId;
+
+    private Integer periodStart;
+
+    private Integer periodEnd;
+
+    public Integer getPeriodStart() {
+        return periodStart;
+    }
+
+    public void setPeriodStart(Integer periodStart) {
+        this.periodStart = periodStart;
+    }
+
+    public Integer getPeriodEnd() {
+        return periodEnd;
+    }
+
+    public void setPeriodEnd(Integer periodEnd) {
+        this.periodEnd = periodEnd;
+    }
+
+    public String getOrgId() {
+        return this.orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
+    public PagingDto getPageInfo() {
+        return pageInfo;
+    }
+
+    public void setPageInfo(PagingDto pageInfo) {
+        this.pageInfo = pageInfo;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java

@@ -1561,9 +1561,9 @@ public class DataImportService extends BaseService {
     }
 
     private boolean isSheetEmpty(Sheet sheet) {
-        if (sheet.getLastRowNum() >0 &&
-                (null == sheet.getRow(0).getCell(0)||"Version".equals(sheet.getRow(0).getCell(0).getStringCellValue()))
-                &&null == sheet.getRow(0).getCell(2)) {
+        if (sheet.getLastRowNum() > 0 &&
+                (null == sheet.getRow(0).getCell(0) || "Version".equals(sheet.getRow(0).getCell(0).getStringCellValue())) &&
+                     null == sheet.getRow(0).getCell(2)) {
             return true;
         }
         return false;

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/CertifiedInvoicesListMapper.java

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
 import pwc.taxtech.atms.MyVatMapper;
+import pwc.taxtech.atms.vat.dpo.CertifiedInvoicesListCondition;
 import pwc.taxtech.atms.vat.entity.CertifiedInvoicesList;
 import pwc.taxtech.atms.vat.entity.CertifiedInvoicesListExample;
 
@@ -108,4 +109,5 @@ public interface CertifiedInvoicesListMapper extends MyVatMapper {
 
     int insertBatch(List<CertifiedInvoicesList> cils);
 
+    List<CertifiedInvoicesList> selectByCondition(@Param("cilCondition") CertifiedInvoicesListCondition condition);
 }
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/CoupaPurchasingReportMapper.java

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
 import pwc.taxtech.atms.MyVatMapper;
+import pwc.taxtech.atms.vat.dpo.CoupaPurchasingReportCondition;
 import pwc.taxtech.atms.vat.entity.CoupaPurchasingReport;
 import pwc.taxtech.atms.vat.entity.CoupaPurchasingReportExample;
 
@@ -107,4 +108,6 @@ public interface CoupaPurchasingReportMapper extends MyVatMapper {
     int updateByPrimaryKey(CoupaPurchasingReport record);
 
     int insertBatch(List<CoupaPurchasingReport> cprs);
+
+    List<CoupaPurchasingReport> selectByCondition(@Param("cprCondition") CoupaPurchasingReportCondition condition);
 }
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/InvoiceRecordMapper.java

@@ -5,6 +5,9 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
 import pwc.taxtech.atms.MyVatMapper;
+import pwc.taxtech.atms.vat.dpo.CashFlowCondition;
+import pwc.taxtech.atms.vat.dpo.InvoiceRecordCondition;
+import pwc.taxtech.atms.vat.entity.CashFlow;
 import pwc.taxtech.atms.vat.entity.InvoiceRecord;
 import pwc.taxtech.atms.vat.entity.InvoiceRecordExample;
 
@@ -106,6 +109,8 @@ public interface InvoiceRecordMapper extends MyVatMapper {
      */
     int updateByPrimaryKey(InvoiceRecord record);
 
+    List<InvoiceRecord> selectByCondition(@Param("irCondition") InvoiceRecordCondition condition);
+
     int insertBatch(List<InvoiceRecord> cils);
 
 }
\ No newline at end of file