Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 1a2a80bf authored by dahai's avatar dahai
Browse files
Options

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

parents bb8667f6 4967ad88
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 91 deletions
src/main/java/com/yxproject/start/api/SelectApi.java
View file @ 1a2a80bf
...@@ -41,25 +41,20 @@ public class SelectApi { ...@@ -41,25 +41,20 @@ public class SelectApi {
List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByGroupNo(id); List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByGroupNo(id);
List<Map<String, Object>> ACCdata = new ArrayList<>(); List<Map<String, Object>> ACCdata = new ArrayList<>();
List<Map<String, Object>> PRODData = new ArrayList<>(); List<Map<String, Object>> PRODData = new ArrayList<>();
resultMap.put("workOrderData", workOrderData); resultMap.put("workOrderData", workOrderData);
resultMap.put("ACCdata", ACCdata); resultMap.put("ACCdata", ACCdata);
resultMap.put("PRODData", PRODData); resultMap.put("PRODData", PRODData);
} else if (id.length() == 10 || id.length() == 18) { } else if (id.length() == 10 || id.length() == 18) {
//查询是否是特证，如果是，返回新的任务单信息 //查询是否是特证，如果是，返回新的任务单信息
List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList2(id);
List<Map<String, Object>> mapList = groupNoService.selectAcceptNo(id); if (workOrderData.size()!=0){
if (mapList.size()>0){
id = mapList.get(0).get("ACCEPT_NO").toString();
}
if (selectSerialNumberService.selectCount(id)==0){
List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList(id);
resultMap.put("workOrderData", workOrderData); resultMap.put("workOrderData", workOrderData);
}else { }else {
List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList2(id); List<Map<String, Object>> workOrderData2 = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList(id);
resultMap.put("workOrderData", workOrderData); resultMap.put("workOrderData", workOrderData2);
} }
List<Map<String, Object>> ACCdata = selectSerialNumberService.selectByAcceptNoOrCardIdFromACC(id); List<Map<String, Object>> ACCdata = selectSerialNumberService.selectByAcceptNoOrCardIdFromACC(id);
List<Map<String, Object>> PRODData = selectSerialNumberService.selectByAcceptNoOrCardIdFromPROD(id); List<Map<String, Object>> PRODData = selectSerialNumberService.selectByAcceptNoOrCardIdFromPROD(id);
......
src/main/java/com/yxproject/start/mapper/SelectSerialNumberMapper.java
View file @ 1a2a80bf
...@@ -60,7 +60,7 @@ public interface SelectSerialNumberMapper { ...@@ -60,7 +60,7 @@ public interface SelectSerialNumberMapper {
"from TASK \n" + "from TASK \n" +
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n" + "LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n" +
"LEFT JOIN SPECIAL_CARD on SPECIAL_CARD.TASK_ID = TASK.TASK_ID\n" + "LEFT JOIN SPECIAL_CARD on SPECIAL_CARD.TASK_ID = TASK.TASK_ID\n" +
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" + "LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
"WHERE GROUP_NO.GROUP_NO =#{id} \n" + "WHERE GROUP_NO.GROUP_NO =#{id} \n" +
"group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" + "group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
"TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" + "TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" +
...@@ -77,45 +77,66 @@ public interface SelectSerialNumberMapper { ...@@ -77,45 +77,66 @@ public interface SelectSerialNumberMapper {
public int selectCount(String id); public int selectCount(String id);
@Select("select DISTINCT " + //查询制证库
"TASK.TASK_ID," + @Select("select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME," + "CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n" +
"COUNTY_DIC.COUNTY_CODE," + "TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n" +
"CARD_TYPE_DIC.CARD_TYPE," + "TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,SUM(GROUP_NO.VALID_COUNT) valid_count\n" +
"CARD_TYPE_DIC.CARD_TYPE_ID," + "from TASK \n" +
"TASK.ISSUED_DATE," + "LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n" +
"TASK.PRINT_OUT_DATE," + "LEFT JOIN GROUP_NO ON GROUP_NO.TASK_ID = TASK.TASK_ID\n" +
"TASK.POSITION_DATE," + "LEFT JOIN PROD_CARD_T@PROD_LINK ON SUBSTR(PROD_CARD_T.ACCEPT_NO,0,8)=GROUP_NO.GROUP_NO "+
"TASK.CONCORA_CRUSH_DATE, "+ "LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
"TASK.PUNCHING_DATE," + "WHERE PROD_CARD_T.ACCEPT_NO =#{id} OR PROD_CARD_T.ID_NO=#{id} and GROUP_NO.GROUP_NO is not null\n" +
"TASK.SORTING_DATE," + "group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
"TASK.QUALITY_TEST_DATE\n" + "TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" +
"from TASK\n" + "TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE\n" +
"LEFT JOIN SPECIAL_CARD ON SPECIAL_CARD.TASK_ID = TASK.TASK_ID\n" + "UNION all \n" +
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE\n" + "select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n" +
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID\n" + "CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n" +
"LEFT JOIN GROUP_NO ON TASK.TASK_ID=GROUP_NO.TASK_ID\n" + "TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n" +
"LEFT JOIN PROD_DBA.PROD_CARD_T ON subStr(PROD_CARD_T.ACCEPT_NO ,0,8)=GROUP_NO.GROUP_NO \n" + "TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,count(SPECIAL_CARD.ACCEPT_NO) valid_count\n" +
"LEFT JOIN PREPRO_PERSON ON PREPRO_PERSON.GMSFHM = PROD_DBA.PROD_CARD_T.ID_NO\n" + "from TASK \n" +
"WHERE SPECIAL_CARD.ACCEPT_NO=#{id} OR PROD_CARD_T.ID_NO=#{id}") "LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n" +
"LEFT JOIN SPECIAL_CARD on SPECIAL_CARD.TASK_ID = TASK.TASK_ID\n" +
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
"LEFT JOIN PROD_CARD_T@PROD_LINK ON PROD_CARD_T.ACCEPT_NO=SPECIAL_CARD.ACCEPT_NO "+
"WHERE PROD_CARD_T.ACCEPT_NO =#{id} OR PROD_CARD_T.ID_NO=#{id} \n" +
"group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
"TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" +
"TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE")
public List<Map<String,Object>>selectByAcceptNoOrCardIdFromTaskList2(String id); public List<Map<String,Object>>selectByAcceptNoOrCardIdFromTaskList2(String id);
/**
* 查询任务单信息
* @param id
* @return
*/
@Select("select GROUP_NO.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,TASK.SUBMIT_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
"from TASK\n" +
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE\n" +
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
"LEFT JOIN GROUP_NO ON TASK.TASK_ID=GROUP_NO.TASK_ID\n" +
"LEFT JOIN PROD_DBA.PROD_CARD_T ON subStr(PROD_CARD_T.ACCEPT_NO ,0,8)=GROUP_NO.GROUP_NO \n" +
"LEFT JOIN PREPRO_PERSON ON PREPRO_PERSON.GMSFHM = PROD_DBA.PROD_CARD_T.ID_NO\n" +
"WHERE PREPRO_PERSON.GMSFHM =#{id} OR PROD_CARD_T.ACCEPT_NO=#{id}")
public List<Map<String,Object>> selectByAcceptNoOrCardIdFromTaskList(String id);
//查询受理库
@Select("select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n" +
"CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n" +
"TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n" +
"TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,SUM(GROUP_NO.VALID_COUNT) valid_count\n" +
"from TASK \n" +
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n" +
"LEFT JOIN GROUP_NO ON GROUP_NO.TASK_ID = TASK.TASK_ID\n" +
"LEFT JOIN ACC_CARD_T@ACCU_LINK ON SUBSTR(ACC_CARD_T.ACCEPT_NO,0,8)=GROUP_NO.GROUP_NO "+
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
"WHERE ACC_CARD_T.ACCEPT_NO =#{id} OR ACC_CARD_T.ID_NO=#{id} and GROUP_NO.GROUP_NO is not null\n" +
"group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
"TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" +
"TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE\n" +
"UNION all \n" +
"select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n" +
"CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n" +
"TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n" +
"TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,count(SPECIAL_CARD.ACCEPT_NO) valid_count\n" +
"from TASK \n" +
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n" +
"LEFT JOIN SPECIAL_CARD on SPECIAL_CARD.TASK_ID = TASK.TASK_ID\n" +
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
"LEFT JOIN ACC_CARD_T@ACCU_LINK ON ACC_CARD_T.ACCEPT_NO=SPECIAL_CARD.ACCEPT_NO "+
"WHERE ACC_CARD_T.ACCEPT_NO =#{id} OR ACC_CARD_T.ID_NO=#{id} \n" +
"group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
"TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" +
"TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE")
public List<Map<String,Object>>selectByAcceptNoOrCardIdFromTaskList(String id);
@Select("SELECT ACC_CARD_T.ACCEPT_NO,\n" + @Select("SELECT ACC_CARD_T.ACCEPT_NO,\n" +
"COUNTY_DIC.COUNTYNAME,\n" + "COUNTY_DIC.COUNTYNAME,\n" +
......
src/main/java/com/yxproject/start/service/SelectSerialNumberService.java
View file @ 1a2a80bf
...@@ -10,8 +10,6 @@ public interface SelectSerialNumberService { ...@@ -10,8 +10,6 @@ public interface SelectSerialNumberService {
List<Map<String, Object>> selectByWorkOrderFromYX(String id); List<Map<String, Object>> selectByWorkOrderFromYX(String id);
/*根据组号查询辅助库*/ /*根据组号查询辅助库*/
List<Map<String, Object>> selectByGroupNo(String id); List<Map<String, Object>> selectByGroupNo(String id);
/*根据身份证号或受理号查询辅助库*/
List<Map<String, Object>> selectByAcceptNoOrCardIdFromTaskList(String id);
/*根据身份证号或受理号查询受理库*/ /*根据身份证号或受理号查询受理库*/
List<Map<String, Object>> selectByAcceptNoOrCardIdFromACC(String id); List<Map<String, Object>> selectByAcceptNoOrCardIdFromACC(String id);
/*根据身份证号或受理号查询制证库*/ /*根据身份证号或受理号查询制证库*/
...@@ -19,6 +17,8 @@ public interface SelectSerialNumberService { ...@@ -19,6 +17,8 @@ public interface SelectSerialNumberService {
/*查询是否是特证*/ /*查询是否是特证*/
public int selectCount(String id); public int selectCount(String id);
public List<Map<String,Object>>selectByAcceptNoOrCardIdFromTaskList(String id);
public List<Map<String,Object>>selectByAcceptNoOrCardIdFromTaskList2(String id); public List<Map<String,Object>>selectByAcceptNoOrCardIdFromTaskList2(String id);
} }
......
src/main/java/com/yxproject/start/service/impl/SelectSerialNumberServiceImpl.java
View file @ 1a2a80bf
...@@ -26,11 +26,7 @@ public class SelectSerialNumberServiceImpl implements SelectSerialNumberService{ ...@@ -26,11 +26,7 @@ public class SelectSerialNumberServiceImpl implements SelectSerialNumberService{
return result; return result;
} }
@Override
public List<Map<String, Object>> selectByAcceptNoOrCardIdFromTaskList(String id) {
List<Map<String, Object>> result = selectSerialNumberMapper.selectByAcceptNoOrCardIdFromTaskList(id);
return result;
}
@Override @Override
public List<Map<String, Object>> selectByAcceptNoOrCardIdFromACC(String id) { public List<Map<String, Object>> selectByAcceptNoOrCardIdFromACC(String id) {
...@@ -50,6 +46,12 @@ public class SelectSerialNumberServiceImpl implements SelectSerialNumberService{ ...@@ -50,6 +46,12 @@ public class SelectSerialNumberServiceImpl implements SelectSerialNumberService{
return selectSerialNumberMapper.selectCount(id); return selectSerialNumberMapper.selectCount(id);
} }
@Override
public List<Map<String, Object>> selectByAcceptNoOrCardIdFromTaskList(String id) {
List<Map<String, Object>> result = selectSerialNumberMapper.selectByAcceptNoOrCardIdFromTaskList(id);
return result;
}
@Override @Override
public List<Map<String, Object>> selectByAcceptNoOrCardIdFromTaskList2(String id) { public List<Map<String, Object>> selectByAcceptNoOrCardIdFromTaskList2(String id) {
List<Map<String, Object>> result = selectSerialNumberMapper.selectByAcceptNoOrCardIdFromTaskList2(id); List<Map<String, Object>> result = selectSerialNumberMapper.selectByAcceptNoOrCardIdFromTaskList2(id);
......
src/main/resources/static/js/service.js
View file @ 1a2a80bf
...@@ -235,9 +235,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -235,9 +235,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(state)){ if(angular.isUndefined(state)){
state=-1; state=-1;
} }
if(date==''){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(fileName,state,date) console.log(fileName,state,date)
$http({ $http({
method: 'GET', method: 'GET',
...@@ -258,9 +255,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -258,9 +255,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(state)){ if(angular.isUndefined(state)){
state=-1; state=-1;
} }
if(date==''){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(fileName,state,currentPage,itemsPerPage,date) console.log(fileName,state,currentPage,itemsPerPage,date)
$http({ $http({
method: 'GET', method: 'GET',
...@@ -293,13 +287,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -293,13 +287,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
selectXmlDataCount:function (startPackageNo,endPackageNo,pcs_name,startDate,endDate,success) { selectXmlDataCount:function (startId,endId,pcs_name,startDate,endDate,success) {
$http({ $http({
method: 'GET', method: 'GET',
url: "../InfoManagementApi/selectCount"+urlTimeStamp(), url: "../InfoManagementApi/selectCount"+urlTimeStamp(),
params:{ params:{
beginFileName:startPackageNo, beginFileId:startId,
endFileName:endPackageNo, endFileId:endId,
gajgMc:pcs_name, gajgMc:pcs_name,
beginDate:startDate, beginDate:startDate,
endDate:endDate endDate:endDate
...@@ -319,13 +313,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -319,13 +313,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
deleteProdCards:function (startPackageNo,endPackageNo,pcs_name,startDate,endDate,success) { deleteProdCards:function (startId,endId,pcs_name,startDate,endDate,success) {
$http({ $http({
method: 'GET', method: 'GET',
url: "../InfoManagementApi/deleteInfo"+urlTimeStamp(), url: "../InfoManagementApi/deleteInfo"+urlTimeStamp(),
params:{ params:{
beginFileName:startPackageNo, beginFileName:startId,
endFileName:endPackageNo, endFileName:endId,
gajgMc:pcs_name, gajgMc:pcs_name,
beginDate:startDate, beginDate:startDate,
endDate:endDate endDate:endDate
......
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.html
View file @ 1a2a80bf
...@@ -34,13 +34,13 @@ ...@@ -34,13 +34,13 @@
<div class="box-info"> <div class="box-info">
<table class="table table-bordered" style="margin-bottom: 0;"> <table class="table table-bordered" style="margin-bottom: 0;">
<tr> <tr>
<td>新包号:</td> <td>文件ID:</td>
<td> <td>
<input type="text" class="form-control" ng-model="startPackageNo" placeholder="起始包号"> <input type="text" class="form-control" ng-model="startId" placeholder="起始ID">
</td> </td>
<td>-</td> <td>-</td>
<td> <td>
<input type="text" class="form-control" ng-model="endPackageNo" placeholder="截至包号"> <input type="text" class="form-control" ng-model="endId" placeholder="截至ID">
</td> </td>
<td>派出所名称：</td> <td>派出所名称：</td>
...@@ -95,8 +95,8 @@ ...@@ -95,8 +95,8 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="item in xmlDatas"> <tr ng-repeat="item in xmlDatas | orderBy:'id'">
<td>{{$index+1}}</td> <td>{{item.id}}</td>
<td>{{item.dwdm}}</td> <td>{{item.dwdm}}</td>
<td>{{item.dwmc}}</td> <td>{{item.dwmc}}</td>
<td>{{item.recordNumber}}</td> <td>{{item.recordNumber}}</td>
......
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.js
View file @ 1a2a80bf
...@@ -13,6 +13,7 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http']) ...@@ -13,6 +13,7 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
$rootScope.hasOpen = false; $rootScope.hasOpen = false;
$scope.id ='id';
$('.select2').select2(); $('.select2').select2();
//Initialize Select2 Elements //Initialize Select2 Elements
...@@ -54,11 +55,11 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http']) ...@@ -54,11 +55,11 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
$scope.doXmlQuery = function() { $scope.doXmlQuery = function() {
var startDate=$("#datepicker1").val(); var startDate=$("#datepicker1").val();
var endDate =$("#datepicker2").val(); var endDate =$("#datepicker2").val();
if(angular.isUndefined($scope.startPackageNo)){ if(angular.isUndefined($scope.startId)){
$scope.startPackageNo=''; $scope.startId='';
} }
if(angular.isUndefined($scope.endPackageNo)){ if(angular.isUndefined($scope.endId)){
$scope.endPackageNo=''; $scope.endId='';
} }
if(angular.isUndefined($scope.pcs_name)){ if(angular.isUndefined($scope.pcs_name)){
$scope.pcs_name=''; $scope.pcs_name='';
...@@ -66,13 +67,13 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http']) ...@@ -66,13 +67,13 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
if((startDate!=''&&endDate=='')||(endDate!=''&&startDate=='')){ if((startDate!=''&&endDate=='')||(endDate!=''&&startDate=='')){
MessageService.showAlert("请选择起始日期和结束日期") MessageService.showAlert("请选择起始日期和结束日期")
}else{ }else{
console.log($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage) 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.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,function(data){
$scope.paginationConf.totalItems=data; $scope.paginationConf.totalItems=data;
console.log($scope.paginationConf.totalItems,"count") console.log($scope.paginationConf.totalItems,"count")
}) })
HttpService.selectXmlData($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function (data) { HttpService.selectXmlData($scope.startId,$scope.endId,$scope.pcs_name,startDate,endDate,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function (data) {
$scope.xmlDatas = data; $scope.xmlDatas = data;
console.log($scope.xmlDatas) console.log($scope.xmlDatas)
}) })
...@@ -87,14 +88,14 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http']) ...@@ -87,14 +88,14 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
$scope.deleteXml = function() { $scope.deleteXml = function() {
var startDate=$("#datepicker1").val(); var startDate=$("#datepicker1").val();
var endDate =$("#datepicker2").val(); var endDate =$("#datepicker2").val();
var startPackageNo = $scope.startPackageNo; var startId = $scope.startId;
var endPackageNo=$scope.endPackageNo; var endId=$scope.endId;
var pcs_name=$scope.pcs_name; var pcs_name=$scope.pcs_name;
if(angular.isUndefined(startPackageNo)){ if(angular.isUndefined(startId)){
startPackageNo=''; startId='';
} }
if(angular.isUndefined(endPackageNo)){ if(angular.isUndefined(endId)){
endPackageNo=''; endId='';
} }
if(angular.isUndefined(pcs_name)){ if(angular.isUndefined(pcs_name)){
pcs_name=''; pcs_name='';
...@@ -110,12 +111,12 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http']) ...@@ -110,12 +111,12 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
controller: ['$scope', function ($scope) { controller: ['$scope', function ($scope) {
$scope.startDate = startDate; $scope.startDate = startDate;
$scope.endDate = endDate; $scope.endDate = endDate;
HttpService.selectXmlDataCount(startPackageNo,endPackageNo,pcs_name,startDate,endDate,function(data){ HttpService.selectXmlDataCount(startId,endId,pcs_name,startDate,endDate,function(data){
$scope.total=data; $scope.total=data;
console.log($scope.total,"count") console.log($scope.total,"count")
}) })
$scope.confirmDelete = function () { $scope.confirmDelete = function () {
HttpService.deleteProdCards(startPackageNo,endPackageNo,pcs_name,startDate,endDate, function (data) { HttpService.deleteProdCards(startId,endId,pcs_name,startDate,endDate, function (data) {
if(data){ if(data){
MessageService.showAlert("删除成功"); MessageService.showAlert("删除成功");
$scope.closeThisDialog(); $scope.closeThisDialog();
......
src/main/resources/static/views/excelAndSearch/excelAndSearch.html
View file @ 1a2a80bf
...@@ -90,8 +90,8 @@ ...@@ -90,8 +90,8 @@
</div> </div>
<input type="text" <input type="text"
class="form-control pull-right" class="form-control pull-right"
ng-model="choseDate"
id="datepicker3" readonly/> id="datepicker3" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div> </div>
</td> </td>
<td>文件名称:</td> <td>文件名称:</td>
......
src/main/resources/static/views/excelAndSearch/excelAndSearch.js
View file @ 1a2a80bf
...@@ -28,6 +28,7 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -28,6 +28,7 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
todayBtn: 1, todayBtn: 1,
autoclose: 1 autoclose: 1
}); });
$('#datepicker2').datetimepicker({ $('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒 minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN', language: 'zh-CN',
...@@ -42,11 +43,13 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -42,11 +43,13 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
todayBtn: 1, todayBtn: 1,
autoclose: 1 autoclose: 1
}); });
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.uploadExcel = function () { $scope.uploadExcel = function () {
var fd = new FormData(); var fd = new FormData();
var files = document.querySelector('input#id_file_photo_for_check').files; var files = document.querySelector('input#id_file_photo_for_check').files;
......
src/main/resources/static/views/task/taskListSorting.html
View file @ 1a2a80bf
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</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 ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>
<td class="mailbox-subject">{{task.recheckCount}}</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-date"><a ng-click="getPoliceList(task.policeList,task.taskId)">组号列表</a></td>
<td class="mailbox-subject"><button class="btn btn-primary">打印封条</button></td> <td class="mailbox-subject"><button class="btn btn-primary">打印封条</button></td>
</tr> </tr>
<tr ng-if="task.taskId==taskId"> <tr ng-if="task.taskId==taskId">
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js
View file @ 1a2a80bf
...@@ -106,6 +106,9 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -106,6 +106,9 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else{ }else{
json.uploadDate = $("#datepicker").val(); json.uploadDate = $("#datepicker").val();
} }
if($scope.paginationConf.currentPage==0){
$scope.paginationConf.currentPage=1
}
json.firstIndex=$scope.paginationConf.currentPage; json.firstIndex=$scope.paginationConf.currentPage;
json.pageSize=$scope.paginationConf.itemsPerPage; json.pageSize=$scope.paginationConf.itemsPerPage;
return json; return json;
...@@ -120,8 +123,6 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -120,8 +123,6 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
console.log(data) console.log(data)
}) })
} }
// 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目 // 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.doQuery); $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.doQuery);
......
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