Skip to content

T
traffic-front
Commit f09fa1dd authored by Ken you's avatar Ken you
Browse files
Options

add admin CIT excel import and resolve some bug----Ken

parent 94eb6b17
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 253 additions and 199 deletions
atms-api/src/main/java/pwc/taxtech/atms/controller/TemplateGroupController.java
View file @ f09fa1dd
...@@ -156,4 +156,17 @@ public class TemplateGroupController { ...@@ -156,4 +156,17 @@ public class TemplateGroupController {
return OperationResultDto.error(ErrorMessage.SystemError); return OperationResultDto.error(ErrorMessage.SystemError);
} }
@RequestMapping(value = "withoutTemplate", method = RequestMethod.POST)
public @ResponseBody OperationResultDto withoutTemplate(@RequestBody TemplateGroupDto templateGroupDto) {
try {
templateGroupService.addTemplateGroupWithoutTemplate(templateGroupDto);
return OperationResultDto.success();
} catch (ServiceException e) {
return OperationResultDto.error(e.getMessage());
} catch (Exception e) {
logger.error("withoutTemplate error.", e);
}
return OperationResultDto.error(ErrorMessage.SystemError);
}
} }
atms-api/src/main/java/pwc/taxtech/atms/service/impl/TemplateGroupServiceImpl.java
View file @ f09fa1dd
...@@ -38,10 +38,8 @@ import pwc.taxtech.atms.entity.TemplateGroup; ...@@ -38,10 +38,8 @@ import pwc.taxtech.atms.entity.TemplateGroup;
import pwc.taxtech.atms.entity.TemplateGroupExample; import pwc.taxtech.atms.entity.TemplateGroupExample;
import pwc.taxtech.atms.exception.ServiceException; import pwc.taxtech.atms.exception.ServiceException;
import pwc.taxtech.atms.vat.dao.PeriodDataSourceMapper; import pwc.taxtech.atms.vat.dao.PeriodDataSourceMapper;
import pwc.taxtech.atms.vat.entity.PeriodCellData;
import pwc.taxtech.atms.vat.entity.PeriodDataSource; import pwc.taxtech.atms.vat.entity.PeriodDataSource;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.InputStream; import java.io.InputStream;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -527,6 +525,28 @@ public class TemplateGroupServiceImpl extends AbstractService { ...@@ -527,6 +525,28 @@ public class TemplateGroupServiceImpl extends AbstractService {
} }
@Transactional
public void addTemplateGroupWithoutTemplate(TemplateGroupDto templateGroupDto) throws ServiceException {
List<TemplateGroup> groupList = templateGroupDao.getByGroupName(templateGroupDto.getName());
if (CollectionUtils.isNotEmpty(groupList)) {
throw new ServiceException(TemplateMessage.TemplateGroupNameExist);
}
try {
TemplateGroup templateGroup=new TemplateGroup();
CommonUtils.copyProperties(templateGroupDto,templateGroup);
Long newGroupId = distributedIdService.nextId();
Date now = new Date();
templateGroup.setId(newGroupId);
templateGroup.setCreateTime(now);
templateGroup.setUpdateTime(now);
templateGroup.setName(templateGroupDto.getName());
templateGroupMapper.insertSelective(templateGroup);
} catch (Exception e) {
logger.error("addTemplateGroupWithoutTemplate error.", e);
throw new ServiceException(ErrorMessage.SystemError);
}
}
private List<CellTemplateConfig> getByTemplateId(Long id) { private List<CellTemplateConfig> getByTemplateId(Long id) {
CellTemplateConfigExample example = new CellTemplateConfigExample(); CellTemplateConfigExample example = new CellTemplateConfigExample();
CellTemplateConfigExample.Criteria criteria = example.createCriteria(); CellTemplateConfigExample.Criteria criteria = example.createCriteria();
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/TemplateExtendsMapper.xml
View file @ f09fa1dd
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
<select id="getTemplateUniqDtosByTemplateAndTemplateGroup" parameterType="map" resultMap="TemplateUniqDto"> <select id="getTemplateUniqDtosByTemplateAndTemplateGroup" parameterType="map" resultMap="TemplateUniqDto">
SELECT SELECT
P.id as ID, P.id as ID,
p.code as Code, P.code as Code,
p.name as Name, P.name as Name,
P.report_type as ReportType, P.report_type as ReportType,
Q.id AS TEMPLATE_GROUP_ID, Q.id AS TEMPLATE_GROUP_ID,
Q.name AS TEMPLATE_GROUP_NAME, Q.name AS TEMPLATE_GROUP_NAME,
......
atms-web/src/main/webapp/app/admin/systemConfiguration/declarationFormConfiguration/declaration-form-configuration.ctrl.js
View file @ f09fa1dd
...@@ -120,18 +120,14 @@ ...@@ -120,18 +120,14 @@
defaultValue = find; defaultValue = find;
$scope.templateGroupId = find.id; $scope.templateGroupId = find.id;
} }
else {
$scope.curTemplateGroup = null;
}
} }
dxControl.renderTemplateGroupDropDown(templateGroupData, defaultValue); dxControl.renderTemplateGroupDropDown(templateGroupData, defaultValue);
loadReportType();
if (templateGroupData && templateGroupData.length > 0) {
loadReportType();
} else {
$('#dx-select-template-groups').dxDropDownBox('instance').option('dataSource', []);
$('#dx-select-template').dxDropDownBox('instance').option('dataSource', []);
}
}); });
} }
}; };
...@@ -147,39 +143,48 @@ ...@@ -147,39 +143,48 @@
} }
}; };
if ($scope.curTemplateGroup && $scope.curTemplateGroup.id) { if ($scope.curServiceTypeId === enums.serviceType.VAT) {
if ($scope.curServiceTypeId === enums.serviceType.CIT) { $scope.detailReportTypeList = angular.copy(defaultReportTypeOpt);
$scope.detailReportTypeList = angular.copy(defaultReportTypeOpt); var ds = _.filter(citReportTypeList, function (item) { return item.value == 1 || item.value == 3 || item.value == 4 });
$scope.detailReportTypeList.dataSource = new DevExpress.data.ArrayStore({ $scope.detailReportTypeList.dataSource = new DevExpress.data.ArrayStore({
data: citReportTypeList data: ds
}); });
$scope.detailReportTypeList.value = citReportTypeList[0].name; $scope.detailReportTypeList.value = citReportTypeList[0].name;
$('#dx-select-report-type').dxSelectBox('instance').option($scope.detailReportTypeList); $('#dx-select-report-type').dxSelectBox('instance').option($scope.detailReportTypeList);
$scope.reportType = citReportTypeList[0]; $scope.reportType = citReportTypeList[0];
listTemplates(); listTemplates();
} else if ($scope.curServiceTypeId === enums.serviceType.CF) {
$scope.detailReportTypeList = angular.copy(defaultReportTypeOpt); } else if ($scope.curServiceTypeId === enums.serviceType.CIT) {
$scope.detailReportTypeList.dataSource = new DevExpress.data.ArrayStore({ $scope.detailReportTypeList = angular.copy(defaultReportTypeOpt);
data: cfReportTypeList $scope.detailReportTypeList.dataSource = new DevExpress.data.ArrayStore({
}); data: citReportTypeList
$scope.detailReportTypeList.value = cfReportTypeList[1].name; });
$('#dx-select-report-type').dxSelectBox('instance').option($scope.detailReportTypeList); $scope.detailReportTypeList.value = citReportTypeList[0].name;
$scope.reportType = cfReportTypeList[1]; $('#dx-select-report-type').dxSelectBox('instance').option($scope.detailReportTypeList);
listTemplates(); $scope.reportType = citReportTypeList[0];
} else if ($scope.curServiceTypeId === enums.serviceType.Others) { listTemplates();
$scope.detailReportTypeList = angular.copy(defaultReportTypeOpt); } else if ($scope.curServiceTypeId === enums.serviceType.CF) {
$scope.detailReportTypeList.dataSource = new DevExpress.data.ArrayStore({ $scope.detailReportTypeList = angular.copy(defaultReportTypeOpt);
data: citReportTypeList $scope.detailReportTypeList.dataSource = new DevExpress.data.ArrayStore({
}); data: cfReportTypeList
$scope.detailReportTypeList.value = citReportTypeList[0].name; });
$('#dx-select-report-type').dxSelectBox('instance').option($scope.detailReportTypeList); $scope.detailReportTypeList.value = cfReportTypeList[1].name;
$scope.reportType = citReportTypeList[0]; $('#dx-select-report-type').dxSelectBox('instance').option($scope.detailReportTypeList);
listTemplates(); $scope.reportType = cfReportTypeList[1];
} else { listTemplates();
$('#dx-select-report-type').dxSelectBox('instance').option('dataSource', []); } else if ($scope.curServiceTypeId === enums.serviceType.Others) {
$scope.reportType = null; $scope.detailReportTypeList = angular.copy(defaultReportTypeOpt);
listTemplates(); $scope.detailReportTypeList.dataSource = new DevExpress.data.ArrayStore({
} data: citReportTypeList
});
$scope.detailReportTypeList.value = citReportTypeList[0].name;
$('#dx-select-report-type').dxSelectBox('instance').option($scope.detailReportTypeList);
$scope.reportType = citReportTypeList[0];
listTemplates();
} else {
$('#dx-select-report-type').dxSelectBox('instance').option('dataSource', []);
$scope.reportType = null;
listTemplates();
} }
}; };
...@@ -315,31 +320,41 @@ ...@@ -315,31 +320,41 @@
//加载'报表'源数据 //加载'报表'源数据
var listTemplates = function () { var listTemplates = function () {
templateGroupService.getTemplateList($scope.curTemplateGroup.id, $scope.reportType && $scope.reportType.value).success(function (templateData) { if ($scope.curTemplateGroup && $scope.curTemplateGroup.id) {
templateGroupService.getTemplateList($scope.curTemplateGroup.id, $scope.reportType && $scope.reportType.value).success(function (templateData) {
templateData = _.filter(templateData, function (row) {
return row.isActiveAssociation;
});
var defaultValue = templateData[0]; templateData = _.filter(templateData, function (row) {
if ($scope.currentTemplate && ($scope.currentTemplate.name || $scope.currentTemplate.id)) { return row.isActiveAssociation;
var find = _.find(templateData, function (row) {
return row.name === $scope.currentTemplate.name || row.id === $scope.currentTemplate;
}); });
if (find) { var defaultValue = templateData[0];
defaultValue = find; if ($scope.currentTemplate && ($scope.currentTemplate.name || $scope.currentTemplate.id)) {
var find = _.find(templateData, function (row) {
return row.name === $scope.currentTemplate.name || row.id === $scope.currentTemplate;
});
if (find) {
defaultValue = find;
}
else {
$scope.currentTemplate = null;
}
} }
}
$scope.templates = templateData; //当前组下的所有模板数据 $scope.templates = templateData; //当前组下的所有模板数据
dxControl.renderTemplateDropDown(templateData, defaultValue); dxControl.renderTemplateDropDown(templateData, defaultValue);
//配置报表下拉框 //配置报表下拉框
if (templateData && templateData.length > 0) { if (templateData && templateData.length > 0) {
$scope.ToggleSaveAs = showSavebutton(); $scope.ToggleSaveAs = showSavebutton();
} }
}); });
}
else {
$('#dx-select-template-groups').dxDropDownBox('instance').option('dataSource', []);
$scope.templates.length = 0;
$scope.currentTemplate = null;
}
}; };
//模板不是默认模板才可以编辑和保存 //模板不是默认模板才可以编辑和保存
var showSavebutton = function () { var showSavebutton = function () {
......
atms-web/src/main/webapp/app/admin/systemConfiguration/declarationFormConfiguration/declaration-form-configuration.html
View file @ f09fa1dd
...@@ -28,15 +28,15 @@ ...@@ -28,15 +28,15 @@
<div class="templates-top"> <div class="templates-top">
<div class="form-group"> <div class="form-group">
<span class="tab-content-select-lable" ng-show="curServiceTypeId !=='12'">{{'IndustryColon' | translate}}</span> <span class="tab-content-select-lable" ng-show="curServiceTypeId !=='12'">{{'IndustryColon' | translate}}</span>
<div id="dx-select-industry" class="tab-content-select industry col-md-2" ng-show="curServiceTypeId !=='12'" dx-select-box="dataSourceIndustryList" <div id="dx-select-industry" class="tab-content-select industry col-md-2" ng-show="curServiceTypeId !=='12'"
dx-item-alias="itemObj"> dx-select-box="dataSourceIndustryList" dx-item-alias="itemObj">
<div data-options="dxTemplate: { name: 'industryItem' }" class="dx-item-content dx-list-item-content" title="{{itemObj.name}}"> <div data-options="dxTemplate: { name: 'industryItem' }" class="dx-item-content dx-list-item-content" title="{{itemObj.name}}">
{{itemObj.name}} {{itemObj.name}}
</div> </div>
</div> </div>
<span class="tab-content-select-lable" translate="ReportType" ng-show="curServiceTypeId === '2'"></span> <span class="tab-content-select-lable" ng-show="curServiceTypeId === '2'">{{'Ratepayer' | translate}}：</span>
<div class="tab-content-select reportType col-md-2" id="dx-select-pay-tax-type" ng-show="curServiceTypeId === '2'" dx-select-box="dataSourcePayTaxTypeList" <div class="tab-content-select reportType col-md-2" id="dx-select-pay-tax-type" ng-show="curServiceTypeId === '2'"
dx-item-alias="itemObj"> dx-select-box="dataSourcePayTaxTypeList" dx-item-alias="itemObj">
<div data-options="dxTemplate: { name: 'filingTypeItem' }" class="dx-item-content dx-list-item-content" title="{{itemObj.name}}"> <div data-options="dxTemplate: { name: 'filingTypeItem' }" class="dx-item-content dx-list-item-content" title="{{itemObj.name}}">
{{itemObj.name}} {{itemObj.name}}
</div> </div>
...@@ -44,9 +44,9 @@ ...@@ -44,9 +44,9 @@
<span class="tab-content-select-lable">{{'SelectTemplateGroup' | translate}}</span> <span class="tab-content-select-lable">{{'SelectTemplateGroup' | translate}}</span>
<div class="tab-content-select selectTemplateGroup col-md-2" id="dx-select-template-groups"> <div class="tab-content-select selectTemplateGroup col-md-2" id="dx-select-template-groups">
</div> </div>
<span class="tab-content-select-lable" translate="ReportType" ng-show="curServiceTypeId === '6' || curServiceTypeId === '11' || curServiceTypeId === '99'"></span> <span class="tab-content-select-lable" translate="ReportType" ng-show="curServiceTypeId === '2' ||curServiceTypeId === '6' || curServiceTypeId === '11' || curServiceTypeId === '99'"></span>
<div class="tab-content-select reportType col-md-2" id="dx-select-report-type" ng-show="curServiceTypeId === '6' || curServiceTypeId === '11' || curServiceTypeId === '99'" <div class="tab-content-select reportType col-md-2" id="dx-select-report-type" ng-show="curServiceTypeId === '2' ||curServiceTypeId === '6' || curServiceTypeId === '11' || curServiceTypeId === '99'"
dx-select-box="detailReportTypeList" dx-item-alias="itemObj"> dx-select-box="detailReportTypeList" dx-item-alias="itemObj">
<div data-options="dxTemplate: { name: 'reportTypeItem' }" class="dx-item-content dx-list-item-content" title="{{itemObj.name}}"> <div data-options="dxTemplate: { name: 'reportTypeItem' }" class="dx-item-content dx-list-item-content" title="{{itemObj.name}}">
{{itemObj.name}} {{itemObj.name}}
</div> </div>
......
atms-web/src/main/webapp/app/admin/systemConfiguration/declarationFormConfiguration/declaration-form-configuration.less
View file @ f09fa1dd
...@@ -240,15 +240,15 @@ ...@@ -240,15 +240,15 @@
} }
&.reportType { &.reportType {
width: 130px; width: 120px;
} }
&.selectTemplateGroup { &.selectTemplateGroup {
width: 200px; width: 150px;
} }
&.selectReport { &.selectReport {
width: 200px; width: 150px;
} }
} }
} }
......
atms-web/src/main/webapp/app/common/controls/edit-template-modal/edit-template-modal.js
View file @ f09fa1dd
commonModule.directive('editTemplateModal', ['$log', commonModule.directive('editTemplateModal', ['$log',
function ($log) { function ($log) {
'use strict'; 'use strict';
$log.debug('editUserModal.ctor()...'); $log.debug('editUserModal.ctor()...');
return { return {
restrict: 'E', restrict: 'E',
templateUrl: '/app/common/controls/edit-template-modal/edit-template-modal.html' + '?_=' + Math.random(), templateUrl: '/app/common/controls/edit-template-modal/edit-template-modal.html' + '?_=' + Math.random(),
replace: true, replace: true,
controller: 'editTemplateModalController', controller: 'editTemplateModalController',
scope: scope:
{ {
operateType:'=', operateType:'=',
templateModel:'=?', templateModel:'=?',
isUpdate:'=?', isUpdate:'=?',
onClosed: '&' onClosed: '&'
} }
//, //,
//link: function (scope, element) { //link: function (scope, element) {
// element.find('.selector-input').on('focus', function () { // element.find('.selector-input').on('focus', function () {
// element.find('.org-tree-container').show(); // element.find('.org-tree-container').show();
// }); // });
// $(document).on('click', function () { // $(document).on('click', function () {
// element.find('.org-tree-container').hide(); // element.find('.org-tree-container').hide();
// }).on('click', '.org-tree-wrapper', function (e) { // }).on('click', '.org-tree-wrapper', function (e) {
// e.stopPropagation(); // e.stopPropagation();
// }); // });
//} //}
}; };
} }
]); ]);
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/edit-template-modal/edit-template-modal.less
View file @ f09fa1dd
@import "~/app-resources/css/admin-theme.less"; @import "~/app-resources/css/admin-theme.less";
.edit-template-modal-wrapper { .edit-template-modal-wrapper {
.radio-wrapper { .radio-wrapper {
margin-left: 0px; margin-left: 0px;
} }
.control-label { .control-label {
width: 100px!important; width: 100px!important;
font-weight: normal; font-weight: normal;
padding-left: 15px!important; padding-left: 15px!important;
padding-right: 0px!important; padding-right: 0px!important;
text-align: left; text-align: left;
} }
.normal-label { .normal-label {
font-weight: normal; font-weight: normal;
padding-left: 0px!important; padding-left: 0px!important;
padding-right: 0px!important; padding-right: 0px!important;
input[type="radio"] { input[type="radio"] {
margin: 0px 0.5em 0px 0px; margin: 0px 0.5em 0px 0px;
} }
} }
.col-sm-5, .col-sm-5,
.col-sm-7, .col-sm-7,
col-sm-9 { col-sm-9 {
padding-left: 0px!important; padding-left: 0px!important;
padding-right: 0px!important; padding-right: 0px!important;
} }
.upload-sheet-wrapper { .upload-sheet-wrapper {
padding-left: 0; padding-left: 0;
padding-right: 32px; padding-right: 32px;
} }
}
.checkbox {
.edit-template-name-wrapper { margin-left: 100px;
.modal-content { }
width: 400px!important; }
}
.edit-template-name-wrapper {
.must-input { .modal-content {
color: red; width: 400px!important;
} }
.control-label {
width: 100px !important; .must-input {
font-weight: normal; color: red;
padding-left: 15px; }
padding-right: 0px; .control-label {
text-align: left; width: 100px !important;
} font-weight: normal;
padding-left: 15px;
.col-sm-8 { padding-right: 0px;
padding-left: 0px; text-align: left;
padding-right: 0px; }
}
} .col-sm-8 {
padding-left: 0px;
.margin-find{ padding-right: 0px;
margin: -10px -10px 10px -10px; }
} }
.margin-sheet{ .margin-find{
margin: -10px -10px 10px -20px; margin: -10px -10px 10px -10px;
} }
.tree-view-list { .margin-sheet{
.dx-checkbox-container { margin: -10px -10px 10px -20px;
padding: 4px; }
.dx-checkbox-icon { .tree-view-list {
height: 16px; .dx-checkbox-container {
width: 16px; padding: 4px;
}
.dx-checkbox-icon {
.dx-checkbox-icon { height: 16px;
font-size: 14px; width: 16px;
} }
}
.dx-checkbox-icon {
.dx-checkbox-indeterminate .dx-checkbox-icon:before { font-size: 14px;
width: 14px; }
height: 14px; }
left: 0px;
top: 0px; .dx-checkbox-indeterminate .dx-checkbox-icon:before {
} width: 14px;
} height: 14px;
left: 0px;
.search-box { top: 0px;
margin: 6px -10px -10px -10px; }
}
.search-box {
margin: 6px -10px -10px -10px;
} }
\ No newline at end of file
atms-web/src/main/webapp/app/common/webservices/templateGroup.svc.js
View file @ f09fa1dd
...@@ -12,7 +12,7 @@ webservices.factory('templateGroupService', ['$http', 'apiConfig', 'httpCacheSer ...@@ -12,7 +12,7 @@ webservices.factory('templateGroupService', ['$http', 'apiConfig', 'httpCacheSer
return $http.post('/templateGroup/addTemplateGroup', templateGroup, apiConfig.create()); return $http.post('/templateGroup/addTemplateGroup', templateGroup, apiConfig.create());
}, },
addTemplateGroupWithoutTemplate: function (templateGroup) { addTemplateGroupWithoutTemplate: function (templateGroup) {
return $http.post('/templateGroup/templateGroup/withoutTemplate', templateGroup, apiConfig.create()); return $http.post('/templateGroup/withoutTemplate', templateGroup, apiConfig.create());
}, },
getTemplateList: function (templateGroupID, reportType) { getTemplateList: function (templateGroupID, reportType) {
return $http.get('/template/get?templateGroupID=' + templateGroupID + '&reportType=' + reportType, apiConfig.create()); return $http.get('/template/get?templateGroupID=' + templateGroupID + '&reportType=' + reportType, apiConfig.create());
......
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