modify

atms-api/src/main/java/pwc/taxtech/atms/vat/dao/InputInvoiceDao.java

@@ -21,13 +21,12 @@ public class InputInvoiceDao {
     public List<InputInvoice> getInputInvoice(Integer period, String invoiceType, String checkPass, String scanPass, String notPass) {
         InputInvoiceExample example = new InputInvoiceExample();
         InputInvoiceExample.Criteria criteria = example.createCriteria();
-//        InputInvoiceExample.Criteria criteria1 = example.createCriteria();
 
-//        if(period != null){
-//            Calendar date = Calendar.getInstance();
-//            String year = String.valueOf(date.get(Calendar.YEAR));
-//            criteria.andRZSQEqualTo(year + "-" + (period > 9 ? period.toString() : "0" + period.toString()));
-//        }
+        if (period != null) {
+            Calendar date = Calendar.getInstance();
+            String year = String.valueOf(date.get(Calendar.YEAR));
+            criteria.andRZSQEqualTo(year + (period > 9 ? period.toString() : "0" + period.toString()));
+        }
 
         if (invoiceType != null) {
             criteria.andFPLXEqualTo(String.valueOf(invoiceType));
@@ -46,10 +45,9 @@ public class InputInvoiceDao {
         }
         criteria.andFPZTNotEqualTo("1"); // 过滤作废状态
 
-        List<InputInvoice> list = inputInvoiceMapper.selectByExample(example).stream().filter(x -> {
-            return x.getRZSQ().endsWith("-" + (period.intValue() > 9 ? period.toString() : "0" + period.toString()));
-        }).collect(Collectors.toList());
-//        return inputInvoiceMapper.selectByExample(example);
-        return list;
+//        List<InputInvoice> list = inputInvoiceMapper.selectByExample(example).stream().filter(x -> {
+//            return x.getRZSQ().endsWith("-" + (period.intValue() > 9 ? period.toString() : "0" + period.toString()));
+//        }).collect(Collectors.toList());
+        return inputInvoiceMapper.selectByExample(example);
     }
 }

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

@@ -177,7 +177,7 @@ public class ReportGeneratorImpl {
                         periodCellTemplateConfigMapper.updateByPrimaryKeySelective(periodCellTemplateConfig);
                     }
 
-                    String regexNormalCell = "[A-Z]{1,2}((?!0)[0-9]{1,3})";
+                    String regexNormalCell = "[A-Z]{1,2}((?!0)[0-9]{1,3})";// todo 这里原生引用计算废弃，改用BB
                     p = Pattern.compile(regexNormalCell);
                     m = p.matcher(sourceFormula);
                     while (m.find()) {