数据预览分页问题

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

@@ -63,8 +63,6 @@ public class InputInvoiceDataImportServiceImpl {
                 project.getYear(), paras.getPeriodStart(), Constant.DateFormat.YYYYMM), DateUtils.getPeriodEndFormat(project.getYear(),
                 paras.getPeriodEnd(), Constant.DateFormat.YYYYMM)).andRZJGEqualTo(INPUT_RZJG_SUCCESS).andRZZTEqualTo(INPUT_RZZT_OVER)
                 .andFPZTNotEqualTo("1");
-
-
         List<InputInvoice> invoices = inputInvoiceMapper.selectByExample(invoiceExample);
         DecimalFormat df = new DecimalFormat("#,###.00");
         invoices.stream().forEach(x -> {
@@ -77,8 +75,23 @@ public class InputInvoiceDataImportServiceImpl {
     }
 
     public PageInfo<InputInvoice> getInputInvoiceTreeViewData(InputInvoicePreviewQueryParam paras, String projectId) {
+        Project project = projectMapper.selectByPrimaryKey(projectId);
+        Organization organization = organizationMapper.selectByPrimaryKey(project.getOrganizationId());
+        InputInvoiceExample invoiceExample = new InputInvoiceExample();
+        invoiceExample.createCriteria().andGFSHEqualTo(organization.getTaxPayerNumber()).andRZSQBetween(DateUtils.getPeriodBeginFormat(
+                project.getYear(), paras.getPeriodStart(), Constant.DateFormat.YYYYMM), DateUtils.getPeriodEndFormat(project.getYear(),
+                paras.getPeriodEnd(), Constant.DateFormat.YYYYMM)).andRZJGEqualTo(INPUT_RZJG_SUCCESS).andRZZTEqualTo(INPUT_RZZT_OVER)
+                .andFPZTNotEqualTo("1");
         PageHelper.startPage(paras.getPageInfo().getPageIndex(), paras.getPageInfo().getPageSize());
-        PageInfo<InputInvoice> pageInfo = new PageInfo<>(getInputInvoiceTree(paras, projectId));
+        List<InputInvoice> invoices = inputInvoiceMapper.selectByExample(invoiceExample);
+        DecimalFormat df = new DecimalFormat("#,###.00");
+        invoices.stream().forEach(x -> {
+                    x.setHJJE(df.format(new BigDecimal(x.getHJJE())));
+                    x.setHJSE(df.format(new BigDecimal(x.getHJSE())));
+                    x.setRZJG(convertRzjg(x.getRZJG()));
+                }
+        );
+        PageInfo<InputInvoice> pageInfo = new PageInfo<>(invoices);
         return pageInfo;
     }
 

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

@@ -100,7 +100,31 @@ public class OutputInvoiceServiceImpl {
     }
 
     public PageInfo<OutputInvoice> queryOutputInvoiceList(QueryOutputDto queryDto, String projectId) {
-        PageInfo<OutputInvoice> pageInfo = new PageInfo<>(queryOutputInvoiceAllList(queryDto, projectId));
+
+        Project project = projectMapper.selectByPrimaryKey(projectId);
+        Organization organization = organizationMapper.selectByPrimaryKey(project.getOrganizationId());
+
+        OutputInvoiceExample outputInvoiceExample = new OutputInvoiceExample();
+        if (organization.getTaxPayerNumber() == null) {
+            outputInvoiceExample.createCriteria().andXFSHIsNull().andKPZTEqualTo(OUTPUT_KPZT_YES).
+                    andKPRQBetween(DateUtils.getPeriodBegin(project.getYear(), queryDto.getPeriodStart()),
+                            DateUtils.getPeriodEnd(project.getYear(), queryDto.getPeriodEnd()))
+                    .andFPZTNotEqualTo("1");
+        } else {
+            outputInvoiceExample.createCriteria().andXFSHEqualTo(organization.getTaxPayerNumber()).andKPZTEqualTo(OUTPUT_KPZT_YES).
+                    andKPRQBetween(DateUtils.getPeriodBegin(project.getYear(), queryDto.getPeriodStart()),
+                            DateUtils.getPeriodEnd(project.getYear(), queryDto.getPeriodEnd()))
+                    .andFPZTNotEqualTo("1");
+        }
+        PageHelper.startPage(queryDto.getPageInfo().getPageIndex(), queryDto.getPageInfo().getPageSize());
+        List<OutputInvoice> invoices = outputInvoiceMapper.selectByExample(outputInvoiceExample);
+        DecimalFormat df = new DecimalFormat("#,###.00");
+        invoices.stream().forEach(x -> {
+                    x.setHJJE(df.format(new BigDecimal(x.getHJJE())));
+                    x.setHJSE(df.format(new BigDecimal(x.getHJSE())));
+                }
+        );
+        PageInfo<OutputInvoice> pageInfo = new PageInfo<>(invoices);
         return pageInfo;
     }