Skip to content

T
traffic-front
Commit 0739eb2e authored by eddie.woo's avatar eddie.woo
Browse files
Options

modify

parent 195e4c9e
Hide whitespace changes
Inline Side-by-side
Showing with 146 additions and 35 deletions
atms-api/src/main/java/pwc/taxtech/atms/dto/BarAndLineDto.java 0 → 100644
View file @ 0739eb2e
package pwc.taxtech.atms.dto;
import java.math.BigDecimal;
import java.util.List;
public class BarAndLineDto {
private List<BigDecimal> val1;
private List<BigDecimal> val2;
private List<BigDecimal> val3;
private List<BigDecimal> rate1;
private List<BigDecimal> rate2;
public List<BigDecimal> getVal1() {
return this.val1;
}
public void setVal1(List<BigDecimal> val1) {
this.val1 = val1;
}
public List<BigDecimal> getVal2() {
return this.val2;
}
public void setVal2(List<BigDecimal> val2) {
this.val2 = val2;
}
public List<BigDecimal> getVal3() {
return this.val3;
}
public void setVal3(List<BigDecimal> val3) {
this.val3 = val3;
}
public List<BigDecimal> getRate1() {
return this.rate1;
}
public void setRate1(List<BigDecimal> rate1) {
this.rate1 = rate1;
}
public List<BigDecimal> getRate2() {
return this.rate2;
}
public void setRate2(List<BigDecimal> rate2) {
this.rate2 = rate2;
}
}
atms-api/src/main/java/pwc/taxtech/atms/service/impl/ReportAnalysisService.java
View file @ 0739eb2e
...@@ -9,6 +9,7 @@ import pwc.taxtech.atms.common.util.DateUtils; ...@@ -9,6 +9,7 @@ import pwc.taxtech.atms.common.util.DateUtils;
import pwc.taxtech.atms.constant.enums.FormulaDataSourceType; import pwc.taxtech.atms.constant.enums.FormulaDataSourceType;
import pwc.taxtech.atms.constant.enums.StdAccountEnum; import pwc.taxtech.atms.constant.enums.StdAccountEnum;
import pwc.taxtech.atms.dao.*; import pwc.taxtech.atms.dao.*;
import pwc.taxtech.atms.dto.BarAndLineDto;
import pwc.taxtech.atms.dto.vatdto.BurdenRateDto; import pwc.taxtech.atms.dto.vatdto.BurdenRateDto;
import pwc.taxtech.atms.entity.*; import pwc.taxtech.atms.entity.*;
import pwc.taxtech.atms.invoice.InputInvoiceMapper; import pwc.taxtech.atms.invoice.InputInvoiceMapper;
...@@ -88,9 +89,7 @@ public class ReportAnalysisService extends BaseService { ...@@ -88,9 +89,7 @@ public class ReportAnalysisService extends BaseService {
BurdenRateDto dto = new BurdenRateDto(); BurdenRateDto dto = new BurdenRateDto();
List<BigDecimal> rateList = Lists.newArrayList(); List<BigDecimal> rateList = Lists.newArrayList();
for (int p = 1; p <= 12; p++) { for (int p = 1; p <= 12; p++) {
BigDecimal val = getCellValue(projectId, p, "VAT001", 19, 18); BigDecimal val2 = getTbValueByDirection("600101", projectId, p)
BigDecimal val2 = getCellValue(projectId, p, "VAT005", 26, 12);
BigDecimal val3 = getTbValueByDirection("600101", projectId, p)
.add(getTbValueByDirection("600102", projectId, p)).add(getTbValueByDirection("600103", projectId, p)) .add(getTbValueByDirection("600102", projectId, p)).add(getTbValueByDirection("600103", projectId, p))
.add(getTbValueByDirection("600104", projectId, p)).add(getTbValueByDirection("600105", projectId, p)) .add(getTbValueByDirection("600104", projectId, p)).add(getTbValueByDirection("600105", projectId, p))
.add(getTbValueByDirection("600107", projectId, p)).add(getTbValueByDirection("600111", projectId, p)) .add(getTbValueByDirection("600107", projectId, p)).add(getTbValueByDirection("600111", projectId, p))
...@@ -100,8 +99,11 @@ public class ReportAnalysisService extends BaseService { ...@@ -100,8 +99,11 @@ public class ReportAnalysisService extends BaseService {
.add(getTbValueByDirection("630104", projectId, p)).add(getTbValueByDirection("630105", projectId, p)) .add(getTbValueByDirection("630104", projectId, p)).add(getTbValueByDirection("630105", projectId, p))
.add(getTbValueByDirection("630106", projectId, p)).add(getTbValueByDirection("630107", projectId, p)) .add(getTbValueByDirection("630106", projectId, p)).add(getTbValueByDirection("630107", projectId, p))
.add(getTbValueByDirection("630108", projectId, p)).add(getTbValueByDirection("630198", projectId, p)); .add(getTbValueByDirection("630108", projectId, p)).add(getTbValueByDirection("630198", projectId, p));
BigDecimal rate = val3.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : val.add(val2) BigDecimal val = getCellValue(projectId, p, "VAT001", 9, 18) //栏次1
.divide(val3, 2, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP); .add(getCellValue(projectId, p, "VAT001", 13, 18)) //栏次5
.add(getCellValue(projectId, p, "VAT001", 15, 18)) //栏次7
.subtract(val2);
BigDecimal rate = val2.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : val.divide(val2, 2, BigDecimal.ROUND_HALF_UP);
rateList.add(rate); rateList.add(rate);
} }
dto.setRate(rateList); dto.setRate(rateList);
...@@ -165,6 +167,7 @@ public class ReportAnalysisService extends BaseService { ...@@ -165,6 +167,7 @@ public class ReportAnalysisService extends BaseService {
/** /**
* 增值税应税收入、增值税免、抵、退办法出口收入 占会计收入比例 * 增值税应税收入、增值税免、抵、退办法出口收入 占会计收入比例
*/ */
@Deprecated
public BurdenRateDto getVatIncomeRate(String projectId, Integer period) { public BurdenRateDto getVatIncomeRate(String projectId, Integer period) {
BurdenRateDto dto = new BurdenRateDto(); BurdenRateDto dto = new BurdenRateDto();
BigDecimal val = getCellValue(projectId, period, "VAT001", 19, 18); BigDecimal val = getCellValue(projectId, period, "VAT001", 19, 18);
...@@ -197,13 +200,17 @@ public class ReportAnalysisService extends BaseService { ...@@ -197,13 +200,17 @@ public class ReportAnalysisService extends BaseService {
/** /**
* 增值税应税收入、增值税免、抵、退办法出口收入 占会计收入比例 趋势 * 增值税应税收入、增值税免、抵、退办法出口收入 占会计收入比例 趋势
*/ */
public BurdenRateDto getVatIncomeLine(String projectId) { public BarAndLineDto getVatIncomeLine(String projectId) {
BurdenRateDto dto = new BurdenRateDto(); BarAndLineDto dto = new BarAndLineDto();
List<BigDecimal> vatAmountList = Lists.newArrayList(); List<BigDecimal> val1List = Lists.newArrayList();
List<BigDecimal> incomeList = Lists.newArrayList(); List<BigDecimal> val2List = Lists.newArrayList();
List<BigDecimal> val3List = Lists.newArrayList();
List<BigDecimal> rate1List = Lists.newArrayList();
List<BigDecimal> rate2List = Lists.newArrayList();
for (int p = 1; p <= 12; p++) { for (int p = 1; p <= 12; p++) {
BigDecimal val = getCellValue(projectId, p, "VAT001", 19, 18); BigDecimal val = getCellValue(projectId, p, "VAT001", 9, 18) //栏次1
BigDecimal val2 = getCellValue(projectId, p, "VAT005", 26, 12); .add(getCellValue(projectId, p, "VAT001", 13, 18)); //栏次5
BigDecimal val2 = getCellValue(projectId, p, "VAT001", 15, 18); //栏次7
BigDecimal sum = getTbValueByDirection("600101", projectId, p) BigDecimal sum = getTbValueByDirection("600101", projectId, p)
.add(getTbValueByDirection("600102", projectId, p)) .add(getTbValueByDirection("600102", projectId, p))
.add(getTbValueByDirection("600103", projectId, p)) .add(getTbValueByDirection("600103", projectId, p))
...@@ -228,11 +235,17 @@ public class ReportAnalysisService extends BaseService { ...@@ -228,11 +235,17 @@ public class ReportAnalysisService extends BaseService {
val.divide(sum, 2, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP); val.divide(sum, 2, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP);
BigDecimal rate2 = sum.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : BigDecimal rate2 = sum.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO :
val2.divide(sum, 2, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP); val2.divide(sum, 2, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP);
vatAmountList.add(rate); val1List.add(val);
incomeList.add(rate2); val2List.add(val2);
val3List.add(sum);
rate1List.add(rate);
rate2List.add(rate2);
} }
dto.setVatAmount(vatAmountList); dto.setVal1(val1List);
dto.setIncome(incomeList); dto.setVal2(val2List);
dto.setVal3(val3List);
dto.setRate1(rate1List);
dto.setRate2(rate2List);
return dto; return dto;
} }
......
atms-web/src/main/webapp/app/vat/analyzeReport/vat-model-analysis/vat-model-analysis.ctrl.js
View file @ 0739eb2e
...@@ -460,15 +460,15 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui ...@@ -460,15 +460,15 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
}) })
} }
//增值税应税收入、增值税免、抵、退办法出口收入 占会计收入比例 趋势 //应税收入、出口收入占会计收入比例及趋势
function getVatIncomeLineData(chart) { function getVatIncomeLineData(chart) {
var yArray = ['增值税应税收入', '增值税免、抵、退出口收入']; var yArray = ['应税收入', '出口收入','会计收入','应税占比','出口占比'];
$http.get('/reportAnalysis/vatIncomeLine/' + $scope.projectId, apiConfig.createVat()) $http.get('/reportAnalysis/vatIncomeLine/' + $scope.projectId, apiConfig.createVat())
.success(function (res) { .success(function (res) {
if (res && 0 === res.code) { if (res && 0 === res.code) {
var option = { var option = {
title: { title: {
text: '应税收入、出口收入比例趋势' text: '应税收入、出口收入占会计收入比例及趋势'
}, },
color: colors, color: colors,
tooltip: { tooltip: {
...@@ -504,7 +504,7 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui ...@@ -504,7 +504,7 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
yAxis: [ yAxis: [
{ {
type: 'value', type: 'value',
name: '占比', name: '金额',
// min: 0, // min: 0,
// max: 250, // max: 250,
position: 'right', position: 'right',
...@@ -513,6 +513,23 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui ...@@ -513,6 +513,23 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
color: colors[2] color: colors[2]
} }
}, },
axisLabel: {
formatter: function (val) {
return formatNum(val);
}
}
},
{
type: 'value',
name: '占比',
// min: 0,
// max: 250,
position: 'left',
axisLine: {
lineStyle: {
color: colors[2]
}
},
axisLabel: { axisLabel: {
formatter: function (val) { formatter: function (val) {
return (val * 100) + ' %'; return (val * 100) + ' %';
...@@ -523,19 +540,45 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui ...@@ -523,19 +540,45 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
series: [ series: [
{ {
name: yArray[0], name: yArray[0],
type: 'line', type: 'bar',
itemStyle: { itemStyle: {
color: colors[0] color: '#eb8c00'
}, },
data: res.data.vatAmount data: res.data.val1
}, },
{ {
name: yArray[1], name: yArray[1],
type: 'bar',
itemStyle: {
color: '#dc6900'
},
data: res.data.val2
},
{
name: yArray[2],
type: 'bar',
itemStyle: {
color: colors[0]
},
data: res.data.val3
},
{
name: yArray[3],
type: 'line', type: 'line',
yAxisIndex: 1,
itemStyle: { itemStyle: {
color: colors[1] color: colors[2]
}, },
data: res.data.income data: res.data.rate1
},
{
name: yArray[4],
type: 'line',
yAxisIndex: 1,
itemStyle: {
color: '#602320'
},
data: res.data.rate2
} }
] ]
}; };
...@@ -656,7 +699,7 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui ...@@ -656,7 +699,7 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
var discreteAnalysisDiv = echarts.init(document.getElementById('discreteAnalysisDiv')); var discreteAnalysisDiv = echarts.init(document.getElementById('discreteAnalysisDiv'));
var incomeRateDiv = echarts.init(document.getElementById('incomeRateDiv')); var incomeRateDiv = echarts.init(document.getElementById('incomeRateDiv'));
var incomeVolatilityDiv = echarts.init(document.getElementById('incomeVolatilityDiv')); var incomeVolatilityDiv = echarts.init(document.getElementById('incomeVolatilityDiv'));
var vatIncomeRateDiv = echarts.init(document.getElementById('vatIncomeRateDiv')); // var vatIncomeRateDiv = echarts.init(document.getElementById('vatIncomeRateDiv'));
var vatIncomeLineDiv = echarts.init(document.getElementById('vatIncomeLineDiv')); var vatIncomeLineDiv = echarts.init(document.getElementById('vatIncomeLineDiv'));
var deductionDiv = echarts.init(document.getElementById('deductionDiv')); var deductionDiv = echarts.init(document.getElementById('deductionDiv'));
...@@ -664,7 +707,7 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui ...@@ -664,7 +707,7 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
getDispersion(discreteAnalysisDiv); getDispersion(discreteAnalysisDiv);
getIncomeRateData(incomeRateDiv); getIncomeRateData(incomeRateDiv);
getIncomeVolatilityData(incomeVolatilityDiv); getIncomeVolatilityData(incomeVolatilityDiv);
getVatIncomeRateData(vatIncomeRateDiv); // getVatIncomeRateData(vatIncomeRateDiv);
getVatIncomeLineData(vatIncomeLineDiv); getVatIncomeLineData(vatIncomeLineDiv);
getDeductionData(deductionDiv); getDeductionData(deductionDiv);
} }
......
atms-web/src/main/webapp/app/vat/analyzeReport/vat-model-analysis/vat-model-analysis.html
View file @ 0739eb2e
...@@ -18,21 +18,24 @@ ...@@ -18,21 +18,24 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<!--<div class="col-lg-5 col-md-5">-->
<!--<div id="vatIncomeRateDiv" name="p_chart"></div>-->
<!--</div>-->
<div class="col-lg-5 col-md-5"> <div class="col-lg-5 col-md-5">
<div id="vatIncomeRateDiv" name="p_chart"></div>
</div>
<div class="col-lg-5 col-md-5 col-md-offset-1 col-lg-offset-1">
<div id="vatIncomeLineDiv" name="p_chart"></div> <div id="vatIncomeLineDiv" name="p_chart"></div>
</div> </div>
</div>
<div class="row">
<div class="col-lg-5 col-md-5">
<div id="deductionDiv" name="p_chart"></div>
</div>
<div class="col-lg-5 col-md-5 col-md-offset-1 col-lg-offset-1"> <div class="col-lg-5 col-md-5 col-md-offset-1 col-lg-offset-1">
<div id="" name="p_chart"></div> <div id="deductionDiv" name="p_chart"></div>
</div> </div>
</div> </div>
<!--<div class="row">-->
<!--<div class="col-lg-5 col-md-5">-->
<!--<div id="deductionDiv" name="p_chart"></div>-->
<!--</div>-->
<!--<div class="col-lg-5 col-md-5 col-md-offset-1 col-lg-offset-1">-->
<!--<div id="" name="p_chart"></div>-->
<!--</div>-->
<!--</div>-->
</div> </div>
<style> <style>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment