Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 5220bc41 authored by dahai's avatar dahai
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 358db3c3 4210083b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 30 deletions
src/main/java/com/yxproject/start/mapper/SysPermissionMapper.java
View file @ 5220bc41
......@@ -53,7 +53,7 @@ public interface SysPermissionMapper{
* @param roleId
* @return
*/
@Select("select * from SYS_ROLE_PERMISSION srp ,SYS_PERMISSION sp where srp.PERMISSION_ID=sp.ID and srp.ROLE_ID=#{roleId}")
@Select("select * from SYS_ROLE_PERMISSION srp ,SYS_PERMISSION sp where srp.PERMISSION_ID=sp.ID and srp.ROLE_ID=#{roleId} and sp.AVAILABLE=0")
public List<SysPermission> selectPermissionByRoleId(@Param("roleId") Integer roleId);
/**
......
src/main/resources/static/js/service.js
View file @ 5220bc41
......@@ -661,16 +661,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data)
})
},
analyseData:function(date,success){
if(date==''){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(date)
analyseData:function(id,success){
console.log(id)
$http({
method: 'GET',
url: "../LogApi/selectAnalysisData"+urlTimeStamp(),
params:{
uploadName:date
filesId:id
}
}).then(function successCallback(response) {
success(response.data)
......@@ -786,6 +783,29 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}).then(function successCallback(response) {
success(response.data)
})
},
getReceitp:function(date,success){
$http({
method: 'GET',
url: "../ReceiptApi/queryReceiptDateByCheckDate"+urlTimeStamp(),
params:{
date:date
}
}).then(function successCallback(response) {
success(response.data)
})
},
deleteProdDataByFileId:function(id,success){
console.log(id)
$http({
method: 'GET',
url: "../LogApi/deleteFiles"+urlTimeStamp(),
params:{
fileId:id
}
}).then(function successCallback(response) {
success(response.data)
})
}
}
});
\ No newline at end of file
src/main/resources/static/views/packageLog/packageLog.js
View file @ 5220bc41
......@@ -37,6 +37,9 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
$scope.paginationConf.totalItems = data;
console.log($scope.paginationConf.totalItems,"$scope.paginationConf.totalItems")
})
if($scope.paginationConf.currentPage==0){
$scope.paginationConf.currentPage=1
}
HttpService.selectPackageLog($scope.newPackageName,$scope.idCard,$('#datepicker').val(),$scope.county,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
$scope.packageLogData = data;
console.log($scope.packageLogData,"$scope.packageLogData")
......
src/main/resources/static/views/receitp/receitp.js
View file @ 5220bc41
......@@ -31,4 +31,40 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
a.click();
}
$scope.doSearchReceitp = function () {
var date=$('#datepicker').val();
if(date==''){
date= $filter("date")(new Date(), "yyyy-MM-dd");
}
HttpService.getReceitp(date,function(data){
$scope.receitpData=data;
console.log(data);
})
}
$scope.doSearchReceitp();
$scope.checkAll = function ($event){
var checkAll = $event.target;
var checkbox =$("input[type=checkbox]");
for (var i=0;i<checkbox.length;i++){
if(checkAll.checked) {
checkbox[i].checked = true;
}else {
checkbox[i].checked = false;
}
}
}
$scope.checkAllPolice = function($event,countyCode) {
var checkAllPolice = $event.target;
var checkPolice =$(".checkPolice"+countyCode);
for (var i=0;i<checkPolice.length;i++){
if(checkAllPolice.checked) {
checkPolice[i].checked = true;
}else {
checkPolice[i].checked = false;
}
}
}
});
\ No newline at end of file
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.html
View file @ 5220bc41
......@@ -88,18 +88,19 @@
<td>{{item.commonCardCount}}</td>
<td>{{item.postCardCount}}</td>
<td>
<button class="btn btn-primary" ng-click="analysis(item.uploadDate,item.packageCount)">解析</button>
<button class="btn btn-danger">删除</button>
<button class="btn btn-primary" ng-click="analysis(item.uploadDate,item.packageCount,item.fileId)">解析</button>
<button class="btn btn-danger" ng-click="deleteDataById(item.uploadDate,item.packageCount,item.fileId)">删除</button>
</td>
</tr>
</tbody>
</table>
<div class="box-body" ng-if="xmlPackageData.length==0">
<h4>暂无记录。</h4>
</div>
<div style="padding-left: 27%;" ng-if="xmlPackageData.length>0">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div>
<div class="box-body" ng-if="xmlPackageData.length==0">
<h4>暂无记录。</h4>
</div>
</div>
</div>
</div>
......
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.js
View file @ 5220bc41
......@@ -32,31 +32,18 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.analysis = function (uploadDate,packageCount) {
$scope.analysis = function (uploadDate,packageCount,id) {
ngDialog.open({
template: 'dialogs/analysisDialog.html' + urlTimeStamp(),
width: 876,
cache: false,
controller: ['$scope','HttpService', function ($scope,HttpService) {
// $scope.paginationConf = {
// currentPage: 1,
// itemsPerPage: 10,
// perPageOptions: [10, 20, 30, 40, 50]
// };
$scope.upDate =uploadDate;
$scope.upCount=packageCount;
$scope.getAnalyseData = function() {
// HttpService.analyseDataCount(uploadDate, function (data) {
// $scope.paginationConf.totalItems =data.respData.string;
// console.log($scope.paginationConf.totalItems)
// })
HttpService.analyseData(uploadDate, function (data) {
$scope.resultData = data;
console.log($scope.resultData)
})
}
// 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getAnalyseData);
HttpService.analyseData(id, function (data) {
$scope.resultData = data;
console.log($scope.resultData)
})
}]
});
......@@ -90,6 +77,9 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.paginationConf.totalItems = data.respData.string;
console.log($scope.paginationConf.totalItems,"$scope.paginationConf.totalItems")
})
if($scope.paginationConf.currentPage==0){
$scope.paginationConf.currentPage=1;
}
HttpService.selectXmlPackage($("#datepicker").val(),$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
$scope.xmlPackageData = data.respData;
console.log($scope.xmlPackageData,"$scope.xmlPackageData")
......@@ -99,5 +89,27 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getXmlPackage);
var reGet = $scope.getXmlPackage;
$scope.deleteDataById = function(uploadDate,packageCount,id){
ngDialog.open({
template: 'dialogs/confirm.html' + urlTimeStamp(),
width: 600,
cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.total = packageCount;
$scope.importDate =uploadDate;
$scope.confirmDelete = function () {
HttpService.deleteProdDataByFileId(id, function (data) {
MessageService.showAlert(data.msg);
$scope.closeThisDialog();
reGet();
})
};
}]
});
}
});
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