Skip to content

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

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

parents 4f703127 d96a2ffc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 501 additions and 207 deletions
src/main/java/com/yxproject/start/api/FailedCardApi.java
View file @ eeef6787
......@@ -121,4 +121,56 @@ public class FailedCardApi {
return true;
}
/**
* 查询所有证件类型
* @return List
*/
@RequestMapping("selectCardType")
public List<String> selectCardType(){
List<String> result= failedCardService.selectCardType();
return result;
}
/**
* 生成历史回迁证
* @param jsonStr
* @return
*/
@RequestMapping("insertBackCard")
@Transactional(rollbackFor = Exception.class)
public boolean insertBackCard(@RequestBody String jsonStr){
JSONArray jsonarray = JSONArray.fromObject(jsonStr);
TaskEntity taskEntity = new TaskEntity();
String str2 = null;
for (int i = 0; i < jsonarray.size(); i++) {
JSONObject jsonObject = (JSONObject) jsonarray.get(i);
String str = jsonObject.getString("idCard");
if (i != jsonarray.size() - 1) {
str2 += "'" + str + "',";
} else {
str2 += "'" + str + "'";
}
}
//查询制证库，拿到组号列表
List<String> groupList = failedCardService.selectGroupNo(str2);
//生成任务单
for (int i = 0; i < groupList.size(); i++) {
JSONObject jsonObject = (JSONObject) jsonarray.get(i);
//查询生成任务单需要的数据
Map<String, Object> dataMap = failedCardService.selectTaskListById(jsonObject.getString("idCard"));
//TODO 会报空指针异常
String countyCode = dataMap.get("COUNTY_CODE").toString();
Long cardType = (Long) dataMap.get("CARD_TYPE_ID");
taskEntity.setCountyCode(countyCode);
taskEntity.setCardType(cardType);
taskEntity.setTaskStateId((long) 1);
//生成任务单
taskListService.saveTask(taskEntity);
//生成新组号列表
Map<String,Object> groupDataMap= failedCardService.selectGroupDate(groupList.get(i));
failedCardService.insertGroupNo(String.valueOf(groupDataMap.get("GROUP_NO")),String.valueOf(groupDataMap.get("TASK_ID")),(Long) groupDataMap.get("VALID_COUNT"),(Long)groupDataMap.get("INVALID_COUNT"));
}
return true;
}
}
src/main/java/com/yxproject/start/mapper/FailedCardMapper.java
View file @ eeef6787
......@@ -82,8 +82,33 @@ public interface FailedCardMapper {
/*历史回迁证*/
/*查询所有证件类型，用于下拉框*/
@Select("select CARD_TYPE from card_type_dic")
public List<String> selectCardType();
@Select("select substr(ACCEPT_NO,0,8) from PROD_CARD_T where ID_NO in" +
" (#{cardList})group by substr(ACCEPT_NO,0,8);")
public List<String> selectGroupNo(String cardIdList);
@Select("select SPECIAL_CARD.SPECIAL_TYPE,prod_card_t.accept_no,subStr(prod_card_t.UPLOAD_NO,0,6),SPECIAL_CARD.INITIATOR,PREPRO_PERSON.CARD_TYPE_ID\n" +
"from prod_card_t@prod_link\n" +
"left join SPECIAL_CARD on prod_card_t.accept_no = SPECIAL_CARD.accept_no\n" +
"left join PREPRO_PERSON on PREPRO_PERSON.JMSFZSLH=prod_card_t.UPLOAD_NO\n" +
"where prod_card_t.ID_NO=#{acceptNo}")
public Map<String,Object> selectTaskListById(String id);
@Select("select prod_group_t.valid_count,prod_group_t.invalid_count from prod_group_t@prod_link \n" +
"where group_no=#{groupNo}")
public Map<String,Object> selectGroupDate(String groupNo);
@Insert("insert into group_no (GROUP_NO,TASK_ID,VALID_COUNT,INVALID_COUNT)values('12345678','20190308073',79,1);")
public boolean insertGroupNo(@Param("GROUP_NO")String GROUP_NO,@Param("TASK_ID")String TASK_ID,@Param("VALID_COUNT")long VALID_COUNT,@Param("INVALID_COUNT")long INVALID_COUNT);
}
src/main/java/com/yxproject/start/mapper/PersonPostMapper.java
View file @ eeef6787
......@@ -35,7 +35,7 @@ public interface PersonPostMapper {
"SELECT A.*, ROWNUM RN " +
" from (SELECT * FROM PERSON_POST " +
" LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID=PERSON_POST.FILE_ID" +
"WHERE 1=1" +
" WHERE 1=1" +
" <when test='applicantName!=null'> and PERSON_POST.APPLICANT_NAME = #{applicantName} </when>" +
" <when test='orderNumber!=null'> and PERSON_POST.ORDER_NUMBER=#{orderNumber} </when>" +
" <when test='state!=null'> and PERSON_POST.STATE=#{state} </when>" +
......
src/main/java/com/yxproject/start/service/FailedCardService.java
View file @ eeef6787
......@@ -20,4 +20,15 @@ public interface FailedCardService {
public boolean addSpecialCard(@Param("acceptNo")String acceptNo);
public Map<String, Object> selectTaskListDate(@Param("acceptNo")String acceptNo);
public List<String> selectCardType();
public List<String>selectGroupNo(String idCard);
public Map<String,Object> selectTaskListById(@Param("id") String id);
public Map<String,Object> selectGroupDate(String groupNo);
public boolean insertGroupNo(@Param("GROUP_NO")String GROUP_NO,@Param("TASK_ID")String TASK_ID,@Param("VALID_COUNT")long VALID_COUNT,@Param("INVALID_COUNT")long INVALID_COUNT);
}
src/main/java/com/yxproject/start/service/impl/FailedCardServiceImpl.java
View file @ eeef6787
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.TaskEntity;
import com.yxproject.start.mapper.FailedCardMapper;
import com.yxproject.start.service.FailedCardService;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@Service
......@@ -54,5 +58,36 @@ public class FailedCardServiceImpl implements FailedCardService {
return resultList;
}
@Override
public List<String> selectCardType() {
List<String> resultList = failedCardMapper.selectCardType();
return null;
}
@Override
public List<String> selectGroupNo(String idCard) {
List<String> result= failedCardMapper.selectGroupNo(idCard);
return result;
}
@Override
public Map<String, Object> selectTaskListById(String id) {
Map<String,Object> resultMap= failedCardMapper.selectTaskListById(id);
return resultMap;
}
@Override
public Map<String, Object> selectGroupDate(String groupNo) {
Map<String,Object> resultMap= failedCardMapper.selectGroupDate(groupNo);
return resultMap;
}
@Override
public boolean insertGroupNo(String GROUP_NO, String TASK_ID, long VALID_COUNT, long INVALID_COUNT) {
failedCardMapper.insertGroupNo(GROUP_NO,TASK_ID,VALID_COUNT,INVALID_COUNT);
return false;
}
}
src/main/resources/static/dialogs/specailCardInfo.html 0 → 100644
View file @ eeef6787
<div class="ui-dialog-title">
特殊证件详情
</div>
<div class="ui-dialog-content">
<table class="table" style="border-color: black;">
<thead>
<tr>
<th>受理号</th>
<th>证件类型</th>
<th>工序</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="groups in specailCardData">
<td>{{groups.ACCEPT_NO}}</td>
<td ng-if="groups.SPECIAL_TYPE==2">快证</td>
<td ng-if="groups.SPECIAL_TYPE==1">余证</td>
<td>{{groups.TASK_STATE}}</td>
</tr>
</tbody>
</table>
</div>
\ No newline at end of file
src/main/resources/static/js/service.js
View file @ eeef6787
......@@ -499,6 +499,28 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data)
})
},
getFjTaskListByProcess:function(success){
$http({
method: 'GET',
url: "../TaskList/queryByCountyAtAuxiliaryState3"+urlTimeStamp(),
params:{
process:$rootScope.loginData.roleList[0].process
}
}).then(function successCallback(response) {
success(response.data)
})
},
getPingTaskListByProcess:function(success) {
$http({
method: 'GET',
url: "../TaskList/queryByCountyAtAuxiliaryState1" + urlTimeStamp(),
params: {
process: $rootScope.loginData.roleList[0].process
}
}).then(function successCallback(response) {
success(response.data)
})
},
analyseData:function(date,currPage,pageSize,success){
$http({
method: 'GET',
......@@ -534,6 +556,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data)
})
},
updatePrintTaskListProcess:function(json,success){
var body = JSON.stringify(json);
$http({
method: 'POST',
url: "../TaskList/updateState2",
data: body,
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) {
success(response.data)
})
},
addSpecialCard:function(data,success){
var body = JSON.stringify(data);
$http({
......@@ -544,6 +577,18 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}).then(function successCallback(response) {
success(response.data)
})
},
getSpecialCardData:function(groupNo,success){
console.log(groupNo)
$http({
method: 'GET',
url: "../SpecialCard/selectSpecialCard"+urlTimeStamp(),
params:{
groupNo:groupNo
}
}).then(function successCallback(response) {
success(response.data)
})
}
}
});
\ No newline at end of file
src/main/resources/static/views/createTaskList/createTaskList.js
View file @ eeef6787
......@@ -142,28 +142,34 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
};
$scope.createTaskList = function(typeCode){
var arr = [];
for (var i=0;i<$scope.selected.length;i++){
var json = {
countyCode:$scope.selected[i].countyCode,
typeCode:typeCode
if($scope.selected.length>0){
var arr = [];
for (var i=0;i<$scope.selected.length;i++){
var json = {
countyCode:$scope.selected[i].countyCode,
typeCode:typeCode
}
arr.push(json);
}
arr.push(json);
}
var groupList = [];
var map = {
date:$('#datepicker').val(),
name:$rootScope.loginData.name,
countyList:arr,
groupList:groupList,
tag:0
var groupList = [];
var map = {
date:$('#datepicker').val(),
name:$rootScope.loginData.name,
countyList:arr,
groupList:groupList,
tag:0
}
console.log(map)
HttpService.createTask(map,function(data){
MessageService.showAlert("创建成功")
console.log(reGet)
reGet();
})
}else{
MessageService.showAlert("请选择创建任务单的组")
}
console.log(map)
HttpService.createTask(map,function(data){
MessageService.showAlert("创建成功")
console.log(reGet)
reGet();
})
}
});
......
src/main/resources/static/views/dispatchTask/dispatchTask.js
View file @ eeef6787
......@@ -37,69 +37,6 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
}
$scope.searchTaskList();
// $scope.cycleSheetData = [
// {
// typeCode: '1',
// typeName: '普通证',
// typeSum: 300,
// isActive: 'true',
// countyList: [
// {
// saveDate: '20190228',
// county: '朝阳区',
// groupCount:5,
// groupNo: '00234653-03687587',
// valid: 240,
// invalid: 0,
// state:'未下发'
// },
// {
// saveDate: '20190228',
// county: '海淀区',
// groupCount:6,
// groupNo: '00234653-03687588',
// valid: 280,
// invalid: 2,
// state:'未下发'
// },
// {
// saveDate: '20190228',
// county: '海淀区',
// groupCount:6,
// groupNo: '00234653-03687588',
// valid: 280,
// invalid: 2,
// state:'未下发'
// }
// ]
// },
// {
// typeCode: '9',
// typeName: '邮寄证',
// typeSum: 500,
// isActive: 'false',
// countyList: [
// {
// saveDate: '20190228',
// county: '朝阳区',
// groupCount:5,
// groupNo: '00234653-03687587',
// valid: 240,
// invalid: 0,
// state:'未下发'
// },
// {
// saveDate: '20190228',
// county: '海淀区',
// groupCount:6,
// groupNo: '00234653-03687588',
// valid: 280,
// invalid: 2,
// state:'未下发'
// }
// ]
// }
// ]
//创建变量用来保存选中结果
$scope.selected = [];
......@@ -172,47 +109,53 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.currentTab = index;
}
$scope.getPoliceList = function(taskId){
$scope.getPoliceList = function(countyCode,typeCode){
ngDialog.open({
template: 'dialogs/policeList.html' + urlTimeStamp(),
width: 600,
width: 800,
cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.policeList = [
{
policeName:'东城派出所',
dataCheckCount:100,
printCount:0,
qualityCheckCount:0
},
{
policeName:'西城派出所',
dataCheckCount:200,
printCount:0,
qualityCheckCount:0
}
]
controller: ['$scope', 'HttpService',function ($scope,HttpService) {
console.log($('#datepicker').val(),countyCode,typeCode);
$scope.paginationConf = {
currentPage: 1,
itemsPerPage: 10,
perPageOptions: [10, 20, 30, 40, 50]
};
var getGroupInfoList = function () {
HttpService.getGroupListData($('#datepicker').val(),countyCode,typeCode,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
$scope.paginationConf.totalItems = data.count;
$scope.policeList =data.groupList;
})
}
// 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', getGroupInfoList);
}]
});
}
$scope.goes = function(){
var checks = $(".checkOneBox:checked");
var arr = [];
for (var i=0;i<checks.length;i++){
arr.push(checks[i].value)
}
var json={
process:$rootScope.loginData.roleList[0].process,
name:$rootScope.loginData.name,
taskIdList:arr
if(checks.length>0){
var arr = [];
for (var i=0;i<checks.length;i++){
arr.push(checks[i].value)
}
var json={
process:$rootScope.loginData.roleList[0].process,
name:$rootScope.loginData.name,
taskIdList:arr
}
console.log(json)
HttpService.updateTaskListProcess(json,function(data){
$scope.searchTaskList();
MessageService.showAlert("下发完成")
})
}else{
MessageService.showAlert("请选择下发的任务单")
}
console.log(json)
HttpService.updateTaskListProcess(json,function(data){
$scope.searchTaskList();
MessageService.showAlert("下发完成")
})
}
});
......
src/main/resources/static/views/task/taskListCutting.html
View file @ eeef6787
......@@ -27,42 +27,72 @@
</ul>
</a>
</li>
<li style="float: right; padding-right: 30px;">
<h4>任务总数:8001</h4>
</li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<table class="table table-hover table-striped">
<thead>
<tr>
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></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="task in type.countyList">
<td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.checkDate}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.dataCheckCount}}</td>
<td class="mailbox-attachment">{{task.electricCount}}</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-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td>
</tr>
</tbody>
<li style="float: right; padding-right: 30px;">
<h4>任务总数:{{total}}</h4>
</li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<table class="table table-hover table-striped">
<thead>
<tr>
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
<th>任务单编号</th>
<th>核验日期</th>
<th>地区</th>
<th>组数</th>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</tr>
</thead>
<tbody ng-repeat="task in type.countyList">
<tr>
<td><input type="checkbox" ng-disabled="task.faileCount>0" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.saveDate | date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-attachment">{{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-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
</tr>
<tr ng-if="task.taskId==taskId">
<td></td>
<td colspan="10">
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</thead>
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.FAILECOUNT}}</td>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
</tr>
</tbody>
</table>
</td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
<!-- /.table -->
<div class="box-footer" style="text-align: right;">
......
src/main/resources/static/views/task/taskListPreLocating.html
View file @ eeef6787
......@@ -28,7 +28,7 @@
</a>
</li>
<li style="float: right; padding-right: 30px;">
<h4>任务总数:8001</h4>
<h4>任务总数:{{total}}</h4>
</li>
</ul>
</div>
......@@ -42,27 +42,57 @@
<th>地区</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="task in type.countyList">
<td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.checkDate}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.dataCheckCount}}</td>
<td class="mailbox-attachment">{{task.electricCount}}</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-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td>
</tr>
</tbody>
<tbody ng-repeat="task in type.countyList">
<tr>
<td><input type="checkbox" ng-disabled="task.faileCount>0" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.saveDate | date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-attachment">{{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-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
</tr>
<tr ng-if="task.taskId==taskId">
<td></td>
<td colspan="10">
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</thead>
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.FAILECOUNT}}</td>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
</tr>
</tbody>
</table>
</td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
<!-- /.table -->
<div class="box-footer" style="text-align: right;">
......
src/main/resources/static/views/task/taskListPrint.html
View file @ eeef6787
......@@ -37,7 +37,7 @@
<table class="table table-hover table-striped">
<thead>
<tr>
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
<th><input type="checkbox" ng-click="selectAll(type.countyList,type.typeCode,$event)" ng-checked="isSelectedAll($index)"></th>
<th>任务单编号</th>
<th>核验日期</th>
<th>地区</th>
......@@ -50,11 +50,11 @@
<th></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="task in type.countyList">
<td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" name="{{task.countyValidCount-task.specialCount}}" ng-click="updateSelection($event,task)"></td>
<tbody ng-repeat="task in type.countyList">
<tr>
<td><input type="checkbox" ng-disabled="task.faileCount>0" id="checkOneBox" class="checkOneBox{{type.typeCode}}" ng-checked="isSelected(task)" value="{{task.taskId}}" name="{{task.countyValidCount-task.specialCount}}" ng-click="updateSelection($event,task,type.typeCode)"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.saveDate}}</td>
<td class="mailbox-subject">{{task.saveDate | date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
......@@ -63,7 +63,35 @@
<td class="mailbox-attachment">{{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-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
</tr>
<tr ng-if="task.taskId==taskId">
<td></td>
<td colspan="10">
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</thead>
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.FAILECOUNT}}</td>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
</tr>
</tbody>
</table>
</td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
......
src/main/resources/static/views/task/taskListPushing.html
View file @ eeef6787
......@@ -28,41 +28,71 @@
</a>
</li>
<li style="float: right; padding-right: 30px;">
<h4>任务总数:8001</h4>
<h4>任务总数:{{total}}</h4>
</li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<table class="table table-hover table-striped">
<thead>
<tr>
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></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="task in type.countyList">
<td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
<tr>
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
<th>任务单编号</th>
<th>核验日期</th>
<th>地区</th>
<th>组数</th>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</tr>
</thead>
<tbody ng-repeat="task in type.countyList">
<tr>
<td><input type="checkbox" ng-disabled="task.faileCount>0" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.checkDate}}</td>
<td class="mailbox-subject">{{task.saveDate | date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.dataCheckCount}}</td>
<td class="mailbox-attachment">{{task.electricCount}}</td>
<td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-attachment">{{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-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td>
</tr>
</tbody>
<td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
</tr>
<tr ng-if="task.taskId==taskId">
<td></td>
<td colspan="10">
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</thead>
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.FAILECOUNT}}</td>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
</tr>
</tbody>
</table>
</td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
<!-- /.table -->
<div class="box-footer" style="text-align: right;">
......
src/main/resources/static/views/task/taskListSorting.html
View file @ eeef6787
......@@ -37,33 +37,68 @@
<th>地区</th>
<th>组数</th>
<th>组号</th>
<th>数据核验数</th>
<th>电写入数</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="task in type.countyList">
<td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
<tbody ng-repeat="task in type.countyList">
<tr>
<td><input type="checkbox" ng-disabled="task.faileCount>0" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.checkDate}}</td>
<td class="mailbox-subject">{{task.saveDate| date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.dataCheckCount}}</td>
<td class="mailbox-attachment">{{task.electricCount}}</td>
<td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-subject">{{task.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>
<td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>
<td class="mailbox-subject">{{task.checkCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(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>
</tr>
<tr ng-if="task.taskId==taskId">
<td></td>
<td colspan="10">
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</thead>
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.FAILECOUNT}}</td>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
</tr>
</tbody>
</table>
</td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
<!-- /.table -->
<div class="box-footer" style="text-align: right;">
<button class="btn btn-primary" ng-click="goes()">转出任务单</button>
</div>
</div>
<!-- /.mail-box-messages -->
</div>
......
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