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/dto/vatdto/dd/CashFlowDto.java

 package pwc.taxtech.atms.dto.vatdto.dd;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import pwc.taxtech.atms.common.util.PwCIdSerialize;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -14,6 +17,7 @@ public class CashFlowDto implements Serializable {
      *
      * @mbg.generated
      */
+     @JsonSerialize(using = PwCIdSerialize.class)
      private Long id;
 
     /**

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-api/src/main/java/pwc/taxtech/atms/service/impl/DataPreviewSerivceImpl.java

@@ -44,19 +44,29 @@ public class DataPreviewSerivceImpl extends BaseService {
 
     @Resource
     private CashFlowMapper cashFlowMapper;
+
+    @Resource
+    private InvoiceRecordMapper invoiceRecordMapper;
+
+    @Resource
+    private RedLetterInfoTableMapper redLetterInfoTableMapper;
+
+    @Resource
+    private CoupaPurchasingReportMapper coupaPurchasingReportMapper;
+
+    @Resource
+    private CertifiedInvoicesListMapper certifiedInvoicesListMapper;
+
     @Resource
     private OrganizationMapper organizationMapper;
 
 
     public PageInfo<TrialBalanceDto> getTBDataForDisplay(TrialBalanceParam param) {
 
-        TrialBalanceCondition condition = new TrialBalanceCondition();
-        beanUtil.copyProperties(param, condition);
-
-        PageHelper.startPage(condition.getPageInfo().getPageIndex(), condition.getPageInfo().getPageSize());
+        TrialBalanceCondition condition = beanUtil.copyProperties(param, new TrialBalanceCondition());
 
+        Page page = PageHelper.startPage(condition.getPageInfo().getPageIndex(), condition.getPageInfo().getPageSize());
         List<TrialBalance> trialBalances = trialBalanceMapper.selectByCondition(condition);
-
         List<TrialBalanceDto> trialBalanceDtos = Lists.newArrayList();
 
         trialBalances.forEach(tb -> {
@@ -65,18 +75,19 @@ public class DataPreviewSerivceImpl extends BaseService {
             trialBalanceDtos.add(trialBalanceDto);
         });
 
-        return new PageInfo<>(trialBalanceDtos);
+        PageInfo<TrialBalanceDto> pageInfo =new PageInfo<>(trialBalanceDtos);
+        pageInfo.setTotal(page.getTotal());
+        pageInfo.setPageNum(param.getPageInfo().getPageIndex());
+
+        return pageInfo;
     }
 
     public PageInfo<ProfitLossStatementDto> getPLDataForDisplay(ProfitLossStatementParam param) {
 
-        ProfitLossStatementCondition condition = new ProfitLossStatementCondition();
-        beanUtil.copyProperties(param, condition);
-
-        PageHelper.startPage(condition.getPageInfo().getPageIndex(), condition.getPageInfo().getPageSize());
+        ProfitLossStatementCondition condition = beanUtil.copyProperties(param, new ProfitLossStatementCondition());
 
+        Page page = PageHelper.startPage(condition.getPageInfo().getPageIndex(), condition.getPageInfo().getPageSize());
         List<ProfitLossStatement> profitLossStatements = profitLossStatementMapper.selectByCondition(condition);
-
         List<ProfitLossStatementDto> profitLossDtos = Lists.newArrayList();
 
         profitLossStatements.forEach(pl -> {
@@ -85,7 +96,11 @@ public class DataPreviewSerivceImpl extends BaseService {
             profitLossDtos.add(profitLossDto);
         });
 
-        return new PageInfo<>(profitLossDtos);
+        PageInfo<ProfitLossStatementDto> pageInfo =new PageInfo<>(profitLossDtos);
+        pageInfo.setTotal(page.getTotal());
+        pageInfo.setPageNum(param.getPageInfo().getPageIndex());
+
+        return pageInfo;
     }
 
     public PageInfo<CashFlowDto> getCFDataForDisplay(CashFlowParam param) {
@@ -146,13 +161,10 @@ public class DataPreviewSerivceImpl extends BaseService {
 
     public PageInfo<JournalEntryDto> getJEDataForDisplay(JournalEntryParam param) {
 
-        JournalEntryCondition condition = new JournalEntryCondition();
-        beanUtil.copyProperties(param, condition);
-
-        PageHelper.startPage(condition.getPageInfo().getPageIndex(), condition.getPageInfo().getPageSize());
+        JournalEntryCondition condition = beanUtil.copyProperties(param, new JournalEntryCondition());
 
+        Page page = PageHelper.startPage(condition.getPageInfo().getPageIndex(), condition.getPageInfo().getPageSize());
         List<JournalEntry> journalEntrys = journalEntryMapper.selectByCondition(condition);
-
         List<JournalEntryDto> journalEntryDtos = Lists.newArrayList();
 
         journalEntrys.forEach(je -> {
@@ -161,18 +173,19 @@ public class DataPreviewSerivceImpl extends BaseService {
             journalEntryDtos.add(journalEntryDto);
         });
 
-        return new PageInfo<>(journalEntryDtos);
+        PageInfo<JournalEntryDto> pageInfo =new PageInfo<>(journalEntryDtos);
+        pageInfo.setTotal(page.getTotal());
+        pageInfo.setPageNum(param.getPageInfo().getPageIndex());
+
+        return pageInfo;
     }
 
     public PageInfo<BalanceSheetDto> getBSDataForDisplay(BalanceSheetParam param) {
 
-        BalanceSheetCondition condition = new BalanceSheetCondition();
-        beanUtil.copyProperties(param, condition);
-
-        PageHelper.startPage(condition.getPageInfo().getPageIndex(), condition.getPageInfo().getPageSize());
+        BalanceSheetCondition condition = beanUtil.copyProperties(param, new BalanceSheetCondition());
 
+        Page page = PageHelper.startPage(condition.getPageInfo().getPageIndex(), condition.getPageInfo().getPageSize());
         List<BalanceSheet> balanceSheets = balanceSheetMapper.selectByCondition(condition);
-
         List<BalanceSheetDto> balanceSheetDtos = Lists.newArrayList();
 
         balanceSheets.forEach(bs -> {
@@ -181,7 +194,95 @@ public class DataPreviewSerivceImpl extends BaseService {
             balanceSheetDtos.add(balanceSheetDto);
         });
 
-        return new PageInfo<>(balanceSheetDtos);
+        PageInfo<BalanceSheetDto> pageInfo =new PageInfo<>(balanceSheetDtos);
+        pageInfo.setTotal(page.getTotal());
+        pageInfo.setPageNum(param.getPageInfo().getPageIndex());
+
+        return pageInfo;
+    }
+
+    public PageInfo<InvoiceRecordDto> getIRDataForDisplay(InvoiceRecordParam param) {
+
+        InvoiceRecordCondition condition = beanUtil.copyProperties(param, new InvoiceRecordCondition());
+
+        Page page = PageHelper.startPage(condition.getPageInfo().getPageIndex(), condition.getPageInfo().getPageSize());
+
+        List<InvoiceRecord> invoiceRecords = invoiceRecordMapper.selectByCondition(condition);
+
+        List<InvoiceRecordDto> invoiceRecordDtos = Lists.newArrayList();
+
+        invoiceRecords.forEach(bs -> {
+            InvoiceRecordDto balanceSheetDto = beanUtil.copyProperties(bs, new InvoiceRecordDto());
+            invoiceRecordDtos.add(balanceSheetDto);
+        });
+
+        PageInfo<InvoiceRecordDto> pageInfo =new PageInfo<>(invoiceRecordDtos);
+        pageInfo.setTotal(page.getTotal());
+        pageInfo.setPageNum(param.getPageInfo().getPageIndex());
+
+        return pageInfo;
+    }
+
+    public PageInfo<RedLetterInfoTableDto> getRLITDataForDisplay(RedLetterInfoTableParam param) {
+
+        RedLetterInfoTableCondition condition = beanUtil.copyProperties(param, new RedLetterInfoTableCondition());
+
+        Page page = PageHelper.startPage(condition.getPageInfo().getPageIndex(), condition.getPageInfo().getPageSize());
+
+        List<RedLetterInfoTable> redLetterInfoTables = redLetterInfoTableMapper.selectByCondition(condition);
+        List<RedLetterInfoTableDto> redLetterInfoDtos = Lists.newArrayList();
+
+        redLetterInfoTables.forEach(bs -> {
+            RedLetterInfoTableDto redLetterInfoDto = beanUtil.copyProperties(bs, new RedLetterInfoTableDto());
+            redLetterInfoDtos.add(redLetterInfoDto);
+        });
+
+        PageInfo<RedLetterInfoTableDto> pageInfo =new PageInfo<>(redLetterInfoDtos);
+        pageInfo.setTotal(page.getTotal());
+        pageInfo.setPageNum(param.getPageInfo().getPageIndex());
+
+        return pageInfo;
+    }
+
+
+    public PageInfo<CoupaPurchasingReportDto> getCPRDataForDisplay(CoupaPurchasingReportParam param) {
+
+        CoupaPurchasingReportCondition condition = beanUtil.copyProperties(param, new CoupaPurchasingReportCondition());
+
+        Page page = PageHelper.startPage(condition.getPageInfo().getPageIndex(), condition.getPageInfo().getPageSize());
+
+        List<CoupaPurchasingReport> coupaPurchasingReports = coupaPurchasingReportMapper.selectByCondition(condition);
+        List<CoupaPurchasingReportDto> coupaPurchasingReportDtos = Lists.newArrayList();
+
+        coupaPurchasingReports.forEach(cpr -> {
+            CoupaPurchasingReportDto coupaPurchasingReportDto = beanUtil.copyProperties(cpr, new CoupaPurchasingReportDto());
+            coupaPurchasingReportDtos.add(coupaPurchasingReportDto);
+        });
+
+        PageInfo<CoupaPurchasingReportDto> pageInfo =new PageInfo<>(coupaPurchasingReportDtos);
+        pageInfo.setTotal(page.getTotal());
+        pageInfo.setPageNum(param.getPageInfo().getPageIndex());
+
+        return pageInfo;
+    }
+
+
+    public PageInfo<CertifiedInvoicesListDto> getCILDataForDisplay(CertifiedInvoicesListParam param) {
+
+        CertifiedInvoicesListCondition condition = beanUtil.copyProperties(param, new CertifiedInvoicesListCondition());
+
+        Page page = PageHelper.startPage(condition.getPageInfo().getPageIndex(), condition.getPageInfo().getPageSize());
+        List<CertifiedInvoicesList> certifiedInvoicesLists = certifiedInvoicesListMapper.selectByCondition(condition);
+        List<CertifiedInvoicesListDto> certifiedInvoicesListDtos = Lists.newArrayList();
+
+        certifiedInvoicesLists.forEach(cil -> {
+            CertifiedInvoicesListDto CertifiedInvoicesListDto = beanUtil.copyProperties(cil, new CertifiedInvoicesListDto());
+            certifiedInvoicesListDtos.add(CertifiedInvoicesListDto);
+        });
+        PageInfo<CertifiedInvoicesListDto> pageInfo =new PageInfo<>(certifiedInvoicesListDtos);
+        pageInfo.setTotal(page.getTotal());
+        pageInfo.setPageNum(param.getPageInfo().getPageIndex());
+        return pageInfo;
     }
 
     public int getTBDownloadFilePath(TrialBalanceParam param, OutputStream os) {

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

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/RedLetterInfoTableMapper.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.RedLetterInfoTableCondition;
 import pwc.taxtech.atms.vat.entity.RedLetterInfoTable;
 import pwc.taxtech.atms.vat.entity.RedLetterInfoTableExample;
 
@@ -107,4 +108,6 @@ public interface RedLetterInfoTableMapper extends MyVatMapper {
     int updateByPrimaryKey(RedLetterInfoTable record);
 
     int insertBatch(List<RedLetterInfoTable> rlits);
+
+    List<RedLetterInfoTable> selectByCondition(@Param("rlitCondition") RedLetterInfoTableCondition condition);
 }
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/vat/dpo/CertifiedInvoicesListCondition.java

+package pwc.taxtech.atms.vat.dpo;
+
+import pwc.taxtech.atms.dpo.PagingDto;
+
+public class CertifiedInvoicesListCondition {
+
+    private PagingDto pageInfo;
+
+    private String orgId;
+
+    private Integer periodStart;
+
+    private Integer periodEnd;
+
+    public PagingDto getPageInfo() {
+        return pageInfo;
+    }
+
+    public void setPageInfo(PagingDto pageInfo) {
+        this.pageInfo = pageInfo;
+    }
+
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
+    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;
+    }
+}

atms-dao/src/main/java/pwc/taxtech/atms/vat/dpo/CoupaPurchasingReportCondition.java

+package pwc.taxtech.atms.vat.dpo;
+
+import pwc.taxtech.atms.dpo.PagingDto;
+
+public class CoupaPurchasingReportCondition {
+
+    private PagingDto pageInfo;
+
+    private String orgId;
+
+    private Integer periodStart;
+
+    private Integer periodEnd;
+
+    public PagingDto getPageInfo() {
+        return pageInfo;
+    }
+
+    public void setPageInfo(PagingDto pageInfo) {
+        this.pageInfo = pageInfo;
+    }
+
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
+    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;
+    }
+}

atms-dao/src/main/java/pwc/taxtech/atms/vat/dpo/InvoiceRecordCondition.java

+package pwc.taxtech.atms.vat.dpo;
+
+import pwc.taxtech.atms.dpo.PagingDto;
+
+public class InvoiceRecordCondition {
+
+    private PagingDto pageInfo;
+
+    private String orgId;
+
+    private Integer periodStart;
+
+    private Integer periodEnd;
+
+    public PagingDto getPageInfo() {
+        return pageInfo;
+    }
+
+    public void setPageInfo(PagingDto pageInfo) {
+        this.pageInfo = pageInfo;
+    }
+
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
+    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;
+    }
+}

atms-dao/src/main/java/pwc/taxtech/atms/vat/dpo/RedLetterInfoTableCondition.java

+package pwc.taxtech.atms.vat.dpo;
+
+import pwc.taxtech.atms.dpo.PagingDto;
+
+public class RedLetterInfoTableCondition {
+
+    private PagingDto pageInfo;
+
+    private String orgId;
+
+    private Integer periodStart;
+
+    private Integer periodEnd;
+
+    public PagingDto getPageInfo() {
+        return pageInfo;
+    }
+
+    public void setPageInfo(PagingDto pageInfo) {
+        this.pageInfo = pageInfo;
+    }
+
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
+    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;
+    }
+}

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/BalanceSheetExtendsMapper.xml

@@ -5,7 +5,7 @@
   <sql id="QueryCondition">
     1 = 1
     <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(bsCondition.orgId)">
-      AND organization_id= #{bsCondition.orgId,jdbcType=INTEGER}
+      AND organization_id= #{bsCondition.orgId,jdbcType=VARCHAR}
     </if>
     <if test="bsCondition.periodStart!=null">
       AND period &gt;= #{bsCondition.periodStart,jdbcType=INTEGER}

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/BalanceSheetFinalExtendsMapper.xml

@@ -5,7 +5,7 @@
   <sql id="QueryCondition">
     1 = 1
     <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(bsCondition.orgId)">
-      AND organization_id= #{bsCondition.orgId,jdbcType=INTEGER}
+      AND organization_id= #{bsCondition.orgId,jdbcType=VARCHAR}
     </if>
     <if test="bsCondition.periodStart!=null">
       AND period &gt;= #{bsCondition.periodStart,jdbcType=INTEGER}

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/BalanceSheetManualExtendsMapper.xml

@@ -5,7 +5,7 @@
   <sql id="QueryCondition">
     1 = 1
     <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(bsCondition.orgId)">
-      AND organization_id= #{bsCondition.orgId,jdbcType=INTEGER}
+      AND organization_id= #{bsCondition.orgId,jdbcType=VARCHAR}
     </if>
     <if test="bsCondition.periodStart!=null">
       AND period &gt;= #{bsCondition.periodStart,jdbcType=INTEGER}

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/CashFlowExtendsMapper.xml

@@ -5,7 +5,7 @@
   <sql id="QueryCondition">
     1 = 1
     <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(cfCondition.orgId)">
-      AND entity_code= #{cfCondition.orgId,jdbcType=INTEGER}
+      AND entity_code= #{cfCondition.orgId,jdbcType=VARCHAR}
     </if>
     <if test="cfCondition.periodStart!=null">
       AND period &gt;= #{cfCondition.periodStart,jdbcType=INTEGER}

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/CertifiedInvoicesListExtendsMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="pwc.taxtech.atms.vat.dao.CertifiedInvoicesListMapper">
+
+  <sql id="QueryCondition">
+    1 = 1
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(cilCondition.orgId)">
+      AND organization_id= #{cilCondition.orgId,jdbcType=VARCHAR}
+    </if>
+    <if test="cilCondition.periodStart!=null">
+      AND period &gt;= #{cilCondition.periodStart,jdbcType=INTEGER}
+    </if>
+    <if test="cilCondition.periodEnd!=null">
+      AND period &lt;= #{cilCondition.periodEnd,jdbcType=INTEGER}
+    </if>
+  </sql>
+
+  <select id="selectByCondition" parameterType="pwc.taxtech.atms.vat.dpo.CertifiedInvoicesListCondition" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from certified_invoices_list
+    where
+    <include refid="QueryCondition"/>
+  </select>
+
+  <select id="selectCountByCondition" parameterType="pwc.taxtech.atms.vat.dpo.CertifiedInvoicesListCondition" resultType="Integer">
+    select
+    count(*)
+    from certified_invoices_list
+    where
+    <include refid="QueryCondition"/>
+  </select>
+
   <insert id="insertBatch" parameterType="java.util.List">
     insert into certified_invoices_list
     (<include refid="Base_Column_List"/>)

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/CoupaPurchasingReportExtendsMapper.xml

@@ -2,6 +2,35 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="pwc.taxtech.atms.vat.dao.CoupaPurchasingReportMapper">
 
+  <sql id="QueryCondition">
+    1 = 1
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(cprCondition.orgId)">
+      AND organization_id= #{cprCondition.orgId,jdbcType=VARCHAR}
+    </if>
+    <if test="cprCondition.periodStart!=null">
+      AND period &gt;= #{cprCondition.periodStart,jdbcType=INTEGER}
+    </if>
+    <if test="cprCondition.periodEnd!=null">
+      AND period &lt;= #{cprCondition.periodEnd,jdbcType=INTEGER}
+    </if>
+  </sql>
+
+  <select id="selectByCondition" parameterType="pwc.taxtech.atms.vat.dpo.CoupaPurchasingReportCondition" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from coupa_purchasing_report
+    where
+    <include refid="QueryCondition"/>
+  </select>
+
+  <select id="selectCountByCondition" parameterType="pwc.taxtech.atms.vat.dpo.CoupaPurchasingReportCondition" resultType="Integer">
+    select
+    count(*)
+    from coupa_purchasing_report
+    where
+    <include refid="QueryCondition"/>
+  </select>
+
   <insert id="insertBatch" parameterType="java.util.List">
     insert into coupa_purchasing_report
     (<include refid="Base_Column_List"/>)
@@ -41,7 +70,7 @@
           <otherwise>CURRENT_TIMESTAMP,</otherwise>
         </choose>
         <choose>
-          <when test="item.invoiceDate != null">#{item.invoiceDate,jdbcType=VARCHAR},</when>
+          <when test="item.invoiceNum != null">#{item.invoiceNum,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>
         </choose>
         <choose>

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/InvoiceRecordExtendsMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="pwc.taxtech.atms.vat.dao.InvoiceRecordMapper">
+
+  <sql id="QueryCondition">
+    1 = 1
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(irCondition.orgId)">
+      AND organization_id= #{irCondition.orgId,jdbcType=VARCHAR}
+    </if>
+    <if test="irCondition.periodStart!=null">
+      AND period &gt;= #{irCondition.periodStart,jdbcType=INTEGER}
+    </if>
+    <if test="irCondition.periodEnd!=null">
+      AND period &lt;= #{irCondition.periodEnd,jdbcType=INTEGER}
+    </if>
+  </sql>
+
+  <select id="selectByCondition" parameterType="pwc.taxtech.atms.vat.dpo.InvoiceRecordCondition" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from invoice_record
+    where
+    <include refid="QueryCondition"/>
+  </select>
+
+  <select id="selectCountByCondition" parameterType="pwc.taxtech.atms.vat.dpo.InvoiceRecordCondition" resultType="Integer">
+    select
+    count(*)
+    from invoice_record
+    where
+    <include refid="QueryCondition"/>
+  </select>
+
   <insert id="insertBatch" parameterType="java.util.List">
     insert into invoice_record
     (<include refid="Base_Column_List"/>)

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/JournalEntryExtendsMapper.xml

@@ -5,7 +5,7 @@
   <sql id="QueryCondition">
     1 = 1
     <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(jeCondition.orgId)">
-      AND organization_id= #{jeCondition.orgId,jdbcType=INTEGER}
+      AND organization_id= #{jeCondition.orgId,jdbcType=VARCHAR}
     </if>
     <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(jeCondition.segment3)">
       AND segment3= #{jeCondition.segment3,jdbcType=VARCHAR}

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/ProfitLossStatementExtendsMapper.xml

@@ -5,7 +5,7 @@
   <sql id="QueryCondition">
     1 = 1
     <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(plCondition.orgId)">
-      AND organization_id= #{plCondition.orgId,jdbcType=INTEGER}
+      AND organization_id= #{plCondition.orgId,jdbcType=VARCHAR}
     </if>
     <if test="plCondition.periodStart!=null">
       AND period &gt;= #{plCondition.periodStart,jdbcType=INTEGER}

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/ProfitLossStatementFinalExtendsMapper.xml

@@ -5,7 +5,7 @@
   <sql id="QueryCondition">
     1 = 1
     <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(plCondition.orgId)">
-      AND organization_id= #{plCondition.orgId,jdbcType=INTEGER}
+      AND organization_id= #{plCondition.orgId,jdbcType=VARCHAR}
     </if>
     <if test="plCondition.periodStart!=null">
       AND period &gt;= #{plCondition.periodStart,jdbcType=INTEGER}

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/ProfitLossStatementManualExtendsMapper.xml

@@ -5,7 +5,7 @@
   <sql id="QueryCondition">
     1 = 1
     <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(plCondition.orgId)">
-      AND organization_id= #{plCondition.orgId,jdbcType=INTEGER}
+      AND organization_id= #{plCondition.orgId,jdbcType=VARCHAR}
     </if>
     <if test="plCondition.periodStart!=null">
       AND period &gt;= #{plCondition.periodStart,jdbcType=INTEGER}

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/RedLetterInfoTableExtendsMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="pwc.taxtech.atms.vat.dao.RedLetterInfoTableMapper">
+
+
+  <sql id="QueryCondition">
+    1 = 1
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(rlitCondition.orgId)">
+      AND organization_id= #{rlitCondition.orgId,jdbcType=VARCHAR}
+    </if>
+    <if test="rlitCondition.periodStart!=null">
+      AND fill_in_date &gt;= #{rlitCondition.periodStart,jdbcType=INTEGER}
+    </if>
+    <if test="rlitCondition.periodEnd!=null">
+      AND fill_in_date &lt;= #{rlitCondition.periodEnd,jdbcType=INTEGER}
+    </if>
+  </sql>
+
+  <select id="selectByCondition" parameterType="pwc.taxtech.atms.vat.dpo.RedLetterInfoTableCondition" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from red_letter_info_table
+    where
+    <include refid="QueryCondition"/>
+  </select>
+
+  <select id="selectCountByCondition" parameterType="pwc.taxtech.atms.vat.dpo.RedLetterInfoTableCondition" resultType="Integer">
+    select
+    count(*)
+    from red_letter_info_table
+    where
+    <include refid="QueryCondition"/>
+  </select>
+
   <insert id="insertBatch" parameterType="java.util.List">
     insert into red_letter_info_table
     (<include refid="Base_Column_List"/>)

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/TrialBalanceMapper.xml

@@ -5,7 +5,7 @@
   <sql id="QueryCondition">
     1 = 1
     <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.orgId)">
-      AND organization_id= #{tbCondition.orgId,jdbcType=INTEGER}
+      AND organization_id= #{tbCondition.orgId,jdbcType=VARCHAR}
     </if>
     <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment2)">
       AND segment2= #{tbCondition.segment2,jdbcType=VARCHAR}

atms-web/src/main/webapp/WEB-INF/templates/index.html

@@ -65,7 +65,7 @@
     <app-nav></app-nav>
     <div class="page-wrapper" style="position:relative;overflow-x:hidden;overflow-y:auto;margin-top:55px">
         <div class="main-contents" ui-view></div>
-        <div class="data-import-contents" style="display: block" ui-view="importContent"></div>
+        <div class="data-import-contents" style="display: none" ui-view="importContent"></div>
     </div>
     <div class="clear"></div>
     <atms-busy-indicator></atms-busy-indicator>

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js

@@ -336,7 +336,7 @@
                         }
                     ],
                     onContentReady: function (e) {
-                        $scope.orgTreeListInstance = e.component;
+                        $scope.orgEquityListInstance = e.component;
                         var totalCount =e.component.totalCount();
                         if(totalCount>0)
                         {

atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.js

@@ -11,6 +11,7 @@
             controller: 'importATController',
             link: function (scope, element) {
                 $('.main-contents')[0].style.width = "260px";
+                $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";
                 $('.main-contents')[0].style.cssFloat = "left";

atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.js

@@ -11,6 +11,7 @@
             controller: 'importBSController',
             link: function (scope, element) {
                 $('.main-contents')[0].style.width = "260px";
+                $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";
                 $('.main-contents')[0].style.cssFloat = "left";

atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.js

@@ -12,6 +12,7 @@
             controller: 'importCFController',
             link: function (scope, element) {
                 $('.main-contents')[0].style.width = "260px";
+                $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";
                 $('.main-contents')[0].style.cssFloat = "left";

atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.js

@@ -11,6 +11,7 @@
             controller: 'importCILController',
             link: function (scope, element) {
                 $('.main-contents')[0].style.width = "260px";
+                $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";
                 $('.main-contents')[0].style.cssFloat = "left";

atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.js

@@ -11,6 +11,7 @@
             controller: 'importCPRController',
             link: function (scope, element) {
                 $('.main-contents')[0].style.width = "260px";
+                $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";
                 $('.main-contents')[0].style.cssFloat = "left";