Skip to content

T
traffic-front
Commit ffc4dc52 authored by weizhikai's avatar weizhikai
Browse files
Options

1、卡片展示排序；2、已认证发票清单模板下载；3、手工导入的VAT数据页面展示问题；4、导入的发票资料公式计算；5、导入的现金流量表期间的set

parent 96c7d2ee
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 28 deletions
atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java
View file @ ffc4dc52
......@@ -668,6 +668,7 @@ public class DataImportService extends BaseService {
cf.setEntityCode(companyCode);
cf.setEntityName(companyName);
cf.setPeriod(period);
cf.setTmsPeriod(tmsPeriod);
Row row = sheet.getRow(j);
Cell cell1 = row.getCell(0);
......@@ -839,16 +840,16 @@ public class DataImportService extends BaseService {
iData.setCompanyName(getCellStringValue(cell1));
Cell cell2 = sheet.getRow(2).getCell(j);
iData.setSpecialInvoiceAmount1(getCellLongDecimalValue(cell2));
iData.setSpecialInvoiceAmount1(getCellBigDecimalValue(cell2,evaluator).longValue());
Cell cell3 = sheet.getRow(3).getCell(j);
iData.setSpecialInvoiceAmount2(getCellLongDecimalValue(cell3));
iData.setSpecialInvoiceAmount2(getCellBigDecimalValue(cell3,evaluator).longValue());
Cell cell4 = sheet.getRow(4).getCell(j);
iData.setSpecialInvoiceAmount3(getCellLongDecimalValue(cell4));
iData.setSpecialInvoiceAmount3(getCellBigDecimalValue(cell4,evaluator).longValue());
Cell cell5 = sheet.getRow(5).getCell(j);
iData.setSpecialInvoiceAmount4(getCellLongDecimalValue(cell5));
iData.setSpecialInvoiceAmount4(getCellBigDecimalValue(cell5,evaluator).longValue());
Cell cell6 = sheet.getRow(6).getCell(j);
iData.setSpecialInvoiceSalesAmount1(getCellBigDecimalValue(cell6,evaluator));
......@@ -881,16 +882,16 @@ public class DataImportService extends BaseService {
iData.setSpecialInvoiceTaxAmount5(getCellBigDecimalValue(cell15,evaluator));
Cell cell16 = sheet.getRow(16).getCell(j);
iData.setInvoiceAmount1(getCellLongDecimalValue(cell16));
iData.setInvoiceAmount1(getCellBigDecimalValue(cell16,evaluator).longValue());
Cell cell17 = sheet.getRow(17).getCell(j);
iData.setInvoiceAmount2(getCellLongDecimalValue(cell17));
iData.setInvoiceAmount2(getCellBigDecimalValue(cell17,evaluator).longValue());
Cell cell18 = sheet.getRow(18).getCell(j);
iData.setInvoiceAmount3(getCellLongDecimalValue(cell18));
iData.setInvoiceAmount3(getCellBigDecimalValue(cell18,evaluator).longValue());
Cell cell19 = sheet.getRow(19).getCell(j);
iData.setInvoiceAmount4(getCellLongDecimalValue(cell19));
iData.setInvoiceAmount4(getCellBigDecimalValue(cell19,evaluator).longValue());
Cell cell20 = sheet.getRow(20).getCell(j);
iData.setInvoiceSalesAmount1(getCellBigDecimalValue(cell20,evaluator));
......
atms-web/src/main/webapp/app/framework/app-overview/app-overview.ctrl.js
View file @ ffc4dc52
......@@ -741,11 +741,11 @@
if (sortstr == 'status') {
if ($scope.orderStatus) {
$scope.orderStatus = false;
var list = _.sortBy($scope.queryResults, 'haveCreateProject');
var list = $scope.queryResults.sort(sortByProjectStatus('projectStatusList'));
$scope.queryResults = list;
} else {
$scope.orderStatus = true;
var list = _.sortBy($scope.queryResults, 'haveCreateProject');
var list = $scope.queryResults.sort(sortByProjectStatus('projectStatusList'));
$scope.queryResults = list.reverse();
}
}
......@@ -761,7 +761,23 @@
}
}
}
}
};
function sortByProjectStatus(projectStatusList){
var currentMonth = vatSessionService.month;
return function(a,b){
a = a.projectStatusList;
b = b.projectStatusList;
var statusId;
if (a === null || (a !== null && a[currentMonth] === undefined)){
return -1;
} else if (b === null || (b !== null && b[currentMonth] === undefined)) {
return 1;
} else {
return a[currentMonth]-b[currentMonth];
}
}
};
$scope.goToService = function (project) {
if (!project.clicked) {
......
atms-web/src/main/webapp/app/framework/app-overview/app-overview.html
View file @ ffc4dc52
......@@ -84,11 +84,11 @@
{{ 'OrderBy' | translate }}<span class="glyphicon glyphicon-sort"></span>
</button>
<ul class="dropdown-menu">
<li ng-click="fileSort('year')">
&nbsp;&nbsp;{{ 'OrderyByYear' | translate }}&nbsp;&nbsp;
<i class="fa fa-sort-amount-asc" ng-if="orderYear" aria-hidden="true"></i>
<i class="fa fa-sort-amount-desc" ng-if="!orderYear" aria-hidden="true"></i>
</li>
<!--<li ng-click="fileSort('year')">-->
<!--&nbsp;&nbsp;{{ 'OrderyByYear' | translate }}&nbsp;&nbsp;-->
<!--<i class="fa fa-sort-amount-asc" ng-if="orderYear" aria-hidden="true"></i>-->
<!--<i class="fa fa-sort-amount-desc" ng-if="!orderYear" aria-hidden="true"></i>-->
<!--</li>-->
<li ng-click="fileSort('name')">
&nbsp;&nbsp;{{ 'OrderyByName' | translate }}&nbsp;&nbsp;
<i class="fa fa-sort-amount-asc" ng-if="orderName" aria-hidden="true"></i>
......@@ -99,11 +99,11 @@
<i class="fa fa-sort-amount-asc" ng-if="orderStatus" aria-hidden="true"></i>
<i class="fa fa-sort-amount-desc" ng-if="!orderStatus" aria-hidden="true"></i>
</li>
<li ng-click="fileSort('type')">
&nbsp;&nbsp;{{ 'OrderyByServiceType' | translate }}&nbsp;&nbsp;
<i class="fa fa-sort-amount-asc" ng-if="orderType" aria-hidden="true"></i>
<i class="fa fa-sort-amount-desc" ng-if="!orderType" aria-hidden="true"></i>
</li>
<!--<li ng-click="fileSort('type')">-->
<!--&nbsp;&nbsp;{{ 'OrderyByServiceType' | translate }}&nbsp;&nbsp;-->
<!--<i class="fa fa-sort-amount-asc" ng-if="orderType" aria-hidden="true"></i>-->
<!--<i class="fa fa-sort-amount-desc" ng-if="!orderType" aria-hidden="true"></i>-->
<!--</li>-->
</ul>
</div>
<div class="button-sort" ng-if="currentView == 'workflowView'">
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-cash-flow-manual/vat-preview-cash-flow-manual.ctrl.js
View file @ ffc4dc52
......@@ -82,7 +82,7 @@
$scope.ledgerCurrencyCodeFirst = itemFirst.ledgerCurrencyCode;
$scope.ledgerStatusFirst = itemFirst.status;
//TODO
$scope.importDate = $filter('date')(data.list[0].date, "yyyy-MM-dd hh:mm:ss");
$scope.importDate = $filter('date')(data.list[0].updateTime, "yyyy-MM-dd hh:mm:ss");
}
$scope.gridOptions.data = data.list;
$scope.queryIncomeInvoiceItemResult.pageInfo = data;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-cash-flow-manual/vat-preview-cash-flow-manual.html
View file @ ffc4dc52
......@@ -10,7 +10,7 @@
<div style="margin-bottom: 10px;margin-left: 20px;margin-top: 10px;">
<!-- {{'EnterpriseAccountSetName' | translate }}：<span class="numAmount">{{ledgerNameFirst}}</span>&nbsp;&nbsp;&nbsp;-->
{{'ImportTime' | translate }}：<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>
{{'ImportTime' | translate }}：<span class="numAmount">{{importDate| date:'yyyy-MM-dd HH:mm:ss'}}</span>
<!-- {{'ImportTime' | translate }}：<span class="numAmount">{{ importDate| date:'yyyy-MM'}}</span>-->
</div>
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet-prc-manual/vat-preview-off-balance-sheet-prc-manual.ctrl.js
View file @ ffc4dc52
......@@ -106,7 +106,7 @@
if(data.size>0){
$scope.currencyCode = data.list[0].ledgerCurrencyCode;
$scope.status = data.list[0].status;
$scope.importDate = $filter('date')(data.list[0].date, "yyyy-MM-dd hh:mm:ss");
$scope.importDate = $filter('date')(data.list[0].updateTime, "yyyy-MM-dd HH:mm:ss");
}
}
});
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet-prc-manual/vat-preview-off-balance-sheet-prc-manual.html
View file @ ffc4dc52
......@@ -16,8 +16,8 @@
<div style="margin-bottom: 8px;margin-left: 30px">
{{'EnterpriseAccountSetCurrency' | translate}}<span class="numAmount">{{currencyCode}}</span>&nbsp;&nbsp;&nbsp;
{{'IsCloseAccount' | translate}}<span class="numAmount">{{status}}</span>
{{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>
<!--{{'IsCloseAccount' | translate}}<span class="numAmount">{{status}}</span>-->
{{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd HH:mm:ss'}}</span>
</div>
<div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0">
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-profit-loss-prc-manual/vat-preview-profit-loss-prc-manual.ctrl.js
View file @ ffc4dc52
......@@ -105,7 +105,7 @@
if(data.size>0){
$scope.currencyCode = data.list[0].ledgerCurrencyCode;
$scope.status = data.list[0].status;
$scope.importDate = $filter('date')(data.list[0].date, "yyyy-MM-dd hh:mm:ss");
$scope.importDate = $filter('date')(data.list[0].updateTime, "yyyy-MM-dd hh:mm:ss");
}
}
});
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-profit-loss-prc-manual/vat-preview-profit-loss-prc-manual.html
View file @ ffc4dc52
......@@ -16,7 +16,7 @@
<div style="margin-bottom: 8px;margin-left: 30px">
{{'EnterpriseAccountSetCurrency' | translate}}<span class="numAmount">{{currencyCode}}</span>&nbsp;&nbsp;&nbsp;
{{'IsCloseAccount' | translate}}<span class="numAmount">{{status}}</span>
<!--{{'IsCloseAccount' | translate}}<span class="numAmount">{{status}}</span>-->
{{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>
</div>
......
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