Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 1073ec52 authored by dahai's avatar dahai
Browse files
Options

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

parents 193732c8 18939e7a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 126 deletions
src/main/java/com/yxproject/start/api/FailedCardApi.java
View file @ 1073ec52
......@@ -112,20 +112,19 @@ public class FailedCardApi {
String name =jsonObject.get("name").toString();
TaskEntity taskEntity = new TaskEntity();
for (int i=0;i<jsonarray.size();i++) {
/*查询生成任务单需要的数据*/
// JSONObject jsonObject2 =(JSONObject)o;
Map<String,Object> resultMap= failedCardService.selectTaskListDate((String) jsonarray.get(i));
System.out.println();
//TODO 会报空指针异常
String countyCode = resultMap.get("COUNTY_CODE").toString();
Long cardType = Long.valueOf((BigDecimal) resultMap.get("CARD_TYPE_ID")+"");
Long cardType = Long.valueOf((BigDecimal) resultMap.get("CARD_TYPE")+"");
String acceptNo = (String) resultMap.get("ACCEPT_NO");
taskEntity.setCountyCode(countyCode);
taskEntity.setCardType(cardType);
taskEntity.setTaskStateId((long) 1);
taskEntity.setSubmitName(name);
/*特证数+1*/
failedCardService.specialCardAdd(acceptNo);
/*生成新任务单*/
taskListService.saveTask(taskEntity);
/*特证表添加特证*/
SpecialCardEntity specialCardEntity = new SpecialCardEntity() ;
......@@ -134,9 +133,6 @@ public class FailedCardApi {
specialCardEntity.setTaskId(taskEntity.getTaskId());
specialCardEntity.setGroupNo(acceptNo.substring(0,8));
failedCardService.addSpecialCard(specialCardEntity);
/*特证数+1*/
failedCardService.specialCardAdd(acceptNo);
}
return true;
}
......
src/main/java/com/yxproject/start/mapper/FailedCardMapper.java
View file @ 1073ec52
......@@ -73,10 +73,10 @@ public interface FailedCardMapper {
@Select("select SPECIAL_CARD.SPECIAL_TYPE,prod_card_t.accept_no,subStr(prod_card_t.UPLOAD_NO,0,6) as COUNTY_CODE,SPECIAL_CARD.INITIATOR,PREPRO_PERSON.CARD_TYPE_ID\n" +
@Select("select prod_card_t.accept_no,subStr(prod_card_t.UPLOAD_NO,0,6) as COUNTY_CODE,task.CARD_TYPE\n" +
"from prod_card_t@prod_link\n" +
"left join SPECIAL_CARD on prod_card_t.accept_no = SPECIAL_CARD.accept_no\n" +
"left join PREPRO_PERSON on PREPRO_PERSON.JMSFZSLH=prod_card_t.UPLOAD_NO\n" +
"left join group_no on subStr(prod_card_t.ACCEPT_NO,0,8)=group_no.group_no "+
"left join task on group_no.task_id = task.task_id "+
"where prod_card_t.accept_no=#{acceptNo} or prod_card_t.ID_NO=#{acceptNo}")
public Map<String,Object> selectTaskListDate(@Param("acceptNo") String acceptNo);
......
src/main/resources/static/js/app.js
View file @ 1073ec52
......@@ -162,20 +162,26 @@ angular.module('AvatarCheck', [
console.log($rootScope.tab)
}
$scope.doSearch = function (searchInput) {
$scope.msg="";
$scope.alertMsg="";
var pattern = /^[0-9]*$/
if(angular.isUndefined(searchInput)||!pattern.test(searchInput)){
$scope.disabledAdd=false;
// var pattern = /^[0-9]*$/
if(angular.isUndefined(searchInput)){
$location.path("/searchCard");
$scope.msg = "请输入正确的受理号/身份证号/任务单编号";
}else{
HttpService.searchCards(searchInput, function (data) {
if(data==''){
$scope.searchResult={}
$scope.msg="";
$scope.alertMsg = "暂无数据";
}else{
$scope.searchResult = data;
if($scope.searchResult.workOrderData[0].CARD_TYPE==1){
$scope.disabledAdd=true;
}
console.log($scope.searchResult,"searchResult")
console.log($scope.searchResult.workOrderData,"searchResult.workOrderData")
console.log($scope.searchResult.ACCdata,"searchResult.ACCdata")
......
src/main/resources/static/views/addFailed/addFailed.html
View file @ 1073ec52
......@@ -6,16 +6,16 @@
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<div class="box">
<strong class="box-header with-border">废证添加</strong>
<div class="box-primary">
<div class="box box-primary">
<form ng-submit="createInputs()" style="padding-left: 15px;">
<span style="font-size:20px;">废证数量:</span>
<input style="margin-top:20px;height: 30px;" type="number" ng-model="failedCount">
<input type="submit" class="btn btn-primary" value="确定">
<span style="font-size:14px;color: red;" ng-if="errMsglb">{{errMsglb}}</span>
</form>
<div style="padding: 15px;">
<div style="padding: 7px;">
<table class="table table-bordered">
<tr ng-repeat="item in arr">
<td>{{$index+1}}</td>
......
src/main/resources/static/views/addRest/addRest.html
View file @ 1073ec52
......@@ -9,16 +9,16 @@
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<div class="box">
<strong class="box-header with-border">余证添加</strong>
<div class="box-primary">
<div class="box box-primary">
<form ng-submit="createInputs()" style="padding-left: 15px;">
<span style="font-size:20px;">余证数量:</span>
<input style="margin-top:20px;height: 30px;" type="number" ng-model="restCount">
<input type="submit" class="btn btn-primary" value="确定">
<span style="font-size:14px;color: red;" ng-if="errMsglb">{{errMsglb}}</span>
</form>
<form style="padding: 15px; " name="form">
<form style="padding: 7px; " name="form">
<ul class="cl">
<li ng-repeat="item in arr" style="float: left;margin:0 10px 10px 0">
<input type="text" style="height: 34px;" class="rest" placeholder="请输入身份证号或受理号">
......
src/main/resources/static/views/addTag/addTag.html
View file @ 1073ec52
......@@ -6,16 +6,16 @@
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<div class="box">
<strong class="box-header with-border">添加详单备注</strong>
<div class="box-primary">
<div class="box box-primary">
<form ng-submit="createInputs()" style="padding-left: 15px;">
<span style="font-size:20px;">证件数量:</span>
<input style="margin-top:20px;height: 30px;" type="number" ng-model="tagCount">
<input type="submit" class="btn btn-primary" value="确定">
<span style="font-size:14px;color: red;" ng-if="errMsglb">{{errMsglb}}</span>
</form>
<div style="padding: 15px;">
<div style="padding: 7px;">
<table class="table table-bordered">
<tr ng-repeat="item in arr">
<td>{{$index+1}}</td>
......
src/main/resources/static/views/analysisLog/analysisLog.html
View file @ 1073ec52
......@@ -52,7 +52,8 @@
</td>
</tr>
</table>
<table class="table table-bordered table-hover postTable" ng-if="analyseLog.length>0">
<div class="box-info"style="margin:7px;margin-top:0px;">
<table class="table table-bordered table-hover postTable" ng-if="analyseLog.length>0">
<thead>
<tr>
<th>NO.</th>
......@@ -81,13 +82,15 @@
</tbody>
</table>
<div ng-if="analyseLog.length==0" class="box-body">
<h4>暂无数据</h4>
</div>
<div style="padding-left: 27%;" ng-if="analyseLog.length>0">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination>
<div ng-if="analyseLog.length==0" class="box-body">
<h4>暂无数据</h4>
</div>
<div style="padding-left: 27%;" ng-if="analyseLog.length>0">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div>
</div>
</div>
</div>
</div>
</div>
src/main/resources/static/views/cardProdPackage/cardProdPackage.html
View file @ 1073ec52
......@@ -29,9 +29,9 @@
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<div class="box ">
<strong class="box-header">制证信息打包</strong>
<div class="box-info">
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>上传受理号:</td>
......@@ -86,43 +86,43 @@
</div>
<div class="box box-default">
<strong class="box-header with-border">制证信息详情</strong>
<div class="box-info" style="padding: 10px;">
<div ng-if="packageData.length>0">
<table class="table table-bordered table-hover">
<thead>
<tr>
<th>NO.</th>
<th>上传受理号</th>
<th>姓名</th>
<th>身份证号</th>
<th>原包号</th>
<th>新包号</th>
<th>制证类型</th>
<th>禁用</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in packageData">
<td>{{$index+1}}</td>
<td>{{item.JMSFZSLH}}</td>
<td>{{item.XM}}</td>
<td>{{item.GMSFHM}}</td>
<td>{{item.SOURCE_FILE_NAME}}</td>
<td>{{item.NEW_FILE_NAME}}</td>
<td>{{item.CARD_TYPE}}</td>
<td ng-if="item.IS_VALID==1"><button class="btn btn-primary" ng-click="updateIsValid(item.ID,0)">禁用</button></td>
<td ng-if="item.IS_VALID==0"><button class="btn btn-info" ng-click="updateIsValid(item.ID,1)">启用</button></td>
</tr>
</tbody>
</table>
<p style="color:#9f191f;"><span style="margin-right: 15px;">普通证：{{simpleCardCount}}</span><span style="margin-right: 15px;">邮寄证：{{postCardCount}}</span><span>禁用数：{{forbiddenCount}}</span></p>
<div style="padding-left: 27%;">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div>
<strong class="box-header with-border">制证信息详情</strong>
<div class="box-info" style="padding: 7px; padding-top: 0px;">
<div ng-if="packageData.length>0">
<table class="table table-bordered table-hover">
<thead>
<tr>
<th>NO.</th>
<th>上传受理号</th>
<th>姓名</th>
<th>身份证号</th>
<th>原包号</th>
<th>新包号</th>
<th>制证类型</th>
<th>禁用</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in packageData">
<td>{{$index+1}}</td>
<td>{{item.JMSFZSLH}}</td>
<td>{{item.XM}}</td>
<td>{{item.GMSFHM}}</td>
<td>{{item.SOURCE_FILE_NAME}}</td>
<td>{{item.NEW_FILE_NAME}}</td>
<td>{{item.CARD_TYPE}}</td>
<td ng-if="item.IS_VALID==1"><button class="btn btn-primary" ng-click="updateIsValid(item.ID,0)">禁用</button></td>
<td ng-if="item.IS_VALID==0"><button class="btn btn-info" ng-click="updateIsValid(item.ID,1)">启用</button></td>
</tr>
</tbody>
</table>
<p style="color:#9f191f;"><span style="margin-right: 15px;">普通证：{{simpleCardCount}}</span><span style="margin-right: 15px;">邮寄证：{{postCardCount}}</span><span>禁用数：{{forbiddenCount}}</span></p>
<div style="padding-left: 27%;">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div>
<h4 ng-if="packageData.length==0">暂无记录。</h4>
</div>
<h4 ng-if="packageData.length==0">暂无记录。</h4>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.html
View file @ 1073ec52
......@@ -29,9 +29,9 @@
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<div class="box ">
<strong class="box-header">制证信息管理</strong>
<div class="box-info">
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>文件ID:</td>
......@@ -81,8 +81,8 @@
</div>
<div class="box box-default">
<strong class="box-header with-border">查询结果</strong>
<div class="box-info" style="padding: 10px;">
<strong class="box-header with-border">制证信息详情</strong>
<div class="box-info" style="padding: 7px;padding-top: 0px;">
<table class="table table-bordered table-hover" ng-if="xmlDatas.length>0">
<thead>
<tr>
......
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.js
View file @ 1073ec52
......@@ -68,7 +68,7 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
MessageService.showAlert("请选择起始日期和结束日期")
}else{
console.log($scope.startId,$scope.endId,$scope.pcs_name,startDate,endDate,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage)
HttpService.selectXmlDataCount($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,function(data){
HttpService.selectXmlDataCount($scope.startId,$scope.endId,$scope.pcs_name,startDate,endDate,function(data){
$scope.paginationConf.totalItems=data;
console.log($scope.paginationConf.totalItems,"count")
})
......
src/main/resources/static/views/createTaskList/createTaskList.html
View file @ 1073ec52
......@@ -29,7 +29,7 @@
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary">
<div class="box">
<div class="box-header with-border">
<strong>创建任务单</strong>
<div class="box-tools pull-right">
......
src/main/resources/static/views/dispatchTask/dispatchTask.html
View file @ 1073ec52
......@@ -3,7 +3,7 @@
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary">
<div class="box ">
<div class="box-header with-border">
<strong>请选择下发任务单</strong>
<div class="box-tools pull-right">
......
src/main/resources/static/views/packageLog/packageLog.html
View file @ 1073ec52
......@@ -26,9 +26,9 @@
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<div class="box">
<strong class="box-header with-border">打包日志</strong>
<div class="box-primary" style="padding: 15px;padding-top: 0;">
<div class="box box-primary" style="padding: 7px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>新包名:</td>
......@@ -42,7 +42,7 @@
</td>
<td></td>
</tr>
<tr>
<tr>
<td>
生成时间:
......@@ -65,33 +65,37 @@
</td>
<td><button class="btn btn-primary" ng-click="getPackageLog()">查询</button></td>
</tr>
</tr>
</table>
</div>
</div>
<div class="box box-default">
<strong class="box-header with-border">打包信息详情</strong>
<div class="box-info" style="padding: 7px;padding-top: 0px;">
<table class="table table-bordered table-hover postTable" ng-if="packageLogData.length>0">
<thead>
<tr>
<th>NO.</th>
<th>新包名</th>
<th>生成时间</th>
<th>记录数</th>
<th>上传地区代码</th>
<th>上传地区名称</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in packageLogData">
<td>{{$index+1}}</td>
<td>{{item.NEW_FILE_NAME}}</td>
<td>{{item.CREATE_DATE | myDateFilter}}</td>
<td>{{item.RECORD_NUMBER}}</td>
<td>{{item.DWDM}}</td>
<td>{{item.DWMC}}</td>
</tr>
</tbody>
</table>
<thead>
<tr>
<th>NO.</th>
<th>新包名</th>
<th>生成时间</th>
<th>记录数</th>
<th>上传地区代码</th>
<th>上传地区名称</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in packageLogData">
<td>{{$index+1}}</td>
<td>{{item.NEW_FILE_NAME}}</td>
<td>{{item.CREATE_DATE | myDateFilter}}</td>
<td>{{item.RECORD_NUMBER}}</td>
<td>{{item.DWDM}}</td>
<td>{{item.DWMC}}</td>
</tr>
</tbody>
</table>
<div ng-if="packageLogData.length==0" class="box-body">
<h4>暂无数据</h4>
<h4>暂无数据</h4>
</div>
<div style="padding-left: 27%;" ng-if="packageLogData.length>0">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination>
......
src/main/resources/static/views/tagPrint/tagPrint.html
View file @ 1073ec52
......@@ -13,11 +13,11 @@
</style>
<section class="content row">
<div class="col-md-12 no-padding" style="margin-top:20px;">
<div class="box box-primary ">
<div class="box">
<div class="box-header with-border">
<strong >封条标签</strong>
</div>
<div class="box-info" style="padding: 15px;padding-top: 0;">
<div class="box box-primary" style="padding: 7px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td width="10%" style="text-align: center;vertical-align: middle!important;">身份证号:</td>
......
src/main/resources/static/views/task/taskListEwriting.html
View file @ 1073ec52
......@@ -3,7 +3,7 @@
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary">
<div class="box">
<div class="box-header with-border">
<strong>任务单详情</strong>
<div class="box-tools pull-right">
......
src/main/resources/static/views/task/taskListPreLocating.html
View file @ 1073ec52
......@@ -3,7 +3,7 @@
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary">
<div class="box">
<div class="box-header with-border">
<strong>任务单详情</strong>
<div class="box-tools pull-right">
......
src/main/resources/static/views/task/taskListPrint.html
View file @ 1073ec52
......@@ -3,7 +3,7 @@
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary">
<div class="box">
<div class="box-header with-border">
<strong>任务单详情</strong>
<div class="box-tools pull-right">
......
src/main/resources/static/views/task/taskListPushing.html
View file @ 1073ec52
......@@ -3,7 +3,7 @@
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary">
<div class="box">
<div class="box-header with-border">
<strong>任务单详情</strong>
<div class="box-tools pull-right">
......
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.html
View file @ 1073ec52
......@@ -29,9 +29,9 @@
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<div class="box ">
<strong class="box-header with-border">制证包上传</strong>
<div class="box-primary">
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td width="15%">选择XML文件：</td>
......@@ -48,26 +48,27 @@
</table>
</div>
</div>
<div class="box box-primary">
<div class="box ">
<strong class="box-header with-border ">制证包管理</strong>
<div class="box-primary" style="padding: 15px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td width="15%">XML导入时间:</td>
<td colspan="2" width="35%">
<div class="input-group date" style="width: 65%">
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</div>
<input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker" readonly/>
</div>
</td>
<td style="text-align: left;">
<button class="btn btn-primary" ng-click="getXmlPackage()">查询</button>
</td>
</tr>
</table>
<table class="table table-bordered table-hover postTable" ng-if="xmlPackageData.length>0">
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td width="15%">XML导入时间:</td>
<td colspan="2" width="35%">
<div class="input-group date" style="width: 65%">
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</div>
<input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker" readonly/>
</div>
</td>
<td style="text-align: left;">
<button class="btn btn-primary" ng-click="getXmlPackage()">查询</button>
</td>
</tr>
</table>
<div class="box-info" style="padding: 7px;padding-top: 0;">
<table class="table table-bordered table-hover postTable" ng-if="xmlPackageData.length>0">
<thead>
<tr>
<th>NO.</th>
......@@ -101,7 +102,9 @@
<h4>暂无记录。</h4>
</div>
</div>
</div>
</div>
</div>
</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