Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 19fbecc3 authored by suichenguang's avatar suichenguang
Browse files
Options

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

parents 8f8e3c29 98533f7a
Hide whitespace changes
Inline Side-by-side
Showing with 146 additions and 56 deletions
src/main/java/com/yxproject/start/api/ExportXMLApi.java
View file @ 19fbecc3
......@@ -194,7 +194,7 @@ public class ExportXMLApi {
* @param str 原始字符串
* @return 返回新的字符串
*/
public static String replaceNullString(String str) {
private String replaceNullString(String str) {
if (str == null) return "";
else return str;
}
......
src/main/java/com/yxproject/start/api/ReadExcelApi.java
View file @ 19fbecc3
......@@ -175,7 +175,7 @@ public class ReadExcelApi {
*/
@RequestMapping("queryPersonPost")
public String queryPersonPost(@RequestParam("fileName") String fileName,@RequestParam("analysisState") String analysisState,@RequestParam("uploadDate") String uploadDate, @RequestParam("currPage") String currPage,@RequestParam("pageSize") String pageSize, HttpServletResponse resp) {
List<FileNameDicEntity> fileNameDicEntities = fileNameDicService.queryFileNameDic(uploadDate,fileName, Long.valueOf(analysisState), Long.valueOf(currPage), Long.valueOf(pageSize));
List<FileNameDicEntity> fileNameDicEntities = fileNameDicService.queryFileNameDic(uploadDate,replaceNullString(fileName), Long.valueOf(analysisState), Long.valueOf(currPage), Long.valueOf(pageSize));
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(fileNameDicEntities);
......@@ -191,7 +191,7 @@ public class ReadExcelApi {
*/
@RequestMapping("queryPersonPostCount")
public String queryPersonPostCount(@RequestParam("fileName") String fileName,@RequestParam("analysisState") String analysisState,@RequestParam("uploadDate") String uploadDate, HttpServletResponse resp) {
int i = fileNameDicService.queryFileNameDicCount(uploadDate, fileName, Long.valueOf(analysisState));
int i = fileNameDicService.queryFileNameDicCount(uploadDate,replaceNullString(fileName), Long.valueOf(analysisState));
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(i+"");
......@@ -202,4 +202,15 @@ public class ReadExcelApi {
return str.replace("-","");
}
/**
* 字符串去除空格
* @param str 原始字符串
* @return 返回新的字符串
*/
private String replaceNullString(String str) {
if (str == ""){
return null;
} else return str;
}
}
\ No newline at end of file
src/main/java/com/yxproject/start/api/ReadXmlApi.java
View file @ 19fbecc3
......@@ -158,4 +158,14 @@ public class ReadXmlApi {
return str.replace("-","");
}
/**
* 字符串去除空格
* @param str 原始字符串
* @return 返回新的字符串
*/
private String replaceNullString(String str) {
if (str == ""){
return null;
} else return str;
}
}
src/main/java/com/yxproject/start/mapper/FileNameDicMapper.java
View file @ 19fbecc3
......@@ -50,7 +50,7 @@ public interface FileNameDicMapper {
" and FILE_NAME =#{fileName}" +
"</if>" +
" </where>" +
"and ROWNUM less then #{maxNum} ) where rn more then #{minNum} " +
" ) where rn BETWEEN #{minNum} and #{maxNum} " +
"</script>")
public List<FileNameDicEntity> queryFileNameDic(@Param("uploadDate")String uploadDate,@Param("fileName") String fileName, @Param("analysisState") long analysisState, @Param("maxNum") long maxNum, @Param("minNum") long minNum);
......@@ -66,10 +66,10 @@ public interface FileNameDicMapper {
" and STATE =#{analysisState}" +
"</if>" +
"<if test='uploadDate !=null' >" +
" and to_char(UPLOAD_DATE,'yyyyMMdd') =#{uploadDate}" +
" and to_char(UPLOAD_DATE,'yyyyMMdd') = #{uploadDate}" +
"</if>" +
"<if test='fileName != null ' >" +
" and FILE_NAME =#{fileName}" +
" and FILE_NAME = #{fileName}" +
"</if> </where> </script>")
public List<FileNameDicEntity> queryFileNameDicCount(@Param("uploadDate")String uploadDate,@Param("fileName") String fileName, @Param("analysisState") long analysisState);
......
src/main/java/com/yxproject/start/mapper/FilesMapper.java
View file @ 19fbecc3
......@@ -25,8 +25,8 @@ public interface FilesMapper {
"<if test=\"importDate !=null\">"+
" and to_char(FILES.UPLOAD_DATE,'yyyyMMdd')= #{importDate}" +
"</if> "+
"group by FILES.upload_date,FILES.ID) where ROWNUM less then #{maxNum} group by upload_date" +
") where rn more then #{minNum} </script>")
"group by FILES.upload_date,FILES.ID) group by upload_date" +
") where rn BETWEEN #{minNum} and #{maxNum} </script>")
public List<CountDataEntity> selectFiles(@Param("importDate") String importDate,@Param("maxNum")long maxNum,@Param("minNum")long minNum);
@Select({"<script>"+
......
src/main/java/com/yxproject/start/service/impl/FileNameDicServiceImpl.java
View file @ 19fbecc3
......@@ -25,12 +25,12 @@ public class FileNameDicServiceImpl implements FileNameDicService {
@Override
public List<FileNameDicEntity> queryFileNameDic(String uploadDate,String fileName, long analysisState, long currPage, long pageSize) {
fileNameDicMapper.queryFileNameDic(uploadDate, fileName, analysisState, currPage * pageSize, (currPage - 1) * pageSize + 1);
return fileNameDicMapper.queryFileNameDic(uploadDate,fileName, analysisState, currPage*pageSize,(currPage-1)*pageSize+1 );
// return null;
}
@Override
public int queryFileNameDicCount(String uploadDate,String fileName, long analysisState) {
// return 2;
return fileNameDicMapper.queryFileNameDicCount(uploadDate,fileName, analysisState ).size();
}
......
src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java
View file @ 19fbecc3
......@@ -53,15 +53,58 @@ public class TaskListServiceImpl implements TaskListService {
@Override
public List<Object> selectByCountyAtACCU(String date) {
List<Map<String, Object>> maps = taskListMapper.selectByCountyAtACCU(date);
List<Map<String,Object>> list = new ArrayList<>();
List list = new ArrayList();
Map<String,Object> typeMap = new LinkedHashMap<>();
for (Map o :maps){
//TODO 组合JSON
Map<String,Object> countyMap = new LinkedHashMap<>();
countyMap.containsKey((Map<String,Object>)o);
if (typeMap.containsKey(o.get("CARD_TYPE")+"")){
List<Map<String,Object>> mapList= (List<Map<String,Object>>)typeMap.get("CARD_TYPE");
mapList.add(o);
typeMap.put(o.get("CARD_TYPE")+"",mapList);
}else {
List<Map<String,Object>> mapList = new ArrayList<>();
mapList.add(o);
typeMap.put(o.get("CARD_TYPE")+"",mapList);
}
}
for (String type:typeMap.keySet()){
Map<String,Object> typeMapList = new LinkedHashMap<>();
List<Map<String,Object>> typeList = new ArrayList<>();
List<Map<String,Object>> mapList = (List<Map<String,Object>>)typeMap.get(type);
int typeSum =0;
for (Map o:mapList) {
typeSum+=Integer.valueOf(o.get("VALID_COUNT") + "");
Map<String,Object> countyMap = new LinkedHashMap<>();
if (countyMap.containsKey(o.get("COUNTYNAME")+"")){
List<Map<String,Object>> countyList= (List<Map<String,Object>>)countyMap.get("CARD_TYPE");
countyList.add(o);
Integer valid_count = Integer.valueOf(o.get("VALID_COUNT") + "");
valid_count+=Integer.valueOf(countyMap.get("countyValidCount").toString());
Integer invalid_count = Integer.valueOf(o.get("INVALID_COUNT") + "");
invalid_count+=Integer.valueOf(countyMap.get("countyInvalidCount").toString());
countyMap.put(o.get("COUNTYNAME")+"",countyList);
countyMap.put("countyValidCount",valid_count);
countyMap.put("countyInvalidCount",invalid_count);
}else {
List<Map<String,Object>> countyList = new ArrayList<>();
countyList.add(o);
countyMap.put(o.get("COUNTYNAME")+"",countyList);
countyMap.put("countyValidCount",Integer.valueOf(o.get("VALID_COUNT")+""));
countyMap.put("countyInvalidCount",Integer.valueOf(o.get("INVALID_COUNT")+""));
}
countyMap.put("countyList",o);
typeList.add(countyMap);
}
typeMapList.put("typeName",type);
typeMapList.put("typeSum",typeSum);
typeMapList.put("typeList",typeList);
list.add(typeMapList);
}
System.out.println(maps.toString()+"---------");
......
src/main/resources/static/index.html
View file @ 19fbecc3
......@@ -79,7 +79,7 @@
<!-- Logo -->
<a href="index.html" class="logo" style="line-height: 50px;">
<!-- mini logo for sidebar mini 50x50 pixels -->
<span class="logo-mini"><span>{{loginData.name}}</span></span>
<span class="logo-mini"><span><img src="newTheme/dist/img/logo.jpg" style="width:25px;height:25px;"></span></span>
<!-- logo for regular state and mobile devices -->
<span class="logo-lg"><span>{{loginData.roleList[0].role}}</span></span>
</a>
......@@ -94,9 +94,9 @@
</a>
</li>
<li class="sidebar no-padding navbar-left" style="width: 230px;margin-left:27px;height: auto;">
<form style="margin-top: 6px;">
<form style="margin-top: 6px;" name="form">
<div class="input-group input-group-sm">
<input type="text" class="form-control input-sm bg-light no-border padder" style="height: 35px;background-color: #fff;" ng-model="searchInput" placeholder="身份证号/受理号/任务单id...">
<input type="text" class="form-control input-sm bg-light no-border padder" ng-keyup="enterEvent($event,searchInput)" style="height: 35px;background-color: #fff;" ng-model="searchInput" placeholder="身份证号/受理号/任务单id...">
<span class="input-group-btn">
<button type="button" style="height: 35px;background-color: #fff;border-left:0;outline:none;" ng-click="doSearch(searchInput)" class="btn btn-sm bg-light">
<i class="fa fa-search"></i>
......@@ -201,7 +201,7 @@
</ul>
</li>
<li class="dropdown user user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" style="padding-bottom: 0;">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" style="padding-bottom: 11px;">
<img src="newTheme/dist/img/logo.jpg" class="user-image" alt="User Image">
<span style="font-size: 1.7em;">北京制证辅助平台</span>
</a>
......
src/main/resources/static/js/app.js
View file @ 19fbecc3
......@@ -156,13 +156,18 @@ angular.module('AvatarCheck', [
}
$scope.doSearch = function (searchInput) {
console.log(searchInput)
// HttpService.searchCards(searchInput, function (data) {
//
// })
$rootScope.searchResult = '查询结果';
$location.path("/searchCard");
}
if(angular.isUndefined(searchInput)){
$location.path("/searchCard");
$scope.alertMsg = "请输入要查询的受理号/身份证号/任务单id";
}else{
console.log(searchInput,"//")
HttpService.searchCards(searchInput, function (data) {
$rootScope.searchResult = data;
console.log($rootScope.searchResult)
})
$location.path("/searchCard");
}
};
$scope.logout = function(){
HttpService.logout(function(data) {
......@@ -170,9 +175,13 @@ angular.module('AvatarCheck', [
$location.path('/login')
$rootScope.loginData = {userid:'用户未登录', login:false};
});
}
$scope.enterEvent = function(e,search) {
console.log(search)
var keycode = window.event?e.keyCode:e.which;
if(keycode==13){
$scope.doSearch(search)
}
}
});
......
src/main/resources/static/js/service.js
View file @ 19fbecc3
......@@ -134,10 +134,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data)
})
},
searchCards: function (value, success) {
searchCards: function (searchInput, success) {
$http({
method: 'GET',
url: url
url:"../specialCardInfo/selectByCard",
params:{
id:searchInput
}
}).then(function successCallback(response) {
success(response.data)
})
......@@ -153,10 +156,10 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data)
})
},
uploadExcelFile:function(startDate,endDate,fd,success){
uploadExcelFile:function(date1,date2,fd,success){
$http({
method: 'POST',
url: "../ReadExcel/ReadPersonPost",
url: "../ReadExcel/ReadPersonPost?formStartTime="+date1+"&formDeadLine="+date2,
data: fd,
headers: {'Content-Type': undefined},
transformRequest: angular.identity
......@@ -307,6 +310,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}).then(function successCallback(response) {
success(response.data)
})
},
selectTagPrintData:function(idCard,success){
$http({
method: 'GET',
url: "../tagPrint/selectTagPrintData"+urlTimeStamp(),
params:{
idCard:idCard
}
}).then(function successCallback(response) {
success(response.data)
})
}
}
});
\ No newline at end of file
src/main/resources/static/views/excelAndSearch/excelAndSearch.js
View file @ 19fbecc3
......@@ -24,43 +24,38 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyyMMdd',
format: 'yyyy-MM-dd',
todayBtn: 1,
autoclose: 1
});
$('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyyMMdd',
format: 'yyyy-MM-dd',
todayBtn: 1,
autoclose: 1
});
$('#datepicker3').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyyMMdd',
format: 'yyyy-MM-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyyMMdd");
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.uploadExcel = function () {
console.log($("#datepicker1").val())
var fd = new FormData();
var files = document.querySelector('input#id_file_photo_for_check').files;
fd.append("formStartTime",$("#datepicker1").val());
fd.append("formDeadline",$("#datepicker2").val());
for(var i in files){
fd.append('file', files[i]);
}
if(angular.isUndefined(files)){
MessageService.showAlert("请选择上传的文件...")
}else{
fd.append('file', files);
for(var i in files){
fd.append('file', files[i]);
}
HttpService.uploadExcelFile($("#datepicker1").val(),$("#datepicker2").val(),fd,function (data) {
console.log("导入项目的返回结果：",data)
})
......
src/main/resources/static/views/searchCard/searchCard.html
View file @ 19fbecc3
......@@ -5,8 +5,9 @@
查询结果
</strong>
<div class="box-info" style="padding:0px 10px 7px 10px;">
<div class="panel panel-info">
<h4 ng-if="alertMsg">{{alertMsg}}</h4>
<!--任务单-->
<div class="panel panel-info" ng-if="searchResult.workOrderDate.length>0">
<div class="panel-heading">
<h3 class="panel-title">
任务单
......@@ -43,8 +44,8 @@
</table>
</div>
</div>
<div class="panel panel-info">
<!--受理库-->
<div class="panel panel-info" ng-if="searchResult.ACCdata.length>0">
<div class="panel-heading">
<h3 class="panel-title">
受理库
......@@ -91,7 +92,8 @@
<button class="btn btn-danger">退证</button>
</div>
</div>
<div class="panel panel-info">
<!--制证库-->
<div class="panel panel-info" ng-if="searchResult.PRODData.length>0">
<div class="panel-heading">
<h3 class="panel-title">
制证库
......
src/main/resources/static/views/tagPrint/tagPrint.html
View file @ 19fbecc3
......@@ -46,12 +46,12 @@
<div class="box-info" style="padding: 15px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td width="10%">身份证号:</td>
<td width="10%" style="text-align: center;vertical-align: middle!important;">身份证号:</td>
<td colspan="2" width="35%">
<input type="text" class="form-control" placeholder="身份证号"/>
<input type="text" class="form-control" placeholder="身份证号" ng-model="idCard"/>
</td>
<td style="text-align: left;">
<button class="btn btn-primary">查询</button>
<button class="btn btn-primary" ng-click="searchTagPrintData()">查询</button>
<button class="btn btn-primary">证件读取</button>
</td>
</tr>
......
src/main/resources/static/views/tagPrint/tagPrint.js
View file @ 19fbecc3
......@@ -1051,6 +1051,12 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
}
$scope.searchTagPrintData = function(){
HttpService.selectTagPrintData($scope.idCard,function(data){
$scope.tagPrintData =data;
})
}
});
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.js
View file @ 19fbecc3
......@@ -49,14 +49,12 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.uploadXml = function () {
var fd = new FormData();
var files = document.querySelector('input#id_file_photo_for_check').files;
for(var i in files){
fd.append('file', files[i]);
}
if(angular.isUndefined(files)){
MessageService.showAlert("请选择上传的文件...")
}else{
fd.append('file', files);
for(var i in files){
fd.append('file', files[i]);
}
HttpService.uploadPackage(fd,function (data) {
console.log("导入项目的返回结果：",data)
})
......
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