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

atms-api/src/main/java/pwc/taxtech/atms/common/config/SystemConfig.java

@@ -37,6 +37,8 @@ public class SystemConfig {
     private String tableauAustralianTax;
     @Value("${tableau_brazilian_tax}")
     private String tableauBrazilianTax;
+    @Value("${tableau_dashboard}")
+    private String tableauDashboard;
 
     public String getLongiApiBasicUser() {
         return this.longiApiBasicUser;
@@ -157,4 +159,12 @@ public class SystemConfig {
     public void setTableauBrazilianTax(String tableauBrazilianTax) {
         this.tableauBrazilianTax = tableauBrazilianTax;
     }
+
+    public String getTableauDashboard() {
+        return this.tableauDashboard;
+    }
+
+    public void setTableauDashboard(String tableauDashboard) {
+        this.tableauDashboard = tableauDashboard;
+    }
 }

atms-api/src/main/java/pwc/taxtech/atms/controller/TableauController.java

@@ -83,4 +83,10 @@ public class TableauController extends BaseController {
         return ApiResultDto.success(tableauService.getBrazilianTax().orElse(StringUtils.EMPTY));
     }
 
+    @ResponseBody
+    @GetMapping("dashboard")
+    public ApiResultDto getDashboard() {
+        return ApiResultDto.success(tableauService.getBrazilianTax().orElse(StringUtils.EMPTY));
+    }
+
 }

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

@@ -113,4 +113,10 @@ public class TableauService extends BaseService {
         return optional.map(s -> String.format(systemConfig.getTableauBrazilianTax(),
                 getTicket(s).orElse(StringUtils.EMPTY)));
     }
+
+    public Optional<String> getDashboard() {
+        Optional<String> optional = authUserHelper.getCurrentAuditor();
+        return optional.map(s -> String.format(systemConfig.getTableauDashboard(),
+                getTicket(s).orElse(StringUtils.EMPTY)));
+    }
 }

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

@@ -231,8 +231,7 @@ public class ReportServiceImpl extends BaseService {
         return operationResult;
     }
 
-    private void clearPeriodData(String projectId, Integer period, List<Long> templateIds, boolean isMergeManualData) {
-        if (templateIds.isEmpty()) templateIds.add(Long.MAX_VALUE);
+    private void clearPeriodData(String projectId, Integer period, boolean isMergeManualData) {
         PeriodFormulaBlockExample periodFormulaBlockExample = new PeriodFormulaBlockExample();
         periodFormulaBlockExample.createCriteria().andProjectIdEqualTo(projectId).andPeriodEqualTo(period);
         periodFormulaBlockMapper.deleteByExample(periodFormulaBlockExample);
@@ -242,15 +241,15 @@ public class ReportServiceImpl extends BaseService {
         periodTaxRuleSettingMapper.deleteByExample(periodTaxRuleSettingExample);
 
         PeriodCellTemplateExample periodCellTemplateExample = new PeriodCellTemplateExample();
-        periodCellTemplateExample.createCriteria().andProjectIdEqualTo(projectId).andPeriodEqualTo(period).andReportTemplateIdNotIn(templateIds);
+        periodCellTemplateExample.createCriteria().andProjectIdEqualTo(projectId).andPeriodEqualTo(period);
         periodCellTemplateMapper.deleteByExample(periodCellTemplateExample);
 
         PeriodCellTemplateConfigExample periodCellTemplateConfigExample = new PeriodCellTemplateConfigExample();
-        periodCellTemplateConfigExample.createCriteria().andProjectIdEqualTo(projectId).andPeriodEqualTo(period).andReportTemplateIdNotIn(templateIds);
+        periodCellTemplateConfigExample.createCriteria().andProjectIdEqualTo(projectId).andPeriodEqualTo(period);
         periodCellTemplateConfigMapper.deleteByExample(periodCellTemplateConfigExample);
 
         PeriodTemplateExample periodTemplateExample = new PeriodTemplateExample();
-        periodTemplateExample.createCriteria().andProjectIdEqualTo(projectId).andPeriodEqualTo(period).andTemplateIdNotIn(templateIds);
+        periodTemplateExample.createCriteria().andProjectIdEqualTo(projectId).andPeriodEqualTo(period);
         periodTemplateMapper.deleteByExample(periodTemplateExample);
 
         PeriodTaxPayerReportRuleExample periodTaxPayerReportRuleExample = new PeriodTaxPayerReportRuleExample();
@@ -304,12 +303,13 @@ public class ReportServiceImpl extends BaseService {
     }
 
     private void updateConfig(String projectId, Integer period, Boolean isMergeManualData, List<Template> templates, PeriodJob job) {
-        List<Long> exceptTemplateIds = templateMapper.getIdsForExceptTemplate();
+        //财务报表不删除，这个逻辑用不到，先注释掉
+//        List<Long> exceptTemplateIds = templateMapper.getIdsForExceptTemplate();
         //根据收入类型映射生成开票记录关联数据
         assembleInvoiceRecord(projectId, period, isMergeManualData);
         //生成trial_balance_final数据
         assembleTrialBalanceFinal(projectId, period);
-        clearPeriodData(projectId, period, exceptTemplateIds, isMergeManualData);
+        clearPeriodData(projectId, period, isMergeManualData);
         copyTemplateAndConfigFromAdmin(projectId, templates, period);
         setStatus(job, STATUS_END);
         periodJobMapper.updateByPrimaryKey(job);

atms-api/src/main/resources/conf/conf.properties

@@ -80,4 +80,5 @@ tableau_doc_situation=${tableau_doc_situation}
 tableau_global_overview=${tableau_global_overview}
 tableau_mexican_tax=${tableau_mexican_tax}
 tableau_australian_tax=${tableau_australian_tax}
-tableau_brazilian_tax=${tableau_brazilian_tax}
+tableau_brazilian_tax=${tableau_brazilian_tax}
\ No newline at end of file
+tableau_dashboard=${tableau_dashboard}
\ No newline at end of file

atms-api/src/main/resources/conf/conf_profile_dev.properties

@@ -70,3 +70,4 @@ tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_2019
 tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
 tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
 tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_dashboard=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no

atms-api/src/main/resources/conf/conf_profile_pub.properties

@@ -74,3 +74,5 @@ tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_2019
 tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
 tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
 tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_dashboard=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+

atms-api/src/main/resources/conf/conf_profile_staging.properties

@@ -69,3 +69,5 @@ tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_2019
 tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
 tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
 tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_dashboard=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+

atms-api/src/main/resources/conf/conf_profile_uat.properties

@@ -74,4 +74,5 @@ tableau_global_overview=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/
 tableau_mexican_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
 tableau_australian_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
 tableau_brazilian_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_dashboard=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
 

atms-web/src/main/webapp/Scripts/module-part2.js

@@ -1905,5 +1905,22 @@ var analysisModule = angular.module('app.analysis', ['ui.grid', 'ui.router','ui.
                 resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.analysis),
                 sticky: true
             });
+            $stateProvider.state({
+                name: 'analysisDashboard',
+                url: "/analysis/analysisDashboard",
+                dsr: true,
+                views: {
+                    'importContent': {
+                        controller: ['$scope', '$state','appTranslation',
+                            function ($scope, $state, appTranslation) {
+                                $scope.state = $state;
+                                appTranslation.load([appTranslation.appPart]);
+                            }],
+                        template: '<analysis-dashboard></analysis-dashboard>'
+                    }
+                },
+                resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.analysis),
+                sticky: true
+            });
 
         }]);
\ No newline at end of file

atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json

@@ -907,6 +907,7 @@
     "MenuAustralianTax": "澳洲税务分析",
     "MenuBrazilianTax": "巴西税务分析",
     "MenuOtherCountries": "其他国家税务分析",
+    "MenuDashboard": "Dashboard",
 
     "ApproveCommitted":"审核中",
     "ApproveAgreed":"通过",

atms-web/src/main/webapp/app/analysis/dashboard/dashboard/dashboard.ctrl.js

+analysisModule.controller('AnalysisDashboardController', ['$scope','$filter', '$log', '$translate', '$http','SweetAlert',
+    'apiConfig',
+    function ($scope,$filter, $log, $translate, $http,SweetAlert,apiConfig) {
+        'use strict';
+
+        function init() {
+            $http.get('/tableau/dashboard', apiConfig.createVat())
+                .success(function (res) {
+                    if (res && 0 === res.code) {
+                        var placeholderDiv = document.getElementById('vizContainer');
+                        var url = res.data;
+                        var options = {
+                            onFirstInteractive: function() {
+                                // The viz is now ready and can be safely used.
+                                console.log("Run this code when the viz has finished     loading.");
+                            }
+                        };
+                        try{
+                            new tableau.Viz(placeholderDiv, url, options);
+                        }catch (e) {
+
+                        }
+                    }else {
+                        SweetAlert.error($translate.instant('SystemError'));
+                    }
+                });
+        }
+        init();
+
+        (function initialize() {
+
+        })();
+    }
+]);
\ No newline at end of file

atms-web/src/main/webapp/app/analysis/dashboard/dashboard/dashboard.html

+<div id="vizContainer" style="display: flex; justify-content: center; height: 90%"></div>
\ No newline at end of file

atms-web/src/main/webapp/app/analysis/dashboard/dashboard/dashboard.js

+analysisModule.directive('analysisDashboard', ['$log',
+    function ($log) {
+        'use strict';
+        return {
+            restrict: 'E',
+            templateUrl: '/app/analysis/dashboard/dashboard/dashboard.html' + '?_=' + Math.random(),
+            scope: {
+                serviceTypeId: "=?",
+                periodId: "=?"
+            },
+            controller: 'AnalysisDashboardController',
+            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";
+            }
+        };
+         
+    }
+]); 
\ No newline at end of file

atms-web/src/main/webapp/app/analysis/dashboard/dashboard/dashboard.less

+@import "~/app-resources/less/theme.less";
\ No newline at end of file