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
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 144 deletions
src/main/java/com/yxproject/start/mapper/SysPermissionMapper.java
View file @ 5220bc41
...@@ -53,7 +53,7 @@ public interface SysPermissionMapper{ ...@@ -53,7 +53,7 @@ public interface SysPermissionMapper{
* @param roleId * @param roleId
* @return * @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); 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']) ...@@ -661,16 +661,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
analyseData:function(date,success){ analyseData:function(id,success){
if(date==''){ console.log(id)
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(date)
$http({ $http({
method: 'GET', method: 'GET',
url: "../LogApi/selectAnalysisData"+urlTimeStamp(), url: "../LogApi/selectAnalysisData"+urlTimeStamp(),
params:{ params:{
uploadName:date filesId:id
} }
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
...@@ -786,6 +783,29 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -786,6 +783,29 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) 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 ...@@ -37,6 +37,9 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
$scope.paginationConf.totalItems = data; $scope.paginationConf.totalItems = data;
console.log($scope.paginationConf.totalItems,"$scope.paginationConf.totalItems") 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){ HttpService.selectPackageLog($scope.newPackageName,$scope.idCard,$('#datepicker').val(),$scope.county,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
$scope.packageLogData = data; $scope.packageLogData = data;
console.log($scope.packageLogData,"$scope.packageLogData") console.log($scope.packageLogData,"$scope.packageLogData")
......
src/main/resources/static/views/receitp/receitp.html
View file @ 5220bc41
...@@ -8,150 +8,60 @@ ...@@ -8,150 +8,60 @@
<strong>交接单</strong> <strong>交接单</strong>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/> <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchToday()">当前</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchHistory()">查询历史</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="doSearchReceitp()">查询</button>
</div> </div>
<!-- /.box-tools --> <!-- /.box-tools -->
</div> </div>
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body">
<div class="table-responsive mailbox-messages"> <div class="mailbox-messages" ng-if="receitpData.length>0">
<table class="table table-hover postTable "> <table class="table table-hover postTable ">
<thead> <thead>
<tr> <tr>
<th><input type="checkbox" class="icheckbox_flat-blue"></th> <th><input type="checkbox" class="checkAll" ng-click="checkAll($event)"></th>
<th>NO.</th> <th>NO.</th>
<th>派出所代码</th> <th>派出所代码</th>
<th>派出所名称</th> <th>派出所名称</th>
<th>数量</th> <th>总数</th>
<th>打印卸载</th> <th>普通证</th>
<th>电质检</th> <th>邮寄证</th>
<th>复核日期</th> <th>复核日期</th>
<th>复核人姓名</th> <th>复核人姓名</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody ng-repeat="item in receitpData">
<tr ng-click="showDetail(1)" style="background-color: #eee"> <tr style="background-color: #eee">
<td><input type="checkbox" class="icheckbox_flat-blue"></td> <td><input type="checkbox" class="checkAllPolice" ng-click="checkAllPolice($event,item.countyCode)"></td>
<td></td> <td></td>
<td>11002</td> <td>{{item.countyCode}}</td>
<td style="color: #3c8dbc">通州分局</td> <td style="color: #3c8dbc">{{item.countyName}}</td>
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
</tr> </tr>
<tr ng-click="showDetail(1)"> <tr ng-repeat="police in item.policeList">
<td><input type="checkbox" class="icheckbox_flat-blue"></td> <td><input type="checkbox" class="checkPolice{{item.countyCode}}"></td>
<td>1</td> <td>{{$index+1}}</td>
<td>110021</td> <td>{{police.policeCode}}</td>
<td>西集派出所</td> <td>{{police.policeName}}</td>
<td>2</td> <td>{{police.puSum+police.youSum}}</td>
<td>2</td> <td>{{police.puSum}}</td>
<td>0</td> <td>{{police.youSum}}</td>
<td>2019-03-06</td> <td>{{police.checkDate | limitTo : 10 }}</td>
<td>安浩</td> <td>{{police.checkName}}</td>
</tr> </tr>
<tr ng-click="showDetail(2)">
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td>2</td>
<td>110021</td>
<td>马驹桥派出所</td>
<td>3</td>
<td>3</td>
<td>3</td>
<td>2019-03-06</td>
<td>安浩</td>
</tr>
<tr ng-click="showDetail(2)">
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td>3</td>
<td>110021</td>
<td>次渠派出所</td>
<td>3</td>
<td>3</td>
<td>3</td>
<td>2019-03-06</td>
<td>安浩</td>
</tr>
<tr ng-click="showDetail(2)">
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td>4</td>
<td>110021</td>
<td>梨园派出所</td>
<td>3</td>
<td>3</td>
<td>3</td>
<td>2019-03-06</td>
<td>安浩</td>
</tr>
<tr ng-click="showDetail(1)" style="background-color: #eee">
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td></td>
<td>11003</td>
<td style="color: #3c8dbc">房山分局</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr ng-click="showDetail(1)">
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td>1</td>
<td>110031</td>
<td>城关派出所</td>
<td>2</td>
<td>2</td>
<td>0</td>
<td>2019-03-06 16:30</td>
<td>安浩</td>
</tr>
<tr ng-click="showDetail(2)">
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td>2</td>
<td>110031</td>
<td>石楼派出所</td>
<td>3</td>
<td>3</td>
<td>3</td>
<td>2019-03-06 16:30</td>
<td>安浩</td>
</tr>
<tr ng-click="showDetail(2)">
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td>3</td>
<td>110023</td>
<td>琉璃河派出所</td>
<td>3</td>
<td>3</td>
<td>3</td>
<td>2019-03-06 16:30</td>
<td>安浩</td>
</tr>
<tr ng-click="showDetail(2)">
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td>4</td>
<td>110034</td>
<td>良乡派出所</td>
<td>3</td>
<td>3</td>
<td>3</td>
<td>2019-03-06 16:30</td>
<td>安浩</td>
</tr>
</tbody> </tbody>
</table> </table>
<!-- /.table --> <!-- /.table -->
</div> </div>
<h4 ng-if="receitpData.length==0">暂无数据</h4>
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
</div> </div>
<!-- /.box-body --> <!-- /.box-body -->
<div class="box-footer"> <div class="box-footer" ng-if="receitpData.length>0">
<div class="pull-right" style="margin-left: 10px;"> <div class="pull-right" style="margin-left: 10px;">
<button class="btn btn-primary" ng-click="printReceitp()">打印交接单</button> <button class="btn btn-primary" ng-click="printReceitp()">打印交接单</button>
<button class="btn btn-primary" ng-click="downloadGAinfo()">下载公安网反馈信息</button> <button class="btn btn-primary" ng-click="downloadGAinfo()">下载公安网反馈信息</button>
......
src/main/resources/static/views/receitp/receitp.js
View file @ 5220bc41
...@@ -31,4 +31,40 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http']) ...@@ -31,4 +31,40 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
a.click(); 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 @@ ...@@ -88,18 +88,19 @@
<td>{{item.commonCardCount}}</td> <td>{{item.commonCardCount}}</td>
<td>{{item.postCardCount}}</td> <td>{{item.postCardCount}}</td>
<td> <td>
<button class="btn btn-primary" ng-click="analysis(item.uploadDate,item.packageCount)">解析</button> <button class="btn btn-primary" ng-click="analysis(item.uploadDate,item.packageCount,item.fileId)">解析</button>
<button class="btn btn-danger">删除</button> <button class="btn btn-danger" ng-click="deleteDataById(item.uploadDate,item.packageCount,item.fileId)">删除</button>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div class="box-body" ng-if="xmlPackageData.length==0">
<h4>暂无记录。</h4>
</div>
<div style="padding-left: 27%;" ng-if="xmlPackageData.length>0"> <div style="padding-left: 27%;" ng-if="xmlPackageData.length>0">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination> <tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div> </div>
<div class="box-body" ng-if="xmlPackageData.length==0">
<h4>暂无记录。</h4>
</div>
</div> </div>
</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 ...@@ -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({ ngDialog.open({
template: 'dialogs/analysisDialog.html' + urlTimeStamp(), template: 'dialogs/analysisDialog.html' + urlTimeStamp(),
width: 876, width: 876,
cache: false, cache: false,
controller: ['$scope','HttpService', function ($scope,HttpService) { controller: ['$scope','HttpService', function ($scope,HttpService) {
// $scope.paginationConf = {
// currentPage: 1,
// itemsPerPage: 10,
// perPageOptions: [10, 20, 30, 40, 50]
// };
$scope.upDate =uploadDate; $scope.upDate =uploadDate;
$scope.upCount=packageCount; $scope.upCount=packageCount;
$scope.getAnalyseData = function() { HttpService.analyseData(id, function (data) {
// HttpService.analyseDataCount(uploadDate, function (data) { $scope.resultData = data;
// $scope.paginationConf.totalItems =data.respData.string; console.log($scope.resultData)
// 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);
}] }]
}); });
...@@ -90,6 +77,9 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -90,6 +77,9 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.paginationConf.totalItems = data.respData.string; $scope.paginationConf.totalItems = data.respData.string;
console.log($scope.paginationConf.totalItems,"$scope.paginationConf.totalItems") 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){ HttpService.selectXmlPackage($("#datepicker").val(),$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
$scope.xmlPackageData = data.respData; $scope.xmlPackageData = data.respData;
console.log($scope.xmlPackageData,"$scope.xmlPackageData") console.log($scope.xmlPackageData,"$scope.xmlPackageData")
...@@ -99,5 +89,27 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -99,5 +89,27 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getXmlPackage); $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