another dataSource

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

@@ -147,7 +147,7 @@ public class ProjectServiceImpl {
                 project.setStartPeriod(p.getStartPeriod());
                 project.setEndPeriod(p.getEndPeriod());
 
-                projectMapper.updateByPrimaryKey(project);
+                projectMapper.updateByPrimaryKeySelective(project);
 
                 //修改已取出数据中项目起始月
                 pddFirst.setStartPeriod(p.getStartPeriod());

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

@@ -72,9 +72,16 @@ public class OutputInvoiceServiceImpl {
         Organization organization = organizationMapper.selectByPrimaryKey(project.getOrganizationId());
 
         OutputInvoiceExample outputInvoiceExample = new OutputInvoiceExample();
-        outputInvoiceExample.createCriteria().andXFSHEqualTo(organization.getTaxPayerNumber()).andKPZTEqualTo(OUTPUT_KPZT_YES).
-        andKPRQBetween(DateUtils.getPeriodBegin(project.getYear(), queryDto.getPeriodStart()),
-                DateUtils.getPeriodEnd(project.getYear(), queryDto.getPeriodEnd()));
+        if(organization.getTaxPayerNumber() == null){
+            outputInvoiceExample.createCriteria().andXFSHIsNull().andKPZTEqualTo(OUTPUT_KPZT_YES).
+                    andKPRQBetween(DateUtils.getPeriodBegin(project.getYear(), queryDto.getPeriodStart()),
+                            DateUtils.getPeriodEnd(project.getYear(), queryDto.getPeriodEnd()));
+        } else {
+            outputInvoiceExample.createCriteria().andXFSHEqualTo(organization.getTaxPayerNumber()).andKPZTEqualTo(OUTPUT_KPZT_YES).
+                    andKPRQBetween(DateUtils.getPeriodBegin(project.getYear(), queryDto.getPeriodStart()),
+                            DateUtils.getPeriodEnd(project.getYear(), queryDto.getPeriodEnd()));
+        }
+
 
         PageHelper.startPage(queryDto.getPageInfo().getPageIndex(), queryDto.getPageInfo().getPageSize());
         List<OutputInvoice> invoices = outputInvoiceMapper.selectByExample(outputInvoiceExample);

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/JXFPMX.java

@@ -85,11 +85,11 @@ public class JXFPMX extends FunctionBase implements FreeRefFunction {
 //        List<InputVATInvoiceResultDto> inputInvoice = SpringContextUtil.inputVatInvoiceMapper.getInputVATInvoiceResultDto(dbName);
         List<InputInvoiceResultDto> inputInvoice = SpringContextUtil.inputInvoiceMapper.getInputInvoiceResultDto();
 
-        if (!goodsName.equals("99")) {
-            inputInvoice = inputInvoice.stream()
-                    .filter(a -> a.getInputInvoiceDetail() != null && StringUtils.isNotBlank(goodsName) && goodsName.equals(a.getInputInvoiceDetail().getSPMC()))
-                    .collect(Collectors.toList());
-        }
+//        if (!goodsName.equals("99")) {
+//            inputInvoice = inputInvoice.stream()
+//                    .filter(a -> a.getInputInvoiceDetail() != null && StringUtils.isNotBlank(goodsName) && goodsName.equals(a.getInputInvoiceDetail().getSPMC()))
+//                    .collect(Collectors.toList());
+//        }
 
         if (taxRateVal.compareTo(new BigDecimal("-1")) == 0) {
             inputInvoice = inputInvoice.stream()