Skip to content

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

添加制证审核不通过记录页面

parent c7add34f
Hide whitespace changes
Inline Side-by-side
Showing with 446 additions and 47 deletions
src/main/java/com/yxproject/start/api/PersonPostApi.java
View file @ 614a28cb
......@@ -24,10 +24,7 @@ import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
import static com.yxproject.start.utils.YXStringUtils.stripNonDigits;
......@@ -61,7 +58,8 @@ public class PersonPostApi {
resultList = new ArrayList<>();
jsonArray = JSONArray.fromObject(jsonStr);
for (int i = 0; i < jsonArray.size(); i++) {
Map<String, Object> resultMap = personPostService.selectNote((int) (jsonArray.get(i)));
String str=jsonArray.get(i).toString();
Map<String, Object> resultMap = personPostService.selectNote(str);
resultList.add(resultMap);
}
} catch (Exception e) {
......@@ -87,7 +85,10 @@ public class PersonPostApi {
jsonArray = JSONArray.fromObject(jsonStr);
for (int i = 0; i < jsonArray.size(); i++) {
Map<String, Object> noteMap = (Map<String, Object>) jsonArray.get(i);
personPostService.addNote(noteMap.get("id").toString(), noteMap.get("note").toString());
String uploadNo=noteMap.get("id").toString();
String note= noteMap.get("note").toString();
String name=noteMap.get("name").toString();
personPostService.cancelPostByAcceptNo(uploadNo,note,name);
}
} catch (Exception e) {
logger.error("备注信息：" + jsonArray);
......@@ -295,27 +296,31 @@ public class PersonPostApi {
*/
@RequestMapping("checkPersonalPost")
@Transactional
public List<PersonPostEntity> checkPersonalPost(@RequestBody String jsonStr, HttpServletRequest requ) {
public List<Map<String, Object>> checkPersonalPost(@RequestBody String jsonStr, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
JSONArray jsonArray = JSONArray.fromObject(jsonStr);
List<PersonPostEntity> list = new ArrayList<>();
List<Map<String, Object>> resultList = new ArrayList<>();
try {
String uploadNo = "";
for (int i = 0; i < jsonArray.size(); i++){
String no = jsonArray.get(i).toString();
if(i!=jsonArray.size()-1){
uploadNo+="'"+no+"',";
}else{
uploadNo+="'"+no+"'";
String uploadNo = JSONObject.fromObject(jsonArray.get(i)).getString("acceptNo");
String remarks = JSONObject.fromObject(jsonArray.get(i)).getString("remarks");
List<Map<String, Object>> resultMap = personPostService.checkPersonalPost(uploadNo);
if ( resultMap.size()>0) {
Map<String, Object> map = new LinkedHashMap<>();
map.put("FIRST_WHITE", resultMap.get(0).get("FIRST_WHITE"));
map.put("APPLICANT_NAME",resultMap.get(0).get("APPLICANT_NAME"));
map.put("RECIPIENT_NAME", resultMap.get(0).get("RECIPIENT_NAME"));
map.put("NATURE_OF_THE_INFORMATION",resultMap.get(0).get("NATURE_OF_THE_INFORMATION"));
map.put("REMARKS", remarks);
resultList.add(map);
}
}
list = personPostService.checkPersonalPost(uploadNo);
} catch (Exception e) {
logger.error("上传受理号：" + jsonArray);
logger.error("Exception 按受理号检查个人邮寄信息", e);
}
return list;
return resultList;
}
/**
......@@ -323,23 +328,35 @@ public class PersonPostApi {
* @return
*/
@RequestMapping("cancelPostByAcceptNo")
public boolean 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();
MDC.put("ip", remoteAddr);
boolean flag = false;
int i=0;
List<Map<String, Object>> resultList = new ArrayList<>();
Map<String, Object> map = new LinkedHashMap<>();
try {
JSONArray jsonArray = JSONArray.fromObject(cancelList);
for (Object o : jsonArray){
JSONObject jsonObject = JSONObject.fromObject(o);
String acceptNo = jsonObject.getString("acceptNo");
String remarks = jsonObject.getString("remarks");
flag = personPostService.cancelPostByAcceptNo(acceptNo,remarks,name);
String uploadNo = jsonObject.getString("FIRST_WHITE");
String remarks = jsonObject.getString("REMARKS");
//新增审核不通过记录，修改邮寄订单状态
personPostService.cancelPostByAcceptNo(uploadNo,remarks,name);
i++;
}
map.put("STATIC", "200");
map.put("TEST", "修改成功"+i+"行！");
}catch (Exception e){
logger.error("邮寄信息：" + cancelList);
logger.error("Exception 按受理号检查个人邮寄信息", e);
map.put("STATIC", "500");
map.put("TEST", "提交失败"+e);
}finally {
resultList.add(map);
}
return flag;
return resultList;
}
/**
......
src/main/java/com/yxproject/start/mapper/PersonPostMapper.java
View file @ 614a28cb
......@@ -59,12 +59,12 @@ public interface PersonPostMapper {
public List <PersonPostEntity> findAllPersonalData( @Param("applicantName") String applicantName, @Param("orderNumber") String orderNumber, @Param("state") String state, @Param("latticeMouthInformation") String latticeMouthInformation, @Param("getToCounty") String getToCounty, @Param("startDate") String startDate,@Param("endDate") String endDate, @Param("firstIndex") long firstIndex, @Param("pageSize") long pageSize, @Param("emailNo") String emailNo, @Param("notNull") int notNull , @Param("printDate") String printDate);
@Select("select ID,FIRST_WHITE,APPLICANT_NAME,NOTE from person_post where ID=#{id}")
public List<Map<String,Object>> selectNote(@Param("id")int id);
@Select("select ID,FIRST_WHITE,APPLICANT_NAME,NOTE from person_post where FIRST_WHITE=#{uploadId}")
public List<Map<String,Object>> selectNote(@Param("uploadId")String uploadId);
@Update("UPDATE PERSON_POST SET NOTE = #{note},STATE1 = 2 where ID = #{id}")
public boolean addNote(@Param("id")String id,@Param("note")String note);
@Update("UPDATE PERSON_POST SET NOTE = #{note},STATE1 = 1 where FIRST_WHITE = #{uploadNo}")
public boolean addNote(@Param("uploadNo")String uploadNo,@Param("note")String note);
@Select("<script> " +
"SELECT COUNT(*) FROM PERSON_POST \n" +
......@@ -142,13 +142,17 @@ public interface PersonPostMapper {
public List <PersonPostEntity> findAllPersonalDataNoPage( @Param("sqrxm") String sqrxm, @Param("ddh") String ddh, @Param("hasPrinted") String hasPrinted,
@Param("gkxx") String gkxx, @Param("str") String str, @Param("startDate") String startDate,@Param("endDate") String endDate, @Param("emailNo") String emailNo,@Param("printDate") String printDate,@Param("notNull") String notNull );
@Select("SELECT * FROM PERSON_POST WHERE STATE1 = 3 AND FIRST_WHITE IN (${uploadNo}) ")
public List <PersonPostEntity> checkPersonalPost(@Param("uploadNo") String uploadNo);
@Select("SELECT distinct first_White,applicant_Name,recipient_Name,nature_Of_The_Information,ACCEPT_THE_MATTER " +
" FROM PERSON_POST WHERE STATE1 = 3 AND FIRST_WHITE IN (${uploadNo}) ")
public List<Map<String, Object>> checkPersonalPost(@Param("uploadNo") String uploadNo);
@Insert("INSERT INTO AUDLIT_FAILURE (UPLOAD_NO,UP_TIUME,REMARKS,NAME) VALUES (#{acceptNo},SYSDATE,#{remarks},#{name})")
public boolean cancelPostByAcceptNo(@Param("acceptNo")String acceptNo, @Param("remarks")String remarks, @Param("name")String name);
@Insert("INSERT INTO AUDLIT_FAILURE (UPLOAD_NO,UP_TIUME,REMARKS,NAME) VALUES (#{uploadNo},SYSDATE,#{remarks},#{name})")
public boolean cancelPostByAcceptNo(@Param("uploadNo")String uploadNo, @Param("remarks")String remarks, @Param("name")String name);
@Select("SELECT * FROM AUDLIT_FAILURE WHERE TO_CHAR(UP_TIUME,'yyyyMMdd') BETWEEN #{beginDate} AND #{endDate}")
@Select("SELECT af.*,pp.APPLICANT_NAME,pp.NATURE_OF_THE_INFORMATION,pp.RECIPIENT_NAME,pp.RECIPIENT_ADDRESS,pp.RECIPIENT_PHONE FROM AUDLIT_FAILURE af\n" +
"left join PERSON_POST pp \n" +
"on af.UPLOAD_NO=pp.FIRST_WHITE " +
"WHERE TO_CHAR(UP_TIUME,'yyyyMMdd') BETWEEN #{beginDate} AND #{endDate}")
public List<Map<String, Object>> selectCancelPost(@Param("beginDate")String beginDate,@Param("endDate") String endDate);
@Select("SELECT * FROM PERSON_POST WHERE FIRST_WHITE = #{acceptNo}")
......
src/main/java/com/yxproject/start/service/PersonPostService.java
View file @ 614a28cb
......@@ -44,13 +44,13 @@ public interface PersonPostService {
public List<PersonPostEntity> downLoadReportForm(HttpServletRequest request,HttpServletResponse response,String sqrxm, String ddh, String hasPrinted, String gkxx, JSONArray jsonArray,String starDate,String endDate,String emailNo,String printDate,String notNull);
public Map<String,Object> selectNote(@Param("id")int id);
public Map<String,Object> selectNote(@Param("uploadId")String uploadId);
public boolean addNote(@Param("id")String id,@Param("note")String note);
public boolean addNote(@Param("uploadNo")String uploadNo,@Param("note")String note);
public List<PersonPostEntity> checkPersonalPost(String uploadNo);
public List<Map<String, Object>> checkPersonalPost(String uploadNo);
public boolean cancelPostByAcceptNo(String acceptNo,String remarks,String name);
public boolean cancelPostByAcceptNo(String uploadNo,String remarks,String name);
public List<Map<String,Object>> selectCancelPost(String beginDate,String endDate);
......
src/main/java/com/yxproject/start/service/impl/PersonPostServiceImpl.java
View file @ 614a28cb
......@@ -134,25 +134,27 @@ public class PersonPostServiceImpl implements PersonPostService {
}
@Override
public Map<String, Object> selectNote(int id) {
List<Map<String, Object>> maps = personPostMapper.selectNote(id);
public Map<String, Object> selectNote(String uploadId) {
List<Map<String, Object>> maps = personPostMapper.selectNote(uploadId);
return maps.get(0);
}
@Override
public boolean addNote(String id, String note) {
personPostMapper.addNote(id, note);
public boolean addNote(String uploadNo, String note) {
personPostMapper.addNote(uploadNo, note);
return true;
}
@Override
public List<PersonPostEntity> checkPersonalPost(String uploadNo) {
public List<Map<String, Object>> checkPersonalPost(String uploadNo) {
return personPostMapper.checkPersonalPost(uploadNo);
}
@Override
public boolean cancelPostByAcceptNo(String acceptNo, String remarks, String name) {
return personPostMapper.cancelPostByAcceptNo(acceptNo,remarks,name);
public boolean cancelPostByAcceptNo(String uploadNo, String remarks, String name) {
personPostMapper.cancelPostByAcceptNo(uploadNo,remarks,name);
personPostMapper.addNote(uploadNo, remarks);
return true;
}
@Override
......
src/main/resources/static/css/dialog.css
View file @ 614a28cb
......@@ -15,6 +15,11 @@
padding-top: 10px;
text-align: right;
}
.ui-dialog-textLeft{
border-top:1px solid #DEDEDE;
padding-top: 10px;
text-align: left;
}
.ngdialog {
text-align: left;
......
src/main/resources/static/dialogs/confirmAF.html 0 → 100644
View file @ 614a28cb
<div class="ui-dialog-title">
确认信息
</div>
<div class="ui-dialog-content">
<table class="table table-hover">
<thead>
<th>NO.</th>
<th>受理号</th>
<th>申请人姓名</th>
<th>收件人姓名</th>
<th>内件信息</th>
<th>取消原因</th>
</thead>
<tbody>
<tr ng-repeat="item in msgText">
<td>{{$index + 1}}</td>
<td>{{item.FIRST_WHITE}}</td>
<td>{{item.APPLICANT_NAME}}</td>
<td>{{item.RECIPIENT_NAME}}</td>
<td>{{item.NATURE_OF_THE_INFORMATION}}</td>
<td>{{item.REMARKS}}</td>
</tr>
<tr ng-if="msgText.length==0" style="color: red;">
<td><h3>暂无数据</h3></td>
</tr>
</tbody>
</table>
</div>
<div class="ui-dialog-textLeft">
<div ng-repeat="msg in updatemsg">
<p ng-if="msg.STATIC==200" style="color: green;">{{msg.TEST}}</p>
<p ng-if="msg.STATIC==500" style="color: red;">{{msg.TEST}}</p>
</div>
</div>
<div class="ui-dialog-confirm">
<button type="submit" class="btn btn-info" ng-disabled="showThis" ng-click="upPostData()">确定添加</button>
<button type="submit" class="btn btn-danger" ng-click="closeThisDialog()">取消</button>
</div>
src/main/resources/static/index.html
View file @ 614a28cb
......@@ -223,5 +223,7 @@
<script src="views/greenPackageInfo/greenPackageInfo.js"></script>
<script src="views/confirmNotDeliveredInfo/confirmNotDeliveredInfo.js"></script>
<script src="views/machinePackageImport/machinePackageImport.js"></script>
<script src="views/addAuditFailure/addAuditFailure.js"></script>
</body>
</html>
\ No newline at end of file
src/main/resources/static/js/app.js
View file @ 614a28cb
......@@ -47,7 +47,8 @@ angular.module('AvatarCheck', [
"AvatarCheck.confirmNotDeliveredInfo",
'AvatarCheck.getPoliceList',
"AvatarCheck.machinePackageImport",
'AvatarCheck.blank'
'AvatarCheck.blank',
'AvatarCheck.addAuditFailure'
]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider',function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) {
$locationProvider.hashPrefix('!');
$routeProvider.otherwise({redirectTo: '/blank'});
......
src/main/resources/static/js/service.js
View file @ 614a28cb
......@@ -1181,11 +1181,48 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data)
})
},
selectAFData:function(data,success){
var body = JSON.stringify(data);
$http({
method: 'POST',
url: "../personPostApi/checkPersonalPost" + urlTimeStamp(),
data: body,
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) {
success(response.data)
})
},
selectPostUpData:function(data,name,success){
var body = JSON.stringify(data);
$http({
method: 'GET',
url: "../personPostApi/cancelPostByAcceptNo" + urlTimeStamp(),
params:{
cancelList:body,
name:name
},
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) {
success(response.data)
})
},
selectAFdate:function(begDate,endDate,success){
$http({
method: 'GET',
url: "../personPostApi/selectCancelPost" + urlTimeStamp(),
params:{
beginDate:begDate,
endDate:endDate
},
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) {
success(response.data)
})
},
selectFailedInfo:function(date1,date2,name,success){
// if($rootScope.loginData.roleList[0].process==2){
// name = "";
// }
console.log(date1,date2,name);
$http({
method: 'GET',
url: "../FailedCardApi/queryFailedCardInfo",
......
src/main/resources/static/views/addAuditFailure/addAuditFailure.html 0 → 100644
View file @ 614a28cb
<style>
.table th, .table td {
text-align: center;
vertical-align: middle!important;
}
.select2-search__field {
height:30px;
}
.ul li{
cursor: pointer;
}
.table .colSpan{
column-span: 5;
}
.page-list .pagination {float:left;}
.page-list .pagination span {cursor: pointer;}
.page-list .pagination .separate span{cursor: default; border-top:none;border-bottom:none;}
.page-list .pagination .separate span:hover {background: none;}
.page-list .page-total {float:left; margin: 25px 20px;}
.page-list .page-total input, .page-list .page-total select{height: 26px; border: 1px solid #ddd;}
.page-list .page-total input {width: 40px; padding-left:3px;}
.page-list .page-total select {width: 50px;}
.page-list:after {
display: block;
clear: both;
content: ""
}
.page-list{
zoom: 1
}
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box" ng-if="loginData.roleList[0].process!=2">
<strong class="box-header">制证审核不通过记录</strong>
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom:10px;">
<tr>
<td width="200px">
<span>审核不通过记录数量:</span>
</td>
<td width="200px">
<input style="" type="number" ng-model="failedCount"></td>
<td>
<div style="text-align: left;">
<input type="submit" ng-click="createInputs(failedCount)" class="btn btn-primary" value="确定">
</div>
</td>
</tr>
</table>
<table class="table table-bordered" style="margin-bottom: 0;">
<tr ng-repeat="item in arr">
<td>{{$index+1}}</td>
<td>
上传受理号:
</td>
<td>
<input type="text" placeholder="请填写上传受理号" ng-model="audit[$index].acceptNo"style="height: 34px;width: 100%;">
</td>
<td>
取消原因:
</td>
<td>
<select class="form-control select2"
ng-model="audit[$index].remarks" >
<option value="原籍审核不通过">原籍审核不通过</option>
<option value="取消邮寄">取消邮寄</option>
<option value="其他">其他</option>
</select>
</td>
</tr>
<tr ng-if="arr.length>0">
<td colspan="5">
<div style="float: right">
<button class="btn btn-primary" ng-click="checkAf(audit)" style="width: 147px;">检查</button>
</div>
</td>
</tr>
</table>
</div>
</div>
<div class="box">
<div class="box-header">
<strong>制证审核不通过记录提交详情</strong>
</div>
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td width="200px;">
<span>开始日期:</span>
</td>
<td width="200px;">
<input type="text" class="form-control" ng-model="choseDate1" id="datepicker1" readonly/>
</td>
<td width="200px;">
<span>截至日期</span>
</td>
<td width="200px;">
<input type="text" class="form-control" ng-model="choseDate" id="datepicker2" readonly/>
</td>
<td>
<div style="text-align: left;">
<button class="btn btn-primary" ng-click="aselectAF()">查询</button>
</div>
</td>
</tr>
</table>
<div class="box-info" style="padding: 7px;padding-top: 0px;">
<table class="table table-bordered table-hover postTable" ng-if="afInfo.length>0">
<thead>
<tr>
<th>NO.</th>
<th>上传受理号</th>
<th>提交人</th>
<th>提交时间</th>
<th>取消原因</th>
<th>申请人姓名</th>
<th>收件人姓名</th>
<th>收件人电话</th>
<th>收件地址</th>
<th>内件信息</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in afInfo | orderBy:'ID'">
<td>{{$index+1}}</td>
<td>{{item.UPLOAD_NO}}</td>
<td>{{item.NAME}}</td>
<td>{{item.UP_TIUME | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.REMARKS}}</td>
<td>{{item.APPLICANT_NAME}}</td>
<td>{{item.RECIPIENT_NAME}}</td>
<td>{{item.RECIPIENT_PHONE}}</td>
<td>{{item.RECIPIENT_ADDRESS}}</td>
<td>{{item.NATURE_OF_THE_INFORMATION}}</td>
</tr>
</tbody>
</table>
<div ng-if="afInfo.length==0">
<h4 style="padding-left: 10px;">暂无数据</h4>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/addAuditFailure/addAuditFailure.js 0 → 100644
View file @ 614a28cb
'use strict';
angular.module('AvatarCheck.addAuditFailure', ['ngRoute', 'AvatarCheck.http'])
.config(['$routeProvider', function ($routeProvider) {
$routeProvider.when('/addAuditFailure', {
templateUrl: 'views/addAuditFailure/addAuditFailure.html' + urlTimeStamp(),
controller: 'addAuditFailure',
cache: false
});
}])
.controller('addAuditFailure', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate1 = $filter("date")(new Date(), "yyyy-MM-dd");
//Date picker
$('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//查询
$scope.aselectAF = function () {
var begDate = $('#datepicker1').val();
var endDate = $('#datepicker2').val();
if(begDate==""){
begDate=$scope.choseDate1;
}
if(endDate==""){
endDate=$scope.choseDate;
}
//工作组只能查看自己的
// if ($rootScope.loginData.roleList[0].process==3){
// $scope.userName=$rootScope.loginData.name;
// }else {
// $scope.userName="";
// }
HttpService.selectAFdate(begDate,endDate,function(data){
$scope.afInfo = data;
})
};
if($rootScope.loginData.login==true){
$scope.aselectAF();
}
$scope.createInputs = function(failedCount){
if(failedCount>0){
var count = failedCount;
if(count>10){
count=10;
}
$scope.arr = [];
for (var i=0;i<count;i++){
$scope.arr.push(i);
}
}else{
MessageService.showAlert("请输入正确的数字")
}
}
$scope.cancelAdd =function(){
$scope.arr = [];
}
var cancelAdd = $scope.cancelAdd;
var reGet = $scope.aselectFailedInfo;
$scope.audit="";
//使用上传受理号查询邮寄订单
$scope.checkAf=function (str) {
HttpService.selectAFData(str,function(data) {
$scope.emsMap = data;
ngDialog.open({
template: 'dialogs/confirmAF.html' + urlTimeStamp(),
width: 970,
cache: false,
closeByDocument:false,
data: $scope.emsMap,
controller: ['$scope','HttpService','MessageService',function ($scope,HttpService,MessageService) {
$scope.showThis=false;
$scope.msgText = $scope.ngDialogData;
if (data.length==0){
$scope.showThis=true;
}
$scope.upPostData=function () {
$scope.showThis=true;
HttpService.selectPostUpData($scope.msgText,$rootScope.loginData.name,function(data) {
$scope.updatemsg=data;
$scope.closeThisDialog();
$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
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.html
View file @ 614a28cb
......@@ -172,7 +172,7 @@
<td>{{item.recipientPhone}}</td>
<td ng-click="showDetail(item)"><a>{{item.recipientAddress}}</a></td>
<td>{{item.printDate | date:'yyyy-MM-dd hh:mm:ss'}}</td>
<td ng-click="addNote(item.id)">
<td ng-click="addNote(item.firstWhite)">
<a style="color: black">{{item.note}}</a>
<a ng-if="item.note==null" >更新</a>
</td>
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js
View file @ 614a28cb
......@@ -407,7 +407,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
width: 800,
cache: false,
closeByDocument: false,
controller: ['$scope', 'HttpService', 'MessageService', function ($scope, HttpService, MessageService) {
controller: ['$scope','HttpService', 'MessageService', function ($scope, HttpService, MessageService) {
console.log(arr)
HttpService.getNoteToUpdate(arr,function(data) {
$scope.idAndNote = data;
......@@ -418,8 +418,9 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
var arr = [];
for (var i=0;i<$scope.idAndNote.length;i++){
var json={
id:$scope.idAndNote[i].ID,
note:$scope.idAndNote[i].NOTE
id:$scope.idAndNote[i].FIRST_WHITE,
note:$scope.idAndNote[i].NOTE,
name:$rootScope.loginData.name
}
arr.push(json);
}
......
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