Skip to content

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

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

parents 5432d662 18113a5b
Show whitespace changes
Inline Side-by-side
Showing with 70 additions and 91 deletions
src/main/java/com/yxproject/start/api/queryPreproPerson.java
View file @ cc9c1e5e
......@@ -60,9 +60,9 @@ public class queryPreproPerson {
*/
@RequestMapping("updatePreproPerson")
// @RequiresPermissions("userInfo.add")//权限管理;
public Map<String,Object> updatePreproPerson(@RequestParam("uploadNo") String uploadNo, @RequestParam("isValid")String isValid, HttpServletResponse response){
public Map<String,Object> updatePreproPerson(@RequestParam("id") String id, @RequestParam("isValid")String isValid, HttpServletResponse response){
PreproPersonEntity preproPersonEntity = new PreproPersonEntity();
preproPersonEntity.setJmsfzslh(uploadNo);
preproPersonEntity.setId(Long.valueOf(id));
preproPersonEntity.setIsValid(Long.valueOf(isValid));
preproPersonService.updatePreproPersonIsValid(preproPersonEntity);
Map<String,Object> map = new LinkedHashMap<>();
......
src/main/java/com/yxproject/start/mapper/PreproPersonMapper.java
View file @ cc9c1e5e
......@@ -135,7 +135,7 @@ public interface PreproPersonMapper {
* @param personEntity
* @return
*/
@Update("UPDATE PREPRO_PERSON SET IS_VALID=#{isValid} where JMSFZSLH=#{jmsfzslh}")
@Update("UPDATE PREPRO_PERSON SET IS_VALID=#{isValid} where id=#{id}")
public boolean updatePreproPersonIsValid(PreproPersonEntity personEntity);
/**
......
src/main/java/com/yxproject/start/utils/IDCardFactory.java
View file @ cc9c1e5e
......@@ -37,6 +37,7 @@ public class IDCardFactory {
filesEntity.setVersionCode(BBH);
filesEntity.setUploadDate(date);
String DWMC = packagehead.element("DWMC").getTextTrim();
filesEntity.setDwmc(DWMC);
filesEntity.setCreateTime(packagehead.element("SCSJ").getTextTrim());
List<Element> recordlist = records.elements("RECORD");
......
src/main/resources/static/js/app.js
View file @ cc9c1e5e
......@@ -211,7 +211,7 @@ angular.module('AvatarCheck', [
var check = idx.split("+");
var json={};
json.acceptNo=check[0];
json.cardType=$scope.searchResult.workOrderDate[0].CARD_TYPE_ID;
json.cardType=$scope.searchResult.workOrderData[0].CARD_TYPE_ID;
json.countyCode=check[1];
json.name=$rootScope.loginData.name;
console.log(json)
......@@ -231,7 +231,7 @@ angular.module('AvatarCheck', [
console.log(idx,check)
var json={};
json.acceptNo=check[0];
json.cardType=$scope.searchResult.workOrderDate[0].CARD_TYPE_ID;
json.cardType=$scope.searchResult.workOrderData[0].CARD_TYPE_ID;
json.countyCode=check[1];
json.name=$rootScope.loginData.name;
console.log(json)
......@@ -250,7 +250,7 @@ angular.module('AvatarCheck', [
var check = idx.split("+");
var json={};
json.acceptNo=check[0];
json.taskId=$scope.searchResult.workOrderDate[0].TASK_ID;
json.taskId=$scope.searchResult.workOrderData[0].TASK_ID;
json.name=$rootScope.loginData.name;
console.log(json)
HttpService.giveBackCard(json,function (data) {
......@@ -268,7 +268,7 @@ angular.module('AvatarCheck', [
var check = idx.split("+");
var json={};
json.acceptNo=check[0];
json.taskId=$scope.searchResult.workOrderDate[0].TASK_ID;
json.taskId=$scope.searchResult.workOrderData[0].TASK_ID;
json.name=$rootScope.loginData.name;
console.log(json)
HttpService.giveBackCard(json,function (data) {
......
src/main/resources/static/js/service.js
View file @ cc9c1e5e
......@@ -350,10 +350,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(oldPackageName)){
oldPackageName='';
}
if(date==""){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(oldPackageName,date)
$http({
method: 'GET',
url: "../LogApi/selectAnalysisLogCount"+urlTimeStamp(),
......@@ -369,10 +365,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(oldPackageName)){
oldPackageName='';
}
if(date==""){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(oldPackageName,date)
$http({
method: 'GET',
url: "../LogApi/selectByAnalysisLog"+urlTimeStamp(),
......@@ -429,12 +421,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(idCard)){
idCard='';
}
if(angular.isUndefined(county)){
if(county==''){
county = -1;
}
if(date==""){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(newPackageName,idCard,date,county)
$http({
method: 'GET',
......@@ -456,12 +445,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(idCard)){
idCard='';
}
if(angular.isUndefined(county)){
if(county==''){
county = -1;
}
if(date==""){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(newPackageName,idCard,date,county,currentPage,itemsPerPage)
$http({
method: 'GET',
......@@ -746,13 +732,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data)
})
},
updateIsValidData:function(slh,isValid,success){
console.log(slh,isValid)
updateIsValidData:function(id,isValid,success){
console.log(id,isValid)
$http({
method: 'GET',
url: "../queryPreproPerson/updatePreproPerson"+urlTimeStamp(),
params:{
uploadNo:slh,
id:id,
isValid:isValid
}
}).then(function successCallback(response) {
......
src/main/resources/static/views/analysisLog/analysisLog.html
View file @ cc9c1e5e
......@@ -43,7 +43,8 @@
<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/>
<input type="text" class="form-control pull-right" ng-value="choseDate" id="datepicker" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div>
</td>
<td>
......@@ -68,11 +69,11 @@
<tbody>
<tr ng-repeat="item in analyseLog">
<td>{{$index+1}}</td>
<td>{{item.RECORD_NUMBER}}</td>
<td>{{item.SOURCE_FILE_NAME}}</td>
<td>{{item.FORM_START_TIME | myDateFilter}}</td>
<td>{{item.FORM_DEADLINE | myDateFilter}}</td>
<td>{{item.FILE_NAME}}</td>
<td>{{item.ANALYSIS_DATE}}</td>
<td>{{item.ANALYSIS_DATE | myDateFilter}}</td>
<td>{{item.RECORD_NUMBER}}</td>
<td>{{item.PUCOUNT}}</td>
<td>{{item.YOUCOUNT}}</td>
......
src/main/resources/static/views/analysisLog/analysisLog.js
View file @ cc9c1e5e
......@@ -11,7 +11,6 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa
.controller('analysisLogCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog) {
//Date picker
$('#datepicker').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
......@@ -20,8 +19,11 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa
todayBtn: 1,
autoclose: 1
});
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.paginationConf = {
......@@ -33,12 +35,10 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa
$scope.getAnalyseLog = function(){
HttpService.selectAnalyseLogCount($scope.oldPackageName,$("#datepicker").val(),function (data) {
console.log($scope.newPackageName,$scope.idCard,$('#datepicker').val())
$scope.paginationConf.totalItems = data;
console.log($scope.paginationConf.totalItems)
})
HttpService.selectAnalyseLog($scope.oldPackageName,$("#datepicker").val(),$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
console.log($scope.newPackageName,$scope.idCard,$('#datepicker').val())
$scope.analyseLog = data;
console.log($scope.analyseLog)
})
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.html
View file @ cc9c1e5e
......@@ -70,7 +70,8 @@
<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/>
<input type="text" class="form-control pull-right" id="datepicker" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div>
</td>
<td></td>
......@@ -110,8 +111,8 @@
<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.JMSFZSLH,0)">禁用</button></td>
<td ng-if="item.IS_VALID==0"><button class="btn btn-info" ng-click="updateIsValid(item.JMSFZSLH,1)">启用</button></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>
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.js
View file @ cc9c1e5e
......@@ -27,9 +27,10 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.paginationConf = {
currentPage: 1,
itemsPerPage: 10,
......@@ -61,10 +62,6 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
if(angular.isUndefined(packageType)){
packageType='';
}
if (date==''){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
HttpService.getPackageData($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg,
typeCode,packageType,date,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data) {
$scope.paginationConf.totalItems=data.total;
......@@ -78,8 +75,8 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
// 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.doPackageQuery);
$scope.updateIsValid = function (slh,isValid) {
HttpService.updateIsValidData(slh,isValid,function(data) {
$scope.updateIsValid = function (id,isValid) {
HttpService.updateIsValidData(id,isValid,function(data) {
$scope.doPackageQuery();
MessageService.showAlert("更新成功")
})
......
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.html
View file @ cc9c1e5e
......@@ -55,7 +55,8 @@
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</div>
<input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker1" readonly/>
<input type="text" class="form-control pull-right" id="datepicker1" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove d1"></span></span>
</div>
</td>
<td>-</td>
......@@ -64,7 +65,8 @@
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</div>
<input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker2" readonly/>
<input type="text" class="form-control pull-right" id="datepicker2" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove d2"></span></span>
</div>
</td>
<td colspan="2">
......
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.js
View file @ cc9c1e5e
......@@ -27,6 +27,10 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
todayBtn: 1,
autoclose: 1
});
//清除的代码
$(".d1").click(function(){
$($($(this).parent()).prev()).val("");
})
//Date picker
$('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
......@@ -35,16 +39,11 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
todayBtn: 1,
autoclose: 1
});
//Date picker
$('#datepicker3').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
//清除的代码
$(".d2").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.paginationConf = {
currentPage: 1,
......@@ -64,12 +63,9 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
if(angular.isUndefined($scope.pcs_name)){
$scope.pcs_name='';
}
if(startDate==''){
startDate=$filter("date")(new Date(), "yyyy-MM-dd");
}
if(endDate==''){
endDate=$filter("date")(new Date(), "yyyy-MM-dd");
}
if((startDate!=''&&endDate=='')||(endDate!=''&&startDate=='')){
MessageService.showAlert("请选择起始日期和结束日期")
}else{
console.log($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage)
HttpService.selectXmlDataCount($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,function(data){
$scope.paginationConf.totalItems=data;
......@@ -81,6 +77,8 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
console.log($scope.xmlDatas)
})
}
}
// 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.doXmlQuery);
......
src/main/resources/static/views/packageLog/packageLog.html
View file @ cc9c1e5e
......@@ -52,13 +52,15 @@
<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/>
<input type="text" class="form-control pull-right" id="datepicker" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div>
</td>
<td>上传地区:</td>
<td>
<select class="form-control select2" id="print" ng-model="county">
<option ng-repeat="item in countyList" value="item.countycode">{{item.countyname}}</option>
<select class="form-control select2" id="county">
<option value="">--请选择地区--</option>
<option ng-repeat="item in countyList" value="{{item.countyCode}}">{{item.countyname}}</option>
</select>
</td>
<td><button class="btn btn-primary" ng-click="getPackageLog()">查询</button></td>
......
src/main/resources/static/views/packageLog/packageLog.js
View file @ cc9c1e5e
......@@ -23,8 +23,10 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.paginationConf = {
currentPage: 1,
......@@ -33,14 +35,15 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
};
$scope.getPackageLog = function(){
HttpService.selectPackageLogCount($scope.newPackageName,$scope.idCard,$('#datepicker').val(),$scope.county,function (data) {
var county = $("#county").val();
HttpService.selectPackageLogCount($scope.newPackageName,$scope.idCard,$('#datepicker').val(),county,function (data) {
$scope.paginationConf.totalItems = data;
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(),county,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
$scope.packageLogData = data;
console.log($scope.packageLogData,"$scope.packageLogData")
})
......
src/main/resources/static/views/task/task.js
View file @ cc9c1e5e
......@@ -413,14 +413,6 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
$scope.isHistory=0;
$scope.searchTaskList = function(){
$scope.isHistory=0;
var date=$('#datepicker').val();
if(date==''){
date=$scope.choseDate;
}
HttpService.getHasDistributeCount(date,function (data) {
$scope.distributedCount = data;
console.log(data)
})
HttpService.getFjTaskListByProcess(function(data){
$scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){
......@@ -589,14 +581,6 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
$scope.isHistory=0;
$scope.searchTaskList = function(){
$scope.isHistory=0;
var date=$('#datepicker').val();
if(date==''){
date=$scope.choseDate;
}
HttpService.getHasDistributeCount(date,function (data) {
$scope.distributedCount = data;
console.log(data)
})
HttpService.getFjTaskListByProcess(function(data){
$scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){
......
src/main/resources/static/views/task/taskListEwriting.html
View file @ cc9c1e5e
......@@ -58,7 +58,7 @@
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject"></td>
<td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-subject">{{task.task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-subject">{{task.eWriteCount}}</td>
<td class="mailbox-subject">{{task.specialCount}}</td>
<td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
......
src/main/resources/static/views/task/taskListSorting.html
View file @ cc9c1e5e
......@@ -65,7 +65,7 @@
<td class="mailbox-subject">{{task.specialCount}}</td>
<td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
<td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>
<td class="mailbox-subject">{{task.checkCount}}</td>
<td class="mailbox-subject">{{task.recheckCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.policeList,task.taskId)">派出所列表</a></td>
<td class="mailbox-subject"><button class="btn btn-primary">打印封条</button></td>
</tr>
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.html
View file @ cc9c1e5e
......@@ -68,7 +68,8 @@
<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/>
<input type="text" class="form-control pull-right" id="datepicker" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div>
</td>
<td colspan="4">
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js
View file @ cc9c1e5e
......@@ -20,7 +20,10 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
todayBtn: 1,
autoclose: 1
});
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$('.select2').select2();
//Initialize Select2 Elements
......@@ -99,7 +102,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
json.getToCounty=[];
}
if($("#datepicker").val()==''){
json.uploadDate = $filter("date")(new Date(), "yyyy-MM-dd");
json.uploadDate = '';
}else{
json.uploadDate = $("#datepicker").val();
}
......@@ -159,7 +162,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
url = url + 'djx=&';
}
if ($("#datepicker").val() == '') {
url = url + 'uploadDate=' + $scope.choseDate + '&';
url = url + 'uploadDate=&';
}
if ($("#datepicker").val() != '') {
url = url + 'uploadDate=' + $("#datepicker").val() + '&';
......
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