Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 0f55a2d3 authored by dahai's avatar dahai
Browse files
Options

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

parents 6888f29d 70cf5aa8
Hide whitespace changes
Inline Side-by-side
Showing with 130 additions and 101 deletions
src/main/java/com/yxproject/start/mapper/LogMapper.java
View file @ 0f55a2d3
...@@ -41,6 +41,7 @@ public interface LogMapper { ...@@ -41,6 +41,7 @@ public interface LogMapper {
public boolean insertIntoAnalysis(@Param("fileDic")String fileDic,@Param("fileId")String fileId,@Param("commonCardCount")String commonCardCount,@Param("postCardCount")String postCardCount); public boolean insertIntoAnalysis(@Param("fileDic")String fileDic,@Param("fileId")String fileId,@Param("commonCardCount")String commonCardCount,@Param("postCardCount")String postCardCount);
//查询解析数据
@Select("<script> " + @Select("<script> " +
"SELECT * FROM " + "SELECT * FROM " +
"( " + "( " +
...@@ -53,7 +54,7 @@ public interface LogMapper { ...@@ -53,7 +54,7 @@ public interface LogMapper {
" LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID = ANALYSIS.FILE_DIC_ID "+ " LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID = ANALYSIS.FILE_DIC_ID "+
"WHERE 1=1" + "WHERE 1=1" +
"<if test='fileName !=\"\"' >" + "<if test='fileName !=\"\"' >" +
" and FILE_NAME_DIC.FILE_NAME=#{fileName} " + " and FILES.SOURCE_FILE_NAME=#{fileName} " +
"</if>" + "</if>" +
"<if test='analysisDate !=\"\"' >" + "<if test='analysisDate !=\"\"' >" +
"AND subStr(FILE_NAME_DIC.ANALYSIS_DATE,0,8) =subStr( #{analysisDate},0,8) " + "AND subStr(FILE_NAME_DIC.ANALYSIS_DATE,0,8) =subStr( #{analysisDate},0,8) " +
...@@ -69,11 +70,13 @@ public interface LogMapper { ...@@ -69,11 +70,13 @@ public interface LogMapper {
@Select("select files.id from files where files.SOURCE_FILE_NAME = #{fileName}") @Select("select files.id from files where files.SOURCE_FILE_NAME = #{fileName}")
public String selectByFileName(@Param("fileName")String fileName); public String selectByFileName(@Param("fileName")String fileName);
/*查询新包日志*/
@Select("<script> " + @Select("<script> " +
"SELECT * FROM " + "SELECT * FROM " +
" ( " + " ( " +
" SELECT A.*, ROWNUM RN " + " SELECT A.*, ROWNUM RN " +
" FROM (SELECT NEW_FILE_NAME,CREATE_DATE,RECORD_NUMBER,DWDM,DWMC FROM NEW_FILES " + " FROM (SELECT NEW_FILE_NAME,CREATE_DATE,RECORD_NUMBER,DWDM,DWMC " +
" FROM NEW_FILES " +
" RIGHT JOIN PREPRO_PERSON ON NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID" + " RIGHT JOIN PREPRO_PERSON ON NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID" +
" where 1=1 " + " where 1=1 " +
" <if test='newFileName !=\"\"' >" + " <if test='newFileName !=\"\"' >" +
...@@ -118,14 +121,14 @@ public interface LogMapper { ...@@ -118,14 +121,14 @@ public interface LogMapper {
public int selectNewFileLogCount(@Param("newFileName") String newFileName, @Param("cardId") String cardId, @Param("createDate") String createDate, @Param("uploadCountyCode") String uploadCountyName); public int selectNewFileLogCount(@Param("newFileName") String newFileName, @Param("cardId") String cardId, @Param("createDate") String createDate, @Param("uploadCountyCode") String uploadCountyName);
// TODO 解析日志总数
@Select("<script> " + @Select("<script> " +
"SELECT COUNT(*) FROM FILE_NAME_DIC \n" + "SELECT COUNT(*) FROM FILES \n" +
"LEFT JOIN PERSON_POST ON FILE_NAME_DIC.FILE_ID=PERSON_POST.FILE_ID " + "LEFT JOIN ANALYSIS ON ANALYSIS.FILE_ID =FILES.ID "+
"LEFT JOIN FILES ON FILES.ID=FILE_NAME_DIC.FILE_ID " + "LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID=ANALYSIS.FILE_DIC_ID " +
"left join PREPRO_PERSON on PREPRO_PERSON.JMSFZSLH = person_post.FIRST_WHITE " +
"where 1=1 " + "where 1=1 " +
"<if test='fileName !=\"\"' >" + "<if test='fileName !=\"\"' >" +
"and NEW_FILES.NEW_FILE_NAME=#{fileName} " + "and FILES.SOURCE_FILE_NAME=#{fileName} " +
"</if>" + "</if>" +
"<if test='analysisDate !=\"\"' >" + "<if test='analysisDate !=\"\"' >" +
"AND subStr(FILE_NAME_DIC.ANALYSIS_DATE,0,8) = #{analysisDate} " + "AND subStr(FILE_NAME_DIC.ANALYSIS_DATE,0,8) = #{analysisDate} " +
......
src/main/java/com/yxproject/start/mapper/SelectSerialNumberMapper.java
View file @ 0f55a2d3
...@@ -12,42 +12,59 @@ import java.util.Map; ...@@ -12,42 +12,59 @@ import java.util.Map;
@Mapper @Mapper
public interface SelectSerialNumberMapper { public interface SelectSerialNumberMapper {
@Select("select 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 CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
"TASK.CONCORA_CRUSH_DATE, "+ "WHERE TASK.TASK_ID =#{id} and GROUP_NO.GROUP_NO is not null\n" +
"TASK.PUNCHING_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.SORTING_DATE," + "TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" +
"TASK.QUALITY_TEST_DATE\n" + "TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE\n" +
" from TASK \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" +
" WHERE TASK_ID =#{id}") "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" +
"WHERE TASK.TASK_ID =#{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>> selectByWorkOrder(String id); public List<Map<String,Object>> selectByWorkOrder(String id);
@Select("select GROUP_NO.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 CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
"TASK.CONCORA_CRUSH_DATE, "+ "WHERE GROUP_NO.GROUP_NO =#{id} and GROUP_NO.GROUP_NO is not null\n" +
"TASK.PUNCHING_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.SORTING_DATE," + "TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" +
"TASK.QUALITY_TEST_DATE\n" + "TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE\n" +
"from TASK\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" +
"WHERE GROUP_NO =#{id}") "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" +
"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" +
"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>> selectByGroupNo(String id); public List<Map<String,Object>> selectByGroupNo(String id);
......
src/main/resources/static/dialogs/confirmDeleteProdCards.html
View file @ 0f55a2d3
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
提示 提示
</div> </div>
<div class="ui-dialog-content"> <div class="ui-dialog-content">
<div>确认删除{{startDate}}到{{endDate}}导入的{{total}}条记录吗？</div> <div>确认删除<span ng-if="startDate">{{startDate}}到{{endDate}}导入的</span>{{total}}条记录吗？</div>
</div> </div>
<div class="ui-dialog-confirm"> <div class="ui-dialog-confirm">
<button type="submit" class="btn btn-info" ng-click="confirmDelete()">确认删除</button> <button type="submit" class="btn btn-info" ng-click="confirmDelete()">确认删除</button>
......
src/main/resources/static/js/app.js
View file @ 0f55a2d3
...@@ -225,6 +225,7 @@ angular.module('AvatarCheck', [ ...@@ -225,6 +225,7 @@ angular.module('AvatarCheck', [
} }
$scope.addQuickCardProd = function(){ $scope.addQuickCardProd = function(){
console.log($scope.searchResult.workOrderData[0].CARD_TYPE_ID)
if($(".prod:checked").length>0){ if($(".prod:checked").length>0){
var idx = $(".prod:checked").val(); var idx = $(".prod:checked").val();
var check = idx.split("+"); var check = idx.split("+");
......
src/main/resources/static/js/service.js
View file @ 0f55a2d3
...@@ -350,6 +350,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -350,6 +350,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(oldPackageName)){ if(angular.isUndefined(oldPackageName)){
oldPackageName=''; oldPackageName='';
} }
console.log(oldPackageName,date)
$http({ $http({
method: 'GET', method: 'GET',
url: "../LogApi/selectAnalysisLogCount"+urlTimeStamp(), url: "../LogApi/selectAnalysisLogCount"+urlTimeStamp(),
...@@ -365,6 +366,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -365,6 +366,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(oldPackageName)){ if(angular.isUndefined(oldPackageName)){
oldPackageName=''; oldPackageName='';
} }
console.log(oldPackageName,date,currentPage,itemsPerPage)
$http({ $http({
method: 'GET', method: 'GET',
url: "../LogApi/selectByAnalysisLog"+urlTimeStamp(), url: "../LogApi/selectByAnalysisLog"+urlTimeStamp(),
......
src/main/resources/static/views/analysisLog/analysisLog.html
View file @ 0f55a2d3
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
</div> </div>
<input type="text" class="form-control pull-right" ng-value="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> <span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div> </div>
</td> </td>
...@@ -75,8 +75,8 @@ ...@@ -75,8 +75,8 @@
<td>{{item.FILE_NAME}}</td> <td>{{item.FILE_NAME}}</td>
<td>{{item.ANALYSIS_DATE | myDateFilter}}</td> <td>{{item.ANALYSIS_DATE | myDateFilter}}</td>
<td>{{item.RECORD_NUMBER}}</td> <td>{{item.RECORD_NUMBER}}</td>
<td>{{item.PUCOUNT}}</td> <td>{{item.COMMON_CARD_COUNT}}</td>
<td>{{item.YOUCOUNT}}</td> <td>{{item.POST_CARD_COUNT}}</td>
</tr> </tr>
</tbody> </tbody>
......
src/main/resources/static/views/analysisLog/analysisLog.js
View file @ 0f55a2d3
...@@ -24,7 +24,7 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa ...@@ -24,7 +24,7 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa
$($($(this).parent()).prev()).val(""); $($($(this).parent()).prev()).val("");
}) })
// $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.paginationConf = { $scope.paginationConf = {
currentPage: 1, currentPage: 1,
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.html
View file @ 0f55a2d3
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<td><input type="text" class="form-control" ng-model="sljg" placeholder="受理机关"></td> <td><input type="text" class="form-control" ng-model="sljg" placeholder="受理机关"></td>
<td>制证类型:</td> <td>制证类型:</td>
<td style="text-align: left;"> <td style="text-align: left;">
<select class="form-control select2" id="county" ng-model="typeCode"> <select class="form-control select2" id="cardType">
<option value="">--请选择制证类型--</option> <option value="">--请选择制证类型--</option>
<option value="{{type.cardTypeId}}" ng-repeat="type in typeList">{{type.cardType}}</option> <option value="{{type.cardTypeId}}" ng-repeat="type in typeList">{{type.cardType}}</option>
</select> </select>
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.js
View file @ 0f55a2d3
...@@ -85,6 +85,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't ...@@ -85,6 +85,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
var getCountAndDownloadUrl = function (url) { var getCountAndDownloadUrl = function (url) {
var date = $("#datepicker").val(); var date = $("#datepicker").val();
var packageType = $("#packageType").val(); var packageType = $("#packageType").val();
var cardType=$("#cardType").val();
if(angular.isUndefined($scope.uploadNo)){ if(angular.isUndefined($scope.uploadNo)){
url = url + 'uploadNo=&'; url = url + 'uploadNo=&';
}else{ }else{
...@@ -110,10 +111,10 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't ...@@ -110,10 +111,10 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
}else{ }else{
url = url + 'SSXQDM=' + $scope.sljg + '&'; url = url + 'SSXQDM=' + $scope.sljg + '&';
} }
if(angular.isUndefined($scope.typeCode)){ if(cardType==''){
url = url + 'cardType=&'; url = url + 'cardType=&';
}else{ }else{
url = url + 'cardType=' + $scope.typeCode + '&'; url = url + 'cardType=' + cardType + '&';
} }
if(angular.isUndefined(packageType)){ if(angular.isUndefined(packageType)){
url = url + 'state=&'; url = url + 'state=&';
...@@ -121,8 +122,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't ...@@ -121,8 +122,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
url = url + 'state=' + packageType + '&'; url = url + 'state=' + packageType + '&';
} }
if (date==''){ if (date==''){
date=$filter("date")(new Date(), "yyyy-MM-dd"); url = url + 'uploadDate=&';
url = url + 'uploadDate=' + date + '&';
}else{ }else{
url = url + 'uploadDate=' + date + '&'; url = url + 'uploadDate=' + date + '&';
} }
...@@ -133,6 +133,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't ...@@ -133,6 +133,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
var a = document.createElement("a"); var a = document.createElement("a");
document.body.appendChild(a); document.body.appendChild(a);
a.href = encodeURI(getCountAndDownloadUrl(url)); a.href = encodeURI(getCountAndDownloadUrl(url));
console.log(encodeURI(getCountAndDownloadUrl(url)))
a.click(); a.click();
} }
......
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.js
View file @ 0f55a2d3
...@@ -99,37 +99,36 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http']) ...@@ -99,37 +99,36 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
if(angular.isUndefined(pcs_name)){ if(angular.isUndefined(pcs_name)){
pcs_name=''; pcs_name='';
} }
if(startDate==''){ if((startDate!=''&&endDate=='')||(endDate!=''&&startDate=='')) {
startDate=$filter("date")(new Date(), "yyyy-MM-dd"); MessageService.showAlert("请选择起始日期和结束日期")
} }else{
if(endDate==''){ ngDialog.open({
endDate=$filter("date")(new Date(), "yyyy-MM-dd"); template: 'dialogs/confirmDeleteProdCards.html' + urlTimeStamp(),
} width: 600,
ngDialog.open({ cache: false,
template: 'dialogs/confirmDeleteProdCards.html' + urlTimeStamp(), closeByDocument:false,
width: 600, controller: ['$scope', function ($scope) {
cache: false, $scope.startDate = startDate;
closeByDocument:false, $scope.endDate = endDate;
controller: ['$scope', function ($scope) { HttpService.selectXmlDataCount(startPackageNo,endPackageNo,pcs_name,startDate,endDate,function(data){
$scope.startDate = startDate; $scope.total=data;
$scope.endDate = endDate; console.log($scope.total,"count")
HttpService.selectXmlDataCount(startPackageNo,endPackageNo,pcs_name,startDate,endDate,function(data){
$scope.total=data;
console.log($scope.total,"count")
})
$scope.confirmDelete = function () {
HttpService.deleteProdCards(startPackageNo,endPackageNo,pcs_name,startDate,endDate, function (data) {
if(data){
MessageService.showAlert("删除成功");
$scope.closeThisDialog();
reGet();
}else{
MessageService.showAlert("删除失败")
}
}) })
}; $scope.confirmDelete = function () {
HttpService.deleteProdCards(startPackageNo,endPackageNo,pcs_name,startDate,endDate, function (data) {
if(data){
MessageService.showAlert("删除成功");
$scope.closeThisDialog();
reGet();
}else{
MessageService.showAlert("删除失败")
}
})
};
}]
});
}
}]
});
} }
}); });
\ No newline at end of file
src/main/resources/static/views/createTaskList/createTaskList.js
View file @ 0f55a2d3
...@@ -31,6 +31,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -31,6 +31,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
$scope.isHistory=0; $scope.isHistory=0;
$scope.searchCurrent = function(){ $scope.searchCurrent = function(){
$rootScope.cardsTotal = 0;
$scope.isHistory=0; $scope.isHistory=0;
HttpService.getTaskListToCreate($('#datepicker').val(),function(data){ HttpService.getTaskListToCreate($('#datepicker').val(),function(data){
$scope.cycleSheetData = data; $scope.cycleSheetData = data;
...@@ -232,6 +233,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -232,6 +233,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
$scope.searchCurrent(); $scope.searchCurrent();
$scope.selected=[]; $scope.selected=[];
$rootScope.selectedGroup=[]; $rootScope.selectedGroup=[];
$rootScope.cardsTotal = 0;
}) })
}else{ }else{
MessageService.showAlert("请选择创建任务单的组") MessageService.showAlert("请选择创建任务单的组")
......
src/main/resources/static/views/dispatchTask/dispatchTask.html
View file @ 0f55a2d3
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</ul> </ul>
</a> </a>
</li> </li>
<li class="pull-right" style="padding-right: 20px;"><h5>已选择数量：{{cardsTotal}}</h5></li> <li class="pull-right" style="padding-right: 20px;"><h4>已选择数量：{{cardsTotal}}</h4></li>
</ul> </ul>
</div> </div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index"> <div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
......
src/main/resources/static/views/dispatchTask/dispatchTask.js
View file @ 0f55a2d3
...@@ -24,8 +24,10 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -24,8 +24,10 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.isHistory=0; $scope.isHistory=0;
$scope.searchTaskList = function(){ $scope.searchTaskList = function(){
$rootScope.cardsTotal = 0;
$scope.isHistory=0; $scope.isHistory=0;
HttpService.getTaskListByProcess(function(data){ HttpService.getTaskListByProcess(function(data){
$scope.cycleSheetData = data; $scope.cycleSheetData = data;
...@@ -178,6 +180,7 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -178,6 +180,7 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
HttpService.updateTaskListProcess(json,function(data){ HttpService.updateTaskListProcess(json,function(data){
$scope.searchTaskList(); $scope.searchTaskList();
MessageService.showAlert("下发完成") MessageService.showAlert("下发完成")
$rootScope.cardsTotal = 0;
}) })
}else{ }else{
MessageService.showAlert("请选择下发的任务单") MessageService.showAlert("请选择下发的任务单")
......
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.js
View file @ 0f55a2d3
...@@ -30,8 +30,25 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -30,8 +30,25 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.paginationConf = {
currentPage: 1,
itemsPerPage: 10,
perPageOptions: [10, 20, 30, 40, 50]
};
$scope.getXmlPackage = function(){
if($scope.paginationConf.currentPage==0){
$scope.paginationConf.currentPage=1;
}
HttpService.selectXmlPackage($("#datepicker").val(),$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
$scope.paginationConf.totalItems=data.respData.count;
$scope.xmlPackageData = data.respData.mapList;
console.log($scope.xmlPackageData,"$scope.xmlPackageData")
})
}
// 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getXmlPackage);
var getData = $scope.getXmlPackage;
$scope.analysis = function (uploadDate,packageCount) { $scope.analysis = function (uploadDate,packageCount) {
ngDialog.open({ ngDialog.open({
template: 'dialogs/analysisDialog.html' + urlTimeStamp(), template: 'dialogs/analysisDialog.html' + urlTimeStamp(),
...@@ -48,7 +65,9 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -48,7 +65,9 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
console.log(uploadDate) console.log(uploadDate)
HttpService.analyseToUpdateIfPostCard(fileid,uploadDate,function(data){ HttpService.analyseToUpdateIfPostCard(fileid,uploadDate,function(data){
if(data){ if(data){
$scope.closeThisDialog();
MessageService.showAlert("解析完成") MessageService.showAlert("解析完成")
getData();
} }
}) })
} }
...@@ -66,7 +85,6 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -66,7 +85,6 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
for(var i in files){ for(var i in files){
fd.append('file', files[i]); fd.append('file', files[i]);
} }
var getData = $scope.getXmlPackage;
ngDialog.openConfirm({ ngDialog.openConfirm({
template: 'dialogs/alert.html' + urlTimeStamp(), template: 'dialogs/alert.html' + urlTimeStamp(),
width: 600, width: 600,
...@@ -89,23 +107,7 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -89,23 +107,7 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
} }
$scope.paginationConf = {
currentPage: 1,
itemsPerPage: 10,
perPageOptions: [10, 20, 30, 40, 50]
};
$scope.getXmlPackage = function(){
if($scope.paginationConf.currentPage==0){
$scope.paginationConf.currentPage=1;
}
HttpService.selectXmlPackage($("#datepicker").val(),$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
$scope.paginationConf.totalItems=data.respData.count;
$scope.xmlPackageData = data.respData.mapList;
console.log($scope.xmlPackageData,"$scope.xmlPackageData")
})
}
// 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getXmlPackage);
var reGet = $scope.getXmlPackage; var reGet = $scope.getXmlPackage;
......
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