modify

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

@@ -169,8 +169,28 @@ public class ReportAnalysisService extends BaseService {
         BurdenRateDto dto = new BurdenRateDto();
         BigDecimal val = getCellValue(projectId, period, "VAT001", 19, 18);
         BigDecimal val2 = getCellValue(projectId, period, "VAT005", 26, 12);
+        BigDecimal total = getTbValueByDirection("600101", projectId, period)
+                .add(getTbValueByDirection("600102", projectId, period))
+                .add(getTbValueByDirection("600103", projectId, period))
+                .add(getTbValueByDirection("600104", projectId, period))
+                .add(getTbValueByDirection("600105", projectId, period))
+                .add(getTbValueByDirection("600107", projectId, period))
+                .add(getTbValueByDirection("600111", projectId, period))
+                .add(getTbValueByDirection("600190", projectId, period))
+                .add(getTbValueByDirection("605101", projectId, period))
+                .add(getTbValueByDirection("612101", projectId, period))
+                .add(getTbValueByDirection("630101", projectId, period))
+                .add(getTbValueByDirection("630102", projectId, period))
+                .add(getTbValueByDirection("630103", projectId, period))
+                .add(getTbValueByDirection("630104", projectId, period))
+                .add(getTbValueByDirection("630105", projectId, period))
+                .add(getTbValueByDirection("630106", projectId, period))
+                .add(getTbValueByDirection("630107", projectId, period))
+                .add(getTbValueByDirection("630108", projectId, period))
+                .add(getTbValueByDirection("630198", projectId, period));
         dto.setVatAmount(Lists.newArrayList(val));
         dto.setIncome(Lists.newArrayList(val2));
+        dto.setRate(Lists.newArrayList(total.subtract(val).subtract(val2)));
         return dto;
     }
 
@@ -184,7 +204,25 @@ public class ReportAnalysisService extends BaseService {
         for (int p = 1; p <= 12; p++) {
             BigDecimal val = getCellValue(projectId, p, "VAT001", 19, 18);
             BigDecimal val2 = getCellValue(projectId, p, "VAT005", 26, 12);
-            BigDecimal sum = val.add(val2);
+            BigDecimal sum = getTbValueByDirection("600101", projectId, p)
+                    .add(getTbValueByDirection("600102", projectId, p))
+                    .add(getTbValueByDirection("600103", projectId, p))
+                    .add(getTbValueByDirection("600104", projectId, p))
+                    .add(getTbValueByDirection("600105", projectId, p))
+                    .add(getTbValueByDirection("600107", projectId, p))
+                    .add(getTbValueByDirection("600111", projectId, p))
+                    .add(getTbValueByDirection("600190", projectId, p))
+                    .add(getTbValueByDirection("605101", projectId, p))
+                    .add(getTbValueByDirection("612101", projectId, p))
+                    .add(getTbValueByDirection("630101", projectId, p))
+                    .add(getTbValueByDirection("630102", projectId, p))
+                    .add(getTbValueByDirection("630103", projectId, p))
+                    .add(getTbValueByDirection("630104", projectId, p))
+                    .add(getTbValueByDirection("630105", projectId, p))
+                    .add(getTbValueByDirection("630106", projectId, p))
+                    .add(getTbValueByDirection("630107", projectId, p))
+                    .add(getTbValueByDirection("630108", projectId, p))
+                    .add(getTbValueByDirection("630198", projectId, p));
 
             BigDecimal rate = sum.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO :
                     val.divide(sum, 2, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP);

atms-web/src/main/java/pwc/taxtech/atms/web/controller/LtpaToken.java

@@ -36,7 +36,7 @@ public class LtpaToken {
      */
     public final static String COOKIE_NAME = "LtpaToken";
     //	private final static String DOMINO_SECRET = "JytUSYHnoFtU9dbkyXUny7FPn88="; // "密钥";
-    private final static String DOMINO_SECRET = "UFrEIY2n686Ph6kRB6X4Hjp41NA="; // "密钥";
+    private final static String DOMINO_SECRET = "1cgjI5oeU1VWrkJmdPFO+AwVRCE="; // "密钥" --- 生产环境key
 
     public LtpaToken() {
         init();
@@ -205,7 +205,7 @@ public class LtpaToken {
     /**
      * 将cookie封装到Map里面
      *
-     * @param request
+     * @param
      * @return
      * @method ReadCookieMap Create on 2018年6月29日 上午11:35:45
      * Copyright (c) 2018 by future-info.

atms-web/src/main/webapp/app/vat/analyzeReport/vat-model-analysis/vat-model-analysis.ctrl.js

@@ -403,7 +403,7 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
 
         //增值税应税收入、增值税免、抵、退办法出口收入 占会计收入比例
         function getVatIncomeRateData(chart) {
-            var yArray = ['增值税应税收入', '增值税免、抵、退出口收入'];
+            var yArray = ['增值税应税收入', '增值税免、抵、退出口收入', '其余'];
             $http.get('/reportAnalysis/vatIncomeRate/' + $scope.projectId + "/" + $scope.projectPeriod, apiConfig.createVat())
                 .success(function (res) {
                     if (res && 0 === res.code) {
@@ -441,7 +441,8 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
                                     center: ['50%', '60%'],
                                     data: [
                                         {value: res.data.vatAmount[0], name: '增值税应税收入'},
-                                        {value: res.data.income[0], name: '增值税免、抵、退出口收入'}
+                                        {value: res.data.income[0], name: '增值税免、抵、退出口收入'},
+                                        {value: res.data.rate[0], name: '其余'}
                                     ],
                                     itemStyle: {
                                         emphasis: {