Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit ea999ccc authored by wuzhilong's avatar wuzhilong
Browse files
Options

添加取消邮寄：取消邮寄信息返回值，页面展示

parent 614a28cb
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 65 deletions
src/main/java/com/yxproject/start/api/PersonPostApi.java
View file @ ea999ccc
...@@ -331,7 +331,6 @@ public class PersonPostApi { ...@@ -331,7 +331,6 @@ public class PersonPostApi {
public List<Map<String, Object>> cancelPostByAcceptNo(@RequestParam("cancelList") String cancelList,@RequestParam("name")String name, HttpServletRequest requ){ public List<Map<String, Object>> cancelPostByAcceptNo(@RequestParam("cancelList") String cancelList,@RequestParam("name")String name, HttpServletRequest requ){
String remoteAddr = requ.getRemoteAddr(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
boolean flag = false;
int i=0; int i=0;
List<Map<String, Object>> resultList = new ArrayList<>(); List<Map<String, Object>> resultList = new ArrayList<>();
Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
...@@ -345,13 +344,13 @@ public class PersonPostApi { ...@@ -345,13 +344,13 @@ public class PersonPostApi {
personPostService.cancelPostByAcceptNo(uploadNo,remarks,name); personPostService.cancelPostByAcceptNo(uploadNo,remarks,name);
i++; i++;
} }
map.put("STATIC", "200"); map.put("STATIC", true);
map.put("TEST", "修改成功"+i+"行！"); map.put("TEST", "修改成功"+i+"行！");
}catch (Exception e){ }catch (Exception e){
logger.error("邮寄信息：" + cancelList); logger.error("邮寄信息：" + cancelList);
logger.error("Exception 按受理号检查个人邮寄信息", e); logger.error("Exception 按受理号检查个人邮寄信息", e);
map.put("STATIC", "500"); map.put("STATIC", false);
map.put("TEST", "提交失败"+e); map.put("TEST", "提交失败"+e);
}finally { }finally {
resultList.add(map); resultList.add(map);
......
src/main/java/com/yxproject/start/service/impl/ImportXmlServiceImpl.java
View file @ ea999ccc
...@@ -44,7 +44,7 @@ public class ImportXmlServiceImpl implements ImportXmlService { ...@@ -44,7 +44,7 @@ public class ImportXmlServiceImpl implements ImportXmlService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean importPersonXml( List<PreproPersonDto> preproPersonDtos, FilesEntity filesEntity) { public boolean importPersonXml( List<PreproPersonDto> preproPersonDtos, FilesEntity filesEntity) {
long l = filesMapper.insertFiles(filesEntity); long l = filesMapper.insertFiles(filesEntity);
SimpleDateFormat fo = new SimpleDateFormat("YYYYMMddhhmm"); SimpleDateFormat fo = new SimpleDateFormat("yyyyMMddhhmm");
String uploadDate = fo.format(new Date()); String uploadDate = fo.format(new Date());
for (PreproPersonDto preproPersonDto : preproPersonDtos) { for (PreproPersonDto preproPersonDto : preproPersonDtos) {
preproPersonDto.setFileId(filesEntity.getId()); preproPersonDto.setFileId(filesEntity.getId());
......
src/main/resources/static/test.html
View file @ ea999ccc
...@@ -14,63 +14,63 @@ ...@@ -14,63 +14,63 @@
<table width="100%" border="0" cellpadding="0" cellspacing="1" bgcolor="#D9D4B6"> <table width="100%" border="0" cellpadding="0" cellspacing="1" bgcolor="#D9D4B6">
<TR> <TR>
<TD colspan="2" align="center" valign="bottom" bgColor=#f7f2ff> <TD colspan="2" align="center" valign="bottom" bgColor=#f7f2ff></TD>
<input type="button" value="读取二代证卡" onclick="showvalue();"></a> <input type="button" value="读取二代证卡" onclick="showvalue();"></a>
</TR> </TR>
<TR> <TR>
<TD colspan="2" align="left" valign="bottom" bgColor=#f7f2ff>个人基本信息</TD> <TD colspan="2" align="left" valign="bottom" bgColor=#f7f2ff>个人基本信息</TD>
</TR> </TR>
<TR> <TR>
<TD bgColor=#f7f2ff align="right" style="width:25%">姓名：</TD> <TD bgColor=#f7f2ff align="right" style="width:25%">姓名：</TD>
<TD align="left" bgColor=#f7f2ff><input size="30" name="name" style="width:75%"></TD> <TD align="left" bgColor=#f7f2ff><input size="30" name="name" style="width:75%"></TD>
</TR> </TR>
<TR> <TR>
<TD bgColor=#f7f2ff align="right" style="width:25%">性别：</TD> <TD bgColor=#f7f2ff align="right" style="width:25%">性别：</TD>
<TD align="left" bgColor=#f7f2ff><INPUT size="2" style="width:75%" name="sex"></TD> <TD align="left" bgColor=#f7f2ff><INPUT size="2" style="width:75%" name="sex"></TD>
</TR> </TR>
<TR> <TR>
<TD bgColor=#f7f2ff align="right">民族：</TD> <TD bgColor=#f7f2ff align="right">民族：</TD>
<TD align="left" bgColor=#f7f2ff><INPUT size="4" style="width:75%" name="national"></TD> <TD align="left" bgColor=#f7f2ff><INPUT size="4" style="width:75%" name="national"></TD>
</TR> </TR>
<TR> <TR>
<TD bgColor=#f7f2ff align="right">出生日期：</TD> <TD bgColor=#f7f2ff align="right">出生日期：</TD>
<TD bgColor=#f7f2ff><INPUT size="16" name="birthday" style="width:75%" type=""></TD> <TD bgColor=#f7f2ff><INPUT size="16" name="birthday" style="width:75%" type=""></TD>
</TR> </TR>
<TR> <TR>
<TD bgColor=#f7f2ff align="right">住址：</TD> <TD bgColor=#f7f2ff align="right">住址：</TD>
<TD bgColor=#f7f2ff><INPUT size="70" name="address" style="width:75%" type=""></TD> <TD bgColor=#f7f2ff><INPUT size="70" name="address" style="width:75%" type=""></TD>
</TR> </TR>
<TR> <TR>
<TD bgColor=#f7f2ff align="right">公民身份号码：</TD> <TD bgColor=#f7f2ff align="right">公民身份号码：</TD>
<TD bgColor=#f7f2ff><INPUT size="36" name="id" style="width:75%" type=""></TD> <TD bgColor=#f7f2ff><INPUT size="36" name="id" style="width:75%" type=""></TD>
</TR> </TR>
<TR> <TR>
<TD bgColor=#f7f2ff align="right">签发机关：</TD> <TD bgColor=#f7f2ff align="right">签发机关：</TD>
<TD bgColor=#f7f2ff><INPUT size="30" name="qfjg" style="width:75%" type=""></TD> <TD bgColor=#f7f2ff><INPUT size="30" name="qfjg" style="width:75%" type=""></TD>
</TR> </TR>
<TR> <TR>
<TD bgColor=#f7f2ff align="right">有效期起始日期：</TD> <TD bgColor=#f7f2ff align="right">有效期起始日期：</TD>
<TD bgColor=#f7f2ff><INPUT size="16" name="yxqstart" style="width:75%" type=""></TD> <TD bgColor=#f7f2ff><INPUT size="16" name="yxqstart" style="width:75%" type=""></TD>
</TR> </TR>
<TR> <TR>
<TD bgColor=#f7f2ff align="right">有效期截止日期：</TD> <TD bgColor=#f7f2ff align="right">有效期截止日期：</TD>
<TD bgColor=#f7f2ff><INPUT size="16" name="yxqend" style="width:75%" type=""></TD> <TD bgColor=#f7f2ff><INPUT size="16" name="yxqend" style="width:75%" type=""></TD>
</TR> </TR>
<TR> <TR>
<TD bgColor=#f7f2ff align="right">最新住址：</TD> <TD bgColor=#f7f2ff align="right">最新住址：</TD>
<TD bgColor=#f7f2ff><INPUT size="70" name="newaddress" style="width:75%" type=""></TD> <TD bgColor=#f7f2ff><INPUT size="70" name="newaddress" style="width:75%" type=""></TD>
</TR> </TR>
<TR> <TR>
<TD bgColor=#f7f2ff align="right">照片</TD> <TD bgColor=#f7f2ff align="right">照片</TD>
<TD bgColor=#f7f2ff><INPUT size="70" name="Base64" style="width:75%" type=""></TD> <TD bgColor=#f7f2ff><INPUT size="70" name="Base64" style="width:75%" type=""></TD>
</TR> </TR>
<TR> <TR>
<TD bgColor=#f7f2ff align="right">是否含指纹信息</TD> <TD bgColor=#f7f2ff align="right">是否含指纹信息</TD>
<TD bgColor=#f7f2ff><INPUT size="70" name="fp" style="width:75%" type=""></TD> <TD bgColor=#f7f2ff><INPUT size="70" name="fp" style="width:75%" type=""></TD>
</TR> </TR>
</table> </table>
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
break; break;
} }
if (flag != 1) { if (flag != 1) {
alert("打开端口失败"); alert("打开端口失败");
} }
} }
...@@ -130,11 +130,11 @@ ...@@ -130,11 +130,11 @@
} }
else { else {
alert("读卡错误！" + aaa.ReadCardPath("", 1)); alert("读卡错误！" + aaa.ReadCardPath("", 1));
} }
} }
else { else {
alert("找卡错误,请重新放卡!"); alert("找卡错误,请重新放卡!");
} }
} }
aaa.EndComm(); aaa.EndComm();
......
src/main/resources/static/views/addAuditFailure/addAuditFailure.html
View file @ ea999ccc
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
</td> </td>
<td> <td>
<select class="form-control select2" <select class="form-control select2"
ng-init="audit[$index].remarks='原籍审核不通过'"
ng-model="audit[$index].remarks" > ng-model="audit[$index].remarks" >
<option value="原籍审核不通过">原籍审核不通过</option> <option value="原籍审核不通过">原籍审核不通过</option>
<option value="取消邮寄">取消邮寄</option> <option value="取消邮寄">取消邮寄</option>
...@@ -76,6 +77,7 @@ ...@@ -76,6 +77,7 @@
<td colspan="5"> <td colspan="5">
<div style="float: right"> <div style="float: right">
<button class="btn btn-primary" ng-click="checkAf(audit)" style="width: 147px;">检查</button> <button class="btn btn-primary" ng-click="checkAf(audit)" style="width: 147px;">检查</button>
<button class="btn btn-primary" ng-click="cancelAdd()" style="width: 147px;">清除</button>
</div> </div>
</td> </td>
......
src/main/resources/static/views/addAuditFailure/addAuditFailure.js
View file @ ea999ccc
...@@ -40,53 +40,44 @@ angular.module('AvatarCheck.addAuditFailure', ['ngRoute', 'AvatarCheck.http']) ...@@ -40,53 +40,44 @@ angular.module('AvatarCheck.addAuditFailure', ['ngRoute', 'AvatarCheck.http'])
if(endDate==""){ if(endDate==""){
endDate=$scope.choseDate; endDate=$scope.choseDate;
} }
//工作组只能查看自己的 //加载审核不通过详情
// if ($rootScope.loginData.roleList[0].process==3){
// $scope.userName=$rootScope.loginData.name;
// }else {
// $scope.userName="";
// }
HttpService.selectAFdate(begDate,endDate,function(data){ HttpService.selectAFdate(begDate,endDate,function(data){
$scope.afInfo = data; $scope.afInfo = data;
}) })
}; };
//清除数据
$scope.cancelAdd =function(){
$scope.audit=[];
$scope.arr = [];
}
//数据初始化
if($rootScope.loginData.login==true){ if($rootScope.loginData.login==true){
$scope.aselectAF(); $scope.aselectAF();
$scope.cancelAdd();
} }
//遍历输入框个数
$scope.createInputs = function(failedCount){ $scope.createInputs = function(failedCount){
if(failedCount>0){ if(failedCount>0){
$scope.cancelAdd();
var count = failedCount; var count = failedCount;
if(count>10){ if(count>10){
count=10; count=10;
} }
$scope.arr = [];
for (var i=0;i<count;i++){ for (var i=0;i<count;i++){
$scope.arr.push(i); $scope.arr.push(i);
} }
}else{ }else{
$scope.arr = [];
MessageService.showAlert("请输入正确的数字") MessageService.showAlert("请输入正确的数字")
} }
} };
$scope.cancelAdd =function(){
$scope.arr = [];
}
var cancelAdd = $scope.cancelAdd;
var reGet = $scope.aselectFailedInfo;
$scope.audit="";
//使用上传受理号查询邮寄订单 //使用上传受理号查询邮寄订单
$scope.checkAf=function (str) { $scope.checkAf=function (str) {
HttpService.selectAFData(str,function(data) { HttpService.selectAFData(str,function(data) {
$scope.emsMap = data; $scope.emsMap = data;
ngDialog.open({ ngDialog.open({
template: 'dialogs/confirmAF.html' + urlTimeStamp(), template: 'dialogs/confirmAF.html' + urlTimeStamp(),
width: 970, width: 970,
...@@ -96,6 +87,7 @@ angular.module('AvatarCheck.addAuditFailure', ['ngRoute', 'AvatarCheck.http']) ...@@ -96,6 +87,7 @@ angular.module('AvatarCheck.addAuditFailure', ['ngRoute', 'AvatarCheck.http'])
controller: ['$scope','HttpService','MessageService',function ($scope,HttpService,MessageService) { controller: ['$scope','HttpService','MessageService',function ($scope,HttpService,MessageService) {
$scope.showThis=false; $scope.showThis=false;
$scope.msgText = $scope.ngDialogData; $scope.msgText = $scope.ngDialogData;
//按钮禁用
if (data.length==0){ if (data.length==0){
$scope.showThis=true; $scope.showThis=true;
} }
...@@ -103,31 +95,15 @@ angular.module('AvatarCheck.addAuditFailure', ['ngRoute', 'AvatarCheck.http']) ...@@ -103,31 +95,15 @@ angular.module('AvatarCheck.addAuditFailure', ['ngRoute', 'AvatarCheck.http'])
$scope.showThis=true; $scope.showThis=true;
HttpService.selectPostUpData($scope.msgText,$rootScope.loginData.name,function(data) { HttpService.selectPostUpData($scope.msgText,$rootScope.loginData.name,function(data) {
$scope.updatemsg=data; $scope.updatemsg=data;
$scope.closeThisDialog(); //重新加载数据
$scope.aselectAF(); if (data[0].STATIC){
console.log("重新加载数据")
$scope.aselectAF();
}
}) })
} }
}] }]
}); });
}); });
}; };
$scope.audit=new Array();
$scope.deleteFailed = function(failedCardId,cardId,name) {
ngDialog.open({
template: 'dialogs/confirmDeleteFailed.html' + urlTimeStamp(),
width: 600,
cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.idCard = cardId;
$scope.name = name;
$scope.confirmDelete = function () {
HttpService.deleteFailedCard(failedCardId,function(data) {
$scope.closeThisDialog();
reGet();
})
};
}]
});
}
}); });
\ No newline at end of file
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