Skip to content

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

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

parents 196af140 54f4059c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 584 additions and 228 deletions
src/main/java/com/yxproject/start/api/SpecialCardApi.java 0 → 100644
View file @ d96a2ffc
package com.yxproject.start.api;
import com.yxproject.start.service.SpecialCardService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
/**
* @auther zhangyusheng
* 2019/3/9 18:23
*/
@RestController
@RequestMapping("SpecialCard")
public class SpecialCardApi {
@Autowired
private SpecialCardService specialCardService;
/**
* 查询特殊证件详情
* @param groupNo 组号
* @return
*/
@RequestMapping("selectSpecialCard")
public List<Map> updateState2(@RequestParam("groupNo") String groupNo) {
return specialCardService.selectSpecialCardByGroupNo(groupNo);
}
}
src/main/java/com/yxproject/start/api/TaskListApi.java
View file @ d96a2ffc
......@@ -90,14 +90,13 @@ public class TaskListApi {
/**
* 更改任务单状态
* （下发、预订位、平压、冲切、分拣）
* taskId 任务单ID
* name 下发人姓名
* process 下发人所在工序
*
* @return
*/
@RequestMapping("updateState")
public boolean updateState(@RequestBody String json) {
JSONObject jsonObject = JSONObject.fromObject(json);
JSONArray jsonArray = (JSONArray) jsonObject.get("taskIdList");
......@@ -108,10 +107,32 @@ public class TaskListApi {
return taskListService.updateState(list, process, name);
}
/**
* 更改任务单状态
* （打印转出）
* taskId 任务单ID
* name 打印转出人姓名
* process 打印转出人所在工序
* printer 打印机编号
* @return
*/
@RequestMapping("updateState2")
public boolean updateState2(@RequestBody String json) {
JSONObject jsonObject = JSONObject.fromObject(json);
JSONArray jsonArray = (JSONArray) jsonObject.get("taskIdList");
String process = jsonObject.get("process").toString();
String name = jsonObject.get("name").toString();
String printer = jsonObject.get("printer").toString();
Boolean b = true;
List<String> list = (List<String>) jsonArray;
return taskListService.updateState2(list, process, name,Long.valueOf(printer));
}
/**
* 查询任务单详情
* (受理库)
*
*（创建）
* @param process 工序
* @param date 查询时间
* @param resp
......@@ -127,7 +148,6 @@ public class TaskListApi {
/**
* 查询组号列表详情
* 受理库
*
* @param date 查询时间
* @param typeCode 制证类型
* @param countyCode 区县代码
......@@ -141,11 +161,10 @@ public class TaskListApi {
}
/**
* 查询任务单详情
* (辅助库)
*
*（下发、数据核验）
* @param process 工序
* @param resp
* @return
......@@ -156,6 +175,34 @@ public class TaskListApi {
return objects;
}
/**
* 查询任务单详情
* (辅助库)
*（预订位、平压、冲切）
* @param process 工序
* @param resp
* @return
*/
@RequestMapping("queryByCountyAtAuxiliaryState1")
public Map queryByCountyAtAuxiliaryState1(@RequestParam("process") String process, HttpServletResponse resp) {
Map map = taskListService.selectByCountyAtAuxiliary2(Long.valueOf(process) - 1);
return map;
}
/**
* 查询任务单详情
* (辅助库、制证库)
*（分拣）
* @param process 工序
* @param resp
* @return
*/
@RequestMapping("queryByCountyAtAuxiliaryState3")
public List<Object> queryByCountyAtAuxiliaryState3(@RequestParam("process") String process, HttpServletResponse resp) {
List<Object> objects = taskListService.selectByCountyAtAuxiliary3(Long.valueOf(process) - 1);
return objects;
}
/**
* 生成任务单
......
src/main/java/com/yxproject/start/mapper/SpecialCardMapper.java
View file @ d96a2ffc
......@@ -4,6 +4,7 @@ import com.yxproject.start.entity.SpecialCardEntity;
import org.apache.ibatis.annotations.*;
import java.util.List;
import java.util.Map;
/**
* @auther zhangyusheng
......@@ -35,4 +36,16 @@ public interface SpecialCardMapper {
*/
@Update("update SPECIAL_CARD set SPECIAL_TYPE = #{specialType} where SPECIAL_CARD_ID = #{specialCardId}")
public boolean updateSpecialCardSpecialType(SpecialCardEntity specialCardEntity);
/**
* 查询特证信息
* @param groupNo 组号
* @return
*/
@Select("select SPECIAL_CARD.ACCEPT_NO,SPECIAL_CARD.TASK_ID,SPECIAL_CARD.GROUP_NO,SPECIAL_CARD.SPECIAL_TYPE,task.TASK_STATE_ID,TASK_STATE_DIC.TASK_STATE \n" +
"from SPECIAL_CARD \n" +
"left join task on task.TASK_ID = SPECIAL_CARD.TASK_ID\n" +
"left join TASK_STATE_DIC on TASK_STATE_DIC.TASK_STATE_ID = task.TASK_STATE_ID\n" +
"where GROUP_NO = #{groupNo}")
public List<Map> selectSpecialCardByGroupNo(String groupNo);
}
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
View file @ d96a2ffc
......@@ -146,45 +146,109 @@ public interface TaskListMapper {
* @param process 工序
* @return
*/
@Select("select task.task_id,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
@Select("select task.submit_date, task.task_id,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT,group_no.INVALID_COUNT,group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO, nvl(fc.faileCount,0) faileCount\n" +
"from group_no left join task on group_no.task_id= task.TASK_ID\n" +
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"left join (select task_id, nvl(count(*),0) faileCount from FAILED_CARD group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
"where task.TASK_STATE_ID = #{process}")
"where task.TASK_STATE_ID = #{process} order by group_no.GROUP_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_common(@Param("process") long process);
/**
* 循环单查询
* 辅助库、制证库 大批证
* @param process 工序
* @return
*/
@Select("select DISTINCT sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count, task.submit_date, task.task_id,CARD_TYPE_DIC.CARD_TYPE,\n" +
"CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT,group_no.INVALID_COUNT,\n" +
"group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO, nvl(fc.faileCount,0) faileCount\n" +
"from group_no left join task on group_no.task_id= task.TASK_ID\n" +
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"left join (select task_id, nvl(count(*),0) faileCount from FAILED_CARD group by task_id ) fc \n" +
"on fc.TASK_ID = task.TASK_ID\n" +
"left join prod_trace_t@PROD_LINK on SUBSTR(prod_trace_t.ACCEPT_NO,0,8) = group_no.GROUP_NO\n" +
"where task.TASK_STATE_ID = #{process} \n" +
"and prod_trace_t.ACCEPT_NO NOT IN (select SPECIAL_CARD.ACCEPT_NO from SPECIAL_CARD) group by task.submit_date, task.task_id, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, COUNTY_DIC.COUNTY_CODE, \n" +
"COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT, group_no.INVALID_COUNT, group_no.SPECIAL_CARD_COUNT, group_no.GROUP_NO, \n" +
"nvl(fc.faileCount,0) order by group_no.GROUP_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_common2(@Param("process") long process);
/**
* 循环单查询
* 辅助库 快证
* @param process 工序
* @return
*/
@Select("select SPECIAL_CARD.task_id,'快证' CARD_TYPE,'1' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO, nvl(fc.faileCount,0) faileCount\n" +
@Select("select task.submit_date, SPECIAL_CARD.task_id,'快证' CARD_TYPE,'1' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount\n" +
"from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID = #{process}")
"where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID = #{process} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_fast(@Param("process") long process);
/**
* 循环单查询
* 辅助库、制证库 快证
* @param process 工序
* @return
*/
@Select("select DISTINCT sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,task.submit_date, SPECIAL_CARD.task_id,'快证' CARD_TYPE,'1' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
"SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount\n" +
"from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"left join prod_trace_t@PROD_LINK on prod_trace_t.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO\n" +
"left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD \n" +
"group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID =#{process}\n" +
"group by task.submit_date, SPECIAL_CARD.task_id, '快证', '1', COUNTY_DIC.COUNTY_CODE, \n" +
"COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, \n" +
"nvl(fc.faileCount,0) order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_fast2(@Param("process") long process);
/**
* 循环单查询
* 辅助库 余证
* @param process 工序
* @return
*/
@Select("select SPECIAL_CARD.task_id,'余证' CARD_TYPE,'99' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO, nvl(fc.faileCount,0) faileCount\n" +
@Select("select task.submit_date, SPECIAL_CARD.task_id,'余证' CARD_TYPE,'99' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount\n" +
"from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =1 and task.TASK_STATE_ID = #{process}")
"where SPECIAL_CARD.SPECIAL_TYPE =1 and task.TASK_STATE_ID = #{process} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind(@Param("process") long process);
/**
* 循环单查询
* 辅助库、制证库 余证
* @param process 工序
* @return
*/
@Select("select DISTINCT sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,task.submit_date, SPECIAL_CARD.task_id,'余证' CARD_TYPE,'1' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
"SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount\n" +
"from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"left join prod_trace_t@PROD_LINK on prod_trace_t.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO\n" +
"left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD \n" +
"group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID =#{process} " +
"group by task.submit_date, SPECIAL_CARD.task_id, '余证', '1', COUNTY_DIC.COUNTY_CODE, \n" +
"COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, \n" +
"nvl(fc.faileCount,0) order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind2(@Param("process") long process);
/**
......@@ -221,8 +285,8 @@ public interface TaskListMapper {
* @param taskId
* @return
*/
@Update("UPDATE TASK SET TASK_STATE_ID=#{process},PRINT_OUT_NAME=#{name} WHERE TASK_ID = #{taskId} ")
public boolean updateState2(@Param("taskId") String taskId,@Param("process") String process,@Param("name") String name);
@Update("UPDATE TASK SET TASK_STATE_ID=#{process},PRINT_OUT_NAME=#{name},PRINTER_ID =#{printer} WHERE TASK_ID = #{taskId} ")
public boolean updateState2(@Param("taskId") String taskId,@Param("process") String process,@Param("name") String name,@Param("printer") long printer);
/**
*更改任务单状态
......
src/main/java/com/yxproject/start/service/SpecialCardService.java
View file @ d96a2ffc
......@@ -3,6 +3,7 @@ package com.yxproject.start.service;
import com.yxproject.start.entity.SpecialCardEntity;
import java.util.List;
import java.util.Map;
/**
* @auther zhangyusheng
......@@ -12,4 +13,5 @@ public interface SpecialCardService {
public boolean saveSpecialCard(SpecialCardEntity specialCardEntity);
public List<SpecialCardEntity> selectSpecialCardAtSpecialCard(String acceptNo);
public boolean updateSpecialCardSpecialType(SpecialCardEntity specialCardEntity);
public List<Map> selectSpecialCardByGroupNo(String groupNo);
}
src/main/java/com/yxproject/start/service/TaskListService.java
View file @ d96a2ffc
......@@ -21,12 +21,18 @@ public interface TaskListService {
public boolean updateState(List<String> list,String process,String name);
public boolean updateState2(List<String> list,String process,String name,long printer);
public List<Object> selectByCountyAtACCU(String date);
public Map<String ,Object> selectByGroupNoAtACCU(String date, String typeCode, String countyCode,long currPage, long pageSize);
public List<Object> selectByCountyAtAuxiliary(long process);
public Map selectByCountyAtAuxiliary2(long process);
public List<Object> selectByCountyAtAuxiliary3(long process);
public List<Object> selectGroupAtACCU(String date,String typeCode,String countyCode);
public List<Object> selectGroupAtACCU(String groupNo);
......
src/main/java/com/yxproject/start/service/impl/SpecialCardServiceImpl.java
View file @ d96a2ffc
......@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* @auther zhangyusheng
......@@ -47,4 +48,15 @@ public class SpecialCardServiceImpl implements SpecialCardService {
public boolean updateSpecialCardSpecialType(SpecialCardEntity specialCardEntity) {
return specialCardMapper.updateSpecialCardSpecialType(specialCardEntity);
}
/**
* 查询特殊证件详情
* @param groupNo
* @return
*/
@Override
public List<Map> selectSpecialCardByGroupNo(String groupNo) {
return specialCardMapper.selectSpecialCardByGroupNo(groupNo);
}
}
src/main/resources/static/dialogs/specailCardInfo.html 0 → 100644
View file @ d96a2ffc
<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 @ d96a2ffc
......@@ -342,6 +342,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(county)){
county = -1;
}
if(date==""){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(newPackageName,idCard,date,county)
$http({
method: 'GET',
......@@ -366,6 +369,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(county)){
county = -1;
}
if(date==""){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(newPackageName,idCard,date,county)
$http({
method: 'GET',
......@@ -493,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',
......@@ -528,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({
......@@ -538,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 @ d96a2ffc
......@@ -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 @ d96a2ffc
......@@ -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 @ d96a2ffc
......@@ -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 @ d96a2ffc
......@@ -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 @ d96a2ffc
......@@ -28,8 +28,8 @@
</a>
</li>
<li class="pull-right" style="padding-right: 20px;">
<h5>任务总数:8001</h5>
<h4>余证数:1</h4>
<h5>任务总数:{{cardsTotal}}</h5>
<h4>余证数:{{restCount}}</h4>
</li>
</ul>
</div>
......@@ -37,31 +37,61 @@
<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>
<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" 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.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>
<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 @ d96a2ffc
......@@ -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 @ d96a2ffc
......@@ -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