Skip to content

T
traffic-front
Commit 0df803d4 authored by zhkwei's avatar zhkwei
Browse files
Options

1、固资损失把隐藏列显示出来；2、固资导入界面优化；3、财务数据抽取及数据导入记录页面只有admin查看全部及页面Grid高度变化；4、收入类型配置机构和名称组成唯一并更改Grid高度变化

parent 053a7f98
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 57 deletions
atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java
View file @ 0df803d4
......@@ -104,6 +104,8 @@ public class DataImportService extends BaseService {
private OrganizationServiceImpl organizationService;
@Autowired
private OrganizationAccountingRateMapper organizationAccountingRateMapper;
@Resource
private UserMapper userMapper;
private static String ebsCallUrl;
......@@ -2156,7 +2158,9 @@ public class DataImportService extends BaseService {
criteria.andOrganizationIdIn(orgIds);
}
//财务数据抽取展示抽取记录除了admin能查看所有操作人员的操作，其余人员只能看到本身的
if (!"admin".equals(authUserHelper.getCurrentAuditor().get())) {
String uid = authUserHelper.getCurrentUserId();
User user = userMapper.selectByPrimaryKey(uid);
if (!user.getIsSuperAdmin()) {
criteria.andOperatorEqualTo(authUserHelper.getCurrentAuditor().get());
}
example.setOrderByClause("update_time desc");
......@@ -2198,7 +2202,9 @@ public class DataImportService extends BaseService {
Page page = PageHelper.startPage(param.getPageInfo().getPageIndex(), param.getPageInfo().getPageSize());
List<String> orgIds = organizationService.getMyOrgList().stream().map(OrgSelectDto::getId).collect(Collectors.toList());
//财务数据抽取展示抽取记录除了admin能查看所有操作人员的操作，其余人员只能看到本身的
if ("admin".equals(authUserHelper.getCurrentAuditor().get())) {
String uid = authUserHelper.getCurrentUserId();
User user = userMapper.selectByPrimaryKey(uid);
if (user.getIsSuperAdmin()) {
criteria.andOrganizationIdIn(orgIds).andCreateTimeBetween(strDate, endDate);
} else {
criteria.andOrganizationIdIn(orgIds).andCreateTimeBetween(strDate, endDate).andOperatorEqualTo(authUserHelper.getCurrentAuditor().get());
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/RevenueConfService.java
View file @ 0df803d4
......@@ -15,11 +15,13 @@ import org.springframework.web.multipart.MultipartFile;
import pwc.taxtech.atms.common.CommonUtils;
import pwc.taxtech.atms.common.POIUtil;
import pwc.taxtech.atms.constant.enums.RevenueConfEnum;
import pwc.taxtech.atms.dao.OrganizationMapper;
import pwc.taxtech.atms.dpo.OrgSelectDto;
import pwc.taxtech.atms.dto.ApiResultDto;
import pwc.taxtech.atms.dto.revenuconf.RevConfAddDto;
import pwc.taxtech.atms.dto.revenuconf.RevenueConfParam;
import pwc.taxtech.atms.dto.revenuconf.RevenueConfResult;
import pwc.taxtech.atms.entity.Organization;
import pwc.taxtech.atms.exception.Exceptions;
import pwc.taxtech.atms.vat.dao.RevenueConfigMapper;
import pwc.taxtech.atms.vat.entity.RevenueConfig;
......@@ -38,6 +40,8 @@ public class RevenueConfService extends BaseService {
private RevenueConfigMapper revenueConfigMapper;
@Resource
private OrganizationServiceImpl organizationService;
@Resource
private OrganizationMapper organizationMapper;
/**
* 分页查询可查看的配置信息
......@@ -85,17 +89,25 @@ public class RevenueConfService extends BaseService {
*/
public ApiResultDto addConfig(RevConfAddDto addDto) {
RevenueConfigExample revenueConfigExample = new RevenueConfigExample();
revenueConfigExample.createCriteria().andNameEqualTo(addDto.getName());
List<RevenueConfig> list = revenueConfigMapper.selectByExample(revenueConfigExample);
if (list.size() > 0) {
ApiResultDto apiResultDto = ApiResultDto.success();
apiResultDto.setMessage("DuplicateName");
return apiResultDto;
}
if (!CollectionUtils.isEmpty(addDto.getOrgList())) {
//在新增之前先验证机构和名称组合是否唯一 by zhikai.wei start
StringBuilder sb = new StringBuilder();
ApiResultDto apiResultDto = new ApiResultDto();
for (String orgId : addDto.getOrgList()) {
RevenueConfigExample revenueConfigExample = new RevenueConfigExample();
revenueConfigExample.createCriteria().andNameEqualTo(addDto.getName()).andOrgIdEqualTo(orgId);
List<RevenueConfig> list = revenueConfigMapper.selectByExample(revenueConfigExample);
if (list.size() > 0) {
sb.append(organizationMapper.selectByPrimaryKey(orgId).getName()).append("\n");
apiResultDto.setMessage("DuplicateName");
}
}
if(StringUtils.isNotBlank(apiResultDto.getMessage())){
apiResultDto.setData(sb.toString());
return apiResultDto;
}
//在新增之前先验证机构和名称组合是否唯一 by zhikai.wei end
addDto.getOrgList().forEach(id -> {
addDto.setId(idService.nextId());
addDto.setOrgId(id);
......
atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.ctrl.js
View file @ 0df803d4
......@@ -1266,6 +1266,18 @@
};
var showSearch = function () {
$("[data-toggle='popover']").popover();
};
var showSearch1 = function () {
var aaaa = $("#assetListSearch").hasClass("popover");
var bbbb = $("#assetListSearch").hasClass("show");
if($("#assetListSearch").hasClass("popover")){
}
};
//开始
(function initialize() {
......@@ -1276,6 +1288,8 @@
$scope.selectedColumnMap = [];
$scope.incomeInvoiceTotalColumns = [];
$scope.initIncomeInvoiceTotalColumnsIndex = [];
$scope.showSearch = showSearch;
$scope.showSearch1 = showSearch1;
$scope.changeSheet = changeSheet;
$scope.doDataFilter = doDataFilter;
$scope.doDataFilterReset = doDataFilterReset;
......@@ -1287,7 +1301,7 @@
initAssetResultDxGrid();
// getAssetResultList(1);
$scope.refreshAssetResultListGrid();
showSearch();
getGroupList();
getGroupDetailList();
getUserPermission();
......
atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.html
View file @ 0df803d4
......@@ -138,8 +138,8 @@
<!--<asset-list-edit-modal asset-type="displayType-1" type="0"></asset-list-edit-modal>-->
<div id="assetsResultGrid" dx-data-grid="assetsResultGridOptions">
<div style="display: inline-block" data-options="dxTemplate:{ name:'totalGroupCount' }">
<button class="filter-button"
atms-popover ng-mouseenter="prepareSummary()"
<button class="filter-button" data-toggle="popover"
atms-popover ng-mouseenter="prepareSummary()" ng-click="showSearch1()" id = "assetListSearch"
popover-container="body" popover-auto-hide="true" data-overwrite="true"
use-optimized-placement-algorithm="true"
data-placement="bottom"
......
atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.less
View file @ 0df803d4
......@@ -446,7 +446,7 @@
-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
min-width: 370px;
left: 60%;
left: 58%;
.arrow {
left: 60% !important;
......
atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.ctrl.js
View file @ 0df803d4
......@@ -282,7 +282,7 @@
format: {type: 'fixedPoint', precision: 2},
width: 100
},
{caption: $translate.instant('TaxGroupName '), dataField: "taxGroupName"},
{caption: $translate.instant('TaxGroupName '), dataField: "taxGroupName",width: 160},
{
caption: $translate.instant('DepreciationPeriod'),
dataField: "depreciationPeriod",
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-salary-advance/import-cit-salary-advance.ctrl.js
View file @ 0df803d4
......@@ -192,6 +192,8 @@
__RequestVerificationToken: token,
withCredentials: true
}).then(function(data) {
$scope.importExcelFile = null;
$scope.fileName = null;
var resp = data.data;
$('#busy-indicator-container').hide();
deferred.resolve();
......
atms-web/src/main/webapp/app/dataImport/data-extraction/extract-financial-data/extract-financial-data.ctrl.js
View file @ 0df803d4
......@@ -147,7 +147,7 @@
dataField: "companyCode",
allowHeaderFiltering: false,
caption: $translate.instant('CompanyCode'),
width: '15%'
width: '13%'
}, {
dataField: "companyName",
allowHeaderFiltering: false,
......@@ -161,7 +161,7 @@
}, {
dataField: "periodYear",
allowHeaderFiltering: false,
width: '14%',
width: '8%',
caption: $translate.instant('YearPeriod')
},
/*{
......@@ -193,7 +193,7 @@
}, {
dataField: "operateTime",
allowHeaderFiltering: false,
width: '10%',
width: '18%',
caption: $translate.instant('LogOperationTime'),
calculateCellValue: function(data) {
return new Date(data.operateTime).formatDateTime('yyyy-MM-dd HH:mm:ss');
......@@ -213,6 +213,12 @@
selection: {
mode: "single"
},
paging: {
pageSize: 100,
},
scrolling: {
mode: "virtual"
},
grouping: {
autoExpandAll: false
},
......
atms-web/src/main/webapp/app/dataImport/data-extraction/extract-financial-data/extract-financial-data.html
View file @ 0df803d4
......@@ -43,10 +43,8 @@
</form>
<div class="dt-init-wrapper">
<div class="dx-viewport grid-container">
<div id="extractFinancialGridContainer" dx-data-grid="extractFinancialGridOptions"
style="margin-top: 30px;">
</div>
<div id="extractFinancialGridContainer" dx-data-grid="extractFinancialGridOptions"
style="margin-top: 30px;">
</div>
<div class="page-footer">
<ack-pagination page-options="pagingOptions"
......
atms-web/src/main/webapp/app/dataImport/data-extraction/extract-financial-data/extract-financial-data.less
View file @ 0df803d4
......@@ -239,6 +239,10 @@
height: calc(100% - 200px);
position: relative;
#extractFinancialGridContainer{
height: 460px;
}
.dropdown {
.dropdown-common();
......@@ -247,16 +251,6 @@
}
}
.extractFinancialGridContainer {
height: calc(~'100% - 30px');
overflow: hidden;
position: absolute;
top: 0;
bottom: 136px; /* 130 + 6 */
left: 0;
right: 0;
background-color: #FFF;
}
}
.error-info-wrapper {
......
atms-web/src/main/webapp/app/dataImport/log/import-log/import-log.ctrl.js
View file @ 0df803d4
......@@ -133,6 +133,12 @@
selection: {
mode: "single"
},
paging: {
pageSize: 100,
},
scrolling: {
mode: "virtual"
},
grouping: {
autoExpandAll: false
},
......@@ -148,6 +154,7 @@
width: 518,
visible: true
},
height: '99%',
headerFilter: {
visible: false,
texts: {
......
atms-web/src/main/webapp/app/dataImport/log/import-log/import-log.html
View file @ 0df803d4
......@@ -17,10 +17,8 @@
</div>
</div>
<div class="dt-init-wrapper">
<div class="dx-viewport grid-container">
<div id="importLogGridContainer" dx-data-grid="importLogGridOptions"
style="margin-top: 30px;">
</div>
<div id="importLogGridContainer" dx-data-grid="importLogGridOptions"
style="margin-top: 30px;">
</div>
<!--<div class="page-footer">
<ack-pagination page-options="pagingOptions"
......
atms-web/src/main/webapp/app/dataImport/log/import-log/import-log.less
View file @ 0df803d4
......@@ -187,16 +187,10 @@
}
}
.importLogGridContainer {
height: calc(~'100% - 30px');
overflow: hidden;
position: absolute;
top: 0;
bottom: 136px; /* 130 + 6 */
left: 0;
right: 0;
background-color: #FFF;
#importLogGridContainer{
height: 460px;
}
}
.error-info-wrapper {
......
atms-web/src/main/webapp/app/dataImport/vat-revenue-config/vat-revenue-config.ctrl.js
View file @ 0df803d4
......@@ -222,11 +222,15 @@
bindingOptions: {
dataSource: 'pageConfDataSource',
},
scrolling: {
mode: "virtual"
},
selection: {
mode: 'multiple',
showCheckBoxesMode: 'always',
allowSelectAll: true
},
onSelectionChanged: function (data) {
$scope.selectedItems = data.selectedRowsData;
$scope.selectedRecourdCount = data.selectedRowsData.length;
......@@ -314,7 +318,7 @@
.success(function (res) {
if (res && 0 === res.code) {
if(res.message === "DuplicateName"){
SweetAlert.warning($translate.instant('NameShouldUniqueWarn'));
SweetAlert.warning(res.data+" "+$translate.instant('NameShouldUniqueWarn'));
return;
}
SweetAlert.success($translate.instant('RevenueAddSuccess'));
......
atms-web/src/main/webapp/app/dataImport/vat-revenue-config/vat-revenue-config.less
View file @ 0df803d4
......@@ -188,16 +188,10 @@
}
}
.importPLStatusGridContainer {
height: calc(~'100% - 30px');
overflow: hidden;
position: absolute;
top: 0;
bottom: 136px; /* 130 + 6 */
left: 0;
right: 0;
background-color: #FFF;
#revenueGridContainer{
height: 460px;
}
}
.error-info-wrapper {
......
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