Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen

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;
     }
 

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

@@ -119,7 +119,7 @@ public class DFFS extends FunctionBase implements FreeRefFunction {
             dto.setPeriod(period);
             dto.setIsOnlyManualInput(Boolean.FALSE);
             dto.setName(Constant.DataSourceName.ReportDataSource);
-            dto.setType( FormulaDataSourceType.TrialBalanceSource.getCode());
+            dto.setType(FormulaDataSourceType.TrialBalanceSource.getCode());
             contain.add(dto);
         }
         return temp.stream().mapToDouble(a -> a.getPtdCr().doubleValue()).sum();

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

@@ -12,10 +12,7 @@ import pwc.taxtech.atms.constant.Constant;
 import pwc.taxtech.atms.constant.enums.FormulaDataSourceDetailType;
 import pwc.taxtech.atms.constant.enums.FormulaDataSourceType;
 import pwc.taxtech.atms.dto.vatdto.ReportCellDataSourceDto;
-import pwc.taxtech.atms.entity.AccountMapping;
-import pwc.taxtech.atms.entity.AccountMappingExample;
-import pwc.taxtech.atms.entity.EnterpriseAccountSetOrg;
-import pwc.taxtech.atms.entity.EnterpriseAccountSetOrgExample;
+import pwc.taxtech.atms.entity.*;
 import pwc.taxtech.atms.vat.entity.GlBalance;
 import pwc.taxtech.atms.vat.entity.GlBalanceExample;
 
@@ -68,7 +65,7 @@ public class JFFS extends FunctionBase implements FreeRefFunction {
             double result = 0;
 
             for(AccountMapping a : accountMappings){
-                result += count(a.getEnterpriseAccountCode(), dataSource, period, year);
+                result += count(a.getEnterpriseAccountCode(), dataSource, period, year,orgId);
             }
             Long dataSoureId = saveDataSource(ec, Collections.singletonList(dataSource),
                     FormulaDataSourceDetailType.FormulaDataSourceDto,
@@ -78,7 +75,7 @@ public class JFFS extends FunctionBase implements FreeRefFunction {
            return new NumberEval(result);
         } else if(type == 1){
 
-            double result = count(code, dataSource, period, year);
+            double result = count(code, dataSource, period, year, orgId);
             Long dataSoureId = saveDataSource(ec, Collections.singletonList(dataSource),
                     FormulaDataSourceDetailType.FormulaDataSourceDto,
                     new BigDecimal(result), period, formulaContext.getReportTemplateGroupId(), formulaContext.getProjectId());
@@ -93,10 +90,16 @@ public class JFFS extends FunctionBase implements FreeRefFunction {
         return year + "-" + (period > 9 ? period : ("0" + period));
     }
 
-    private double count(String code, List<ReportCellDataSourceDto> contain, int period, int year){
+    private double count(String code, List<ReportCellDataSourceDto> contain, int period, int year, String orgId){
+
+        Organization organization = SpringContextUtil.organizationMapper.selectByPrimaryKey(orgId);
         GlBalanceExample glBalanceExample = new GlBalanceExample();
         GlBalanceExample.Criteria c1 = glBalanceExample.createCriteria().andSegment3EqualTo(code).andPeriodNameEqualTo(periodName(period, year));
         GlBalanceExample.Criteria c2 = glBalanceExample.createCriteria().andSegment4EqualTo(code).andPeriodNameEqualTo(periodName(period, year));
+        if(organization != null){
+            c1.andSegment1EqualTo(organization.getClientCode());
+            c2.andSegment1EqualTo(organization.getClientCode());
+        }
         glBalanceExample.or(c2);
         List<GlBalance> list = SpringContextUtil.glBalanceMapper.selectByExample(glBalanceExample);
         if(CollectionUtils.isEmpty(list)){

atms-web/src/main/webapp/app/common/controls/vat-report-view/vat-report-view.ctrl.js

-commonModule.controller('VatReportViewController', ['$scope', '$rootScope', '$log', '$translate', '$timeout', '$q', '$compile', '$state', '$stateParams',
+commonModule.controller('VatReportViewController', ['$scope', '$rootScope', '$log', '$translate', '$timeout', '$q', '$compile', '$state', '$stateParams',
     'apiInterceptor', 'vatExportService', 'SweetAlert', 'BSPLService', 'vatReportService', 'vatReportCacheService', 'vatSessionService',
     'loginContext', 'enums', 'vatCommonService', 'vatWorkflowService', 'projectService', '$uibModal', '$cookies', 'Upload', 'vatImportService','vatApproveService',
     function ($scope, $rootScope, $log, $translate, $timeout, $q, $compile, $state, $stateParams, apiInterceptor, vatExportService, SweetAlert, BSPLService,
@@ -648,6 +648,7 @@ commonModule.controller('VatReportViewController', ['$scope', '$rootScope', '$lo
                                         $scope.taxCellDetail.dataSourceCount++;
                                     }
                                 });
+                                // $scope.taxCellDetail.items = [_.first($scope.taxCellDetail.items)];
                             }
                             else {
                                 var flag = true;

atms-web/src/main/webapp/app/common/utils/enums.js

@@ -442,10 +442,11 @@ commonModule.factory('enums', ['$translate', function ($translate) {
             ////未开票数据源
             //Unbilled: 9,
             KeyInSource: 10,
-            QCYESource: 11,
-            QMYESource: 12,
+            TrialBalanceSource:11,
+            // QCYESource: 11,
+            // QMYESource: 12,
             ModelSource: 13,
-            FSESource: 14,
+            // FSESource: 14,
             RuleSource: 15,
 
             //凭证筛选
@@ -456,7 +457,10 @@ commonModule.factory('enums', ['$translate', function ($translate) {
             ModelDatasource: 18,
             // 用于存放特殊逻辑中获取的数据源数值与备注等信息，如未开票视同销售等
             Special: 19,
-            BSPL: 20
+            BSPL: 20,
+
+            summary: 100
+
         },
 
         VatImportSubStatus: {

atms-web/src/main/webapp/app/vat/preview/vat-preview-output-invoice/vat-preview-output-invoice.ctrl.js

@@ -170,9 +170,9 @@
             $scope.queryOutputInvoiceResult = {
                 list: [],
                 pageInfo: {
-                    totalCount: 0,
+                    totalCount: -1,
                     pageIndex: 1,
-                    pageSize: 100,
+                    pageSize: constant.pagesize,
                     totalPage: 0,
                 }
             }