Skip to content

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

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

parents 220e4483 c3a36df0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 360 additions and 101 deletions
src/main/java/com/yxproject/start/api/ExportExcelApi.java
View file @ 5fb35658
package com.yxproject.start.api;
import com.yxproject.start.service.DetailReceiptListService;
import com.yxproject.start.service.ReceiptService;
import com.yxproject.start.utils.ExportExcel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
......@@ -9,6 +12,13 @@ import java.util.List;
@RestController
@RequestMapping("exportExcel")
public class ExportExcelApi {
@Autowired
private ReceiptService receiptService;
@Autowired
private DetailReceiptListService detailReceiptListService;
public Byte[] exportExcel(){
return null;
}
......
src/main/java/com/yxproject/start/api/ExportXMLApi.java
View file @ 5fb35658
......@@ -7,6 +7,7 @@ import com.yxproject.start.service.FilesService;
import com.yxproject.start.service.NewFilesService;
import com.yxproject.start.service.PreproPersonService;
import com.yxproject.start.utils.QuerySequenceSercive;
import com.yxproject.start.utils.ZipUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
......@@ -22,6 +23,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.zip.ZipOutputStream;
/**
* @auther zhangyusheng
......@@ -46,16 +48,9 @@ public class ExportXMLApi {
@RequestMapping("printXmlData")
// @RequiresPermissions("userInfo.add")//权限管理;
public byte[] printXmlData(@RequestParam("uploadNo") String uploadNo, @RequestParam("IDCard")String IDCard,@RequestParam("oldFile") String oldFile, @RequestParam("newFile")String newFile, @RequestParam("SSXQDM")String SSXQDM, @RequestParam("cardType")String cardType, @RequestParam("state")String state, @RequestParam("uploadDate")String uploadDate, HttpServletResponse response) {
response.setContentType("application/x-download");
response.setCharacterEncoding("UTF-8");
String dateTime = DateFormatUtils.format(new Date(), "yyyyMMddHH");
//使用Servlet实现文件下载的时候，避免浏览器自动打开文件
String fout = null;
List<PreproPersonEntity> preproPersonEntities = preproPersonService.selectAllPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate));
if (preproPersonEntities.size()>0){
//todo 查询制证数据包信息
//将制证详情详细划分
Map<Long,Object> map = new LinkedHashMap<>();
for (PreproPersonEntity preproPersonEntity:preproPersonEntities){
......@@ -76,9 +71,8 @@ public class ExportXMLApi {
List<PreproPersonEntity> preproPersonEntityList =(List<PreproPersonEntity>)map.get(cardTypeId);
Map<Long,Object> mapFileId = new LinkedHashMap<>();
for (PreproPersonEntity preproPersonEntity:preproPersonEntityList){
if (mapFileId!=null&&mapFileId.containsKey(preproPersonEntity.getFileId())){
List<PreproPersonEntity> preproPersonEntityListFileId = (List<PreproPersonEntity>)map.get(preproPersonEntity.getFileId());
List<PreproPersonEntity> preproPersonEntityListFileId = (List<PreproPersonEntity>)mapFileId.get(preproPersonEntity.getFileId());
preproPersonEntityListFileId.add(preproPersonEntity);
mapFileId.put(preproPersonEntity.getFileId(),preproPersonEntityListFileId);
}else {
......@@ -90,16 +84,17 @@ public class ExportXMLApi {
list.add(mapFileId);
lists.add(list);
}
//TODO
List<String> documentList = new ArrayList<>();
//执行生成XML文件方法
for(List<Map<Long,Object>> mapList :lists){
for (Map<Long,Object> objectMap :mapList){
for (Long fileId :objectMap.keySet()){
List<PreproPersonEntity> preproPersonEntityList =(List<PreproPersonEntity>)map.get(fileId);
List<PreproPersonEntity> preproPersonEntityList =(List<PreproPersonEntity>)objectMap.get(fileId);
int i =0;
List<List> listList = new ArrayList<>();
List list = new ArrayList();
for (PreproPersonEntity preproPersonEntity : preproPersonEntityList){
for (int a= 0;a<preproPersonEntityList.size();a++){
PreproPersonEntity preproPersonEntity = preproPersonEntityList.get(a);
list.add(preproPersonEntity);
i++;
if (i<80){
......@@ -109,6 +104,9 @@ public class ExportXMLApi {
list = new ArrayList();
i=0;
}
if (list.size()>0&&a==preproPersonEntityList.size()-1){
listList.add(list);
}
}
for (List list1 :listList) {
List<PreproPersonEntity> preproPersonEntityList1 = (List<PreproPersonEntity>)list1;
......@@ -116,32 +114,42 @@ public class ExportXMLApi {
FilesEntity filesEntity =filesEntities.get(0);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
filesEntity.setCreateTime(simpleDateFormat.format(new Date()));
String xml = null;
try {
fout = createToMakePackageXML(preproPersonEntityList1, filesEntity, "\\zhang");
} catch (IOException e) {
e.printStackTrace();
}
String outFile = dateTime + "制证数据包";
try {
FileInputStream fis = new FileInputStream(new File(fout));
byte[] b = new byte[fis.available()];
fis.read(b);
fis.close();
response.addHeader("Content-Disposition", "attachment;filename=" + outFile + ".xml");
return b;
} catch (FileNotFoundException e) {
e.printStackTrace();
xml = createToMakePackageXML(preproPersonEntityList1, filesEntity, "\\zhang");
} catch (IOException e) {
e.printStackTrace();
}
documentList.add(xml);
}
}
}
}
// -----制证包数据打包下载
String zipName = "myfile.zip";
response.setContentType("APPLICATION/OCTET-STREAM");
response.setHeader("Content-Disposition","attachment; filename="+zipName);
ZipOutputStream out = null;
try {
out = new ZipOutputStream(response.getOutputStream());
} catch (IOException e) {
e.printStackTrace();
}
try {
for(String document :documentList){
ZipUtils.doCompress(document, out);
response.flushBuffer();
}
} catch (Exception e) {
e.printStackTrace();
}finally{
try {
out.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
......@@ -184,8 +192,8 @@ public class ExportXMLApi {
newFilesEntity.setVersionCode(filesEntity.getVersionCode());
newFilesEntity.setRecordNumber((long)preproPersonEntities.size());
long l = newFilesService.saveNewFiles(newFilesEntity);
newFilesEntity.setNewFileName(simpleDateFormat.format(new Date())+"-"+l);
newFilesService.saveNewFiles(newFilesEntity);
newFilesEntity.setNewFileName(simpleDateFormat.format(new Date())+"-"+newFilesEntity.getId());
newFilesService.updateNewFileName(newFilesEntity);
int NO=1;
for (PreproPersonEntity preproPersonEntity : preproPersonEntities) {
......@@ -242,7 +250,7 @@ public class ExportXMLApi {
preproPersonEntity.setNewFileId(newFilesEntity.getId());
}
preproPersonService.updatePreproPerson_NewFileName(preproPersonEntities);
String files_seq = querySequenceSercive.selectSequenceNextValue("FILES_SEQ");
String files_seq = newFilesEntity.getId()+"";
FileOutputStream fout = null;
try {
FileOutputStream fos = new FileOutputStream("D:\\XML\\" + simpleDateFormat.format(new Date())+"-"+files_seq+ ".xml");
......@@ -261,7 +269,10 @@ public class ExportXMLApi {
}
System.out.println("XML文件生成成功..." + new Date());
return "D:\\XML\\" + simpleDateFormat.format(new Date())+"-"+l+ ".xml";
// return document;
return "D:\\XML\\" + simpleDateFormat.format(new Date())+"-"+files_seq+ ".xml";
}
/**
......
src/main/java/com/yxproject/start/api/TaskListApi.java
View file @ 5fb35658
package com.yxproject.start.api;
import com.yxproject.start.entity.GroupNoEntity;
import com.yxproject.start.entity.PreproPersonEntity;
import com.yxproject.start.entity.SpecialCardEntity;
import com.yxproject.start.entity.TaskEntity;
import com.yxproject.start.entity.*;
import com.yxproject.start.entity.TaskList.CountCountyEntity;
import com.yxproject.start.entity.TaskList.CountGajgEntity;
import com.yxproject.start.entity.TaskList.TaskListEntity;
......@@ -411,6 +408,16 @@ public class TaskListApi {
} else return str;
}
/**
* 查询制证类型列表
*/
@RequestMapping("getTypeList")
public List<CardTypeDicEntity> getTypeList() {
List<CardTypeDicEntity> list = taskListService.getTypeList();
return list;
}
/**
* 去除字符串中中线
*
......
src/main/java/com/yxproject/start/api/queryPreproPerson.java
View file @ 5fb35658
......@@ -37,9 +37,9 @@ public class queryPreproPerson {
int puSum=0;
int invaildCount = 0;
for (Map<String, Object> map1 :preproPersonEntityList){
if ("9".equals(map1.get("CARD_TYPE_ID"))){
if ("9".equals(map1.get("CARD_TYPE_ID")+"")){
youSum++;
}else if ("0".equals(map1.get("CARD_TYPE_ID"))){
}else if ("0".equals(map1.get("CARD_TYPE_ID")+"")){
puSum++;
}
if ("0".equals(map1.get("IS_VALID")+"")){
......
src/main/java/com/yxproject/start/entity/DetailReceiptListEntity.java
View file @ 5fb35658
......@@ -5,7 +5,7 @@ import java.util.Objects;
/**
* @auther zhangyusheng
* 2019/3/10 14:52
* 2019/3/12 11:05
*/
@Entity
@Table(name = "DETAIL_RECEIPT_LIST", schema = "YINGXIN", catalog = "")
......@@ -18,6 +18,7 @@ public class DetailReceiptListEntity {
private String cardId;
private String note;
private String signGovt;
private Long receiptId;
@Id
@Column(name = "ID")
......@@ -99,6 +100,16 @@ public class DetailReceiptListEntity {
this.signGovt = signGovt;
}
@Basic
@Column(name = "RECEIPT_ID")
public Long getReceiptId() {
return receiptId;
}
public void setReceiptId(Long receiptId) {
this.receiptId = receiptId;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
......@@ -111,11 +122,12 @@ public class DetailReceiptListEntity {
Objects.equals(policeCode, that.policeCode) &&
Objects.equals(cardId, that.cardId) &&
Objects.equals(note, that.note) &&
Objects.equals(signGovt, that.signGovt);
Objects.equals(signGovt, that.signGovt) &&
Objects.equals(receiptId, that.receiptId);
}
@Override
public int hashCode() {
return Objects.hash(id, uploadNo, acceptNo, name, policeCode, cardId, note, signGovt);
return Objects.hash(id, uploadNo, acceptNo, name, policeCode, cardId, note, signGovt, receiptId);
}
}
src/main/java/com/yxproject/start/mapper/QuerySequenceMapper.java
View file @ 5fb35658
......@@ -13,6 +13,6 @@ import java.util.Map;
*/
@Mapper
public interface QuerySequenceMapper {
@Select("select #{sequenceName},#{sequenceName} as num2 from dual")
public List<Map<String,Object>> selectSequenceNextValue(@Param("sequenceName") String sequenceName);
@Select("select #{sequenceName} from dual")
public int selectSequenceNextValue(@Param("sequenceName") String sequenceName);
}
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
View file @ 5fb35658
package com.yxproject.start.mapper;
import com.yxproject.start.entity.CardTypeDicEntity;
import com.yxproject.start.entity.TaskEntity;
import com.yxproject.start.entity.TaskList.CountCountyEntity;
import com.yxproject.start.entity.TaskList.TaskListEntity;
......@@ -783,5 +784,10 @@ public interface TaskListMapper {
*/
@Select("select * from task where task_ID = #{taskId}")
public List<TaskEntity> selectTaskEntityByTaskId(long taskId);
/**
* 查询制证类型列表
* @return
*/
@Select("SELECT * FROM CARD_TYPE_DIC")
public List<CardTypeDicEntity> selectTypeList();
}
src/main/java/com/yxproject/start/service/TaskListService.java
View file @ 5fb35658
package com.yxproject.start.service;
import com.yxproject.start.entity.CardTypeDicEntity;
import com.yxproject.start.entity.SpecialCardEntity;
import com.yxproject.start.entity.TaskEntity;
import com.yxproject.start.entity.TaskList.CountCountyEntity;
......@@ -53,4 +54,6 @@ public interface TaskListService {
public List<TaskEntity> selectTaskEntityByTaskId(long taskId);
public boolean saveFastTask(TaskEntity taskEntity);
public List<CardTypeDicEntity> getTypeList();
}
src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java
View file @ 5fb35658
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.CardTypeDicEntity;
import com.yxproject.start.entity.GroupNoEntity;
import com.yxproject.start.entity.SpecialCardEntity;
import com.yxproject.start.entity.TaskEntity;
......@@ -542,6 +543,11 @@ public class TaskListServiceImpl implements TaskListService {
}
@Override
public List<CardTypeDicEntity> getTypeList() {
return taskListMapper.selectTypeList();
}
private String createGroupNo(List<Integer> c, List<Integer> nsList) {
try {
......
src/main/java/com/yxproject/start/utils/QuerySequenceSercive.java
View file @ 5fb35658
......@@ -17,8 +17,16 @@ public class QuerySequenceSercive {
private QuerySequenceMapper querySequenceMapper;
public String selectSequenceNextValue(String sequenceName){
List<Map<String, Object>> mapList = querySequenceMapper.selectSequenceNextValue(sequenceName + ".nextval");
return mapList.get(0).get("NUM2").toString();
// List<Map<String, Object>> mapList = querySequenceMapper.selectSequenceNextValue(sequenceName + ".nextval");
// System.out.println(mapList.get(0)+"--------");
// System.out.println(mapList.get(0).keySet());
// for (String string :mapList.get(0).keySet()){
//
// }
// return mapList.get(0).get("NUM2").toString();
int i = querySequenceMapper.selectSequenceNextValue(sequenceName + ".nextval");
System.out.println(i);
return null;
}
......
src/main/java/com/yxproject/start/utils/ZipUtils.java 0 → 100644
View file @ 5fb35658
package com.yxproject.start.utils;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
/**
* @auther zhangyusheng
* 2019/3/12 12:27
*/
public class ZipUtils {
private ZipUtils(){
}
public static void doCompress(String srcFile, String zipFile) throws IOException {
doCompress(new File(srcFile), new File(zipFile));
}
/**
* 文件压缩
* @param srcFile 目录或者单个文件
* @param zipFile 压缩后的ZIP文件
*/
public static void doCompress(File srcFile, File zipFile) throws IOException {
ZipOutputStream out = null;
try {
out = new ZipOutputStream(new FileOutputStream(zipFile));
doCompress(srcFile, out);
} catch (Exception e) {
throw e;
} finally {
out.close();//记得关闭资源
}
}
public static void doCompress(String filelName, ZipOutputStream out) throws IOException{
doCompress(new File(filelName), out);
}
public static void doCompress(File file, ZipOutputStream out) throws IOException{
doCompress(file, out, "");
}
public static void doCompress(File inFile, ZipOutputStream out, String dir) throws IOException {
if ( inFile.isDirectory() ) {
File[] files = inFile.listFiles();
if (files!=null && files.length>0) {
for (File file : files) {
String name = inFile.getName();
if (!"".equals(dir)) {
name = dir + "/" + name;
}
ZipUtils.doCompress(file, out, name);
}
}
} else {
ZipUtils.doZip(inFile, out, dir);
}
}
public static void doZip(File inFile, ZipOutputStream out, String dir) throws IOException {
String entryName = null;
if (!"".equals(dir)) {
entryName = dir + "/" + inFile.getName();
} else {
entryName = inFile.getName();
}
ZipEntry entry = new ZipEntry(entryName);
out.putNextEntry(entry);
int len = 0 ;
byte[] buffer = new byte[1024];
FileInputStream fis = new FileInputStream(inFile);
while ((len = fis.read(buffer)) > 0) {
out.write(buffer, 0, len);
out.flush();
}
out.closeEntry();
fis.close();
}
}
src/main/resources/static/js/app.js
View file @ 5fb35658
......@@ -103,8 +103,8 @@ angular.module('AvatarCheck', [
if ($location.path() == "/taskListPushing") {
$rootScope.tab = '/taskListPushing';
}
if ($location.path() == "/taskListCutting") {
$rootScope.tab = '/taskListCutting';
if ($location.path() == "/taskListEwriting") {
$rootScope.tab = '/taskListEwriting';
}
if ($location.path() == "/taskListSorting") {
$rootScope.tab = '/taskListSorting';
......@@ -182,9 +182,9 @@ angular.module('AvatarCheck', [
$scope.logout = function(){
HttpService.logout(function(data) {
localStorage.clear();
$location.path('/login')
$rootScope.loginData = {userid:'用户未登录', login:false};
localStorage.clear();
});
}
$scope.enterEvent = function(e,search) {
......
src/main/resources/static/js/service.js
View file @ 5fb35658
......@@ -351,6 +351,8 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
// var arr = [];
// arr.push(json);
// var body = JSON.stringify(arr);
console.log(uploadNo,idCard,oldPackageNo,newPackageNo,sljg,
typeCode,packageType,date,currentPage,itemsPerPage)
$http({
method: 'GET',
url: "../queryPreproPerson/queryPreproPerson",
......@@ -672,6 +674,35 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}).then(function successCallback(response) {
success(response.data)
})
},
updateIsValidData:function(slh,isValid,success){
console.log(slh,isValid)
$http({
method: 'GET',
url: "../queryPreproPerson/updatePreproPerson"+urlTimeStamp(),
params:{
uploadNo:slh,
isValid:isValid
}
}).then(function successCallback(response) {
success(response.data)
})
},
getPoliceListDataNotCheckedData:function(success) {
$http({
method: 'GET',
url: "../ReceiptApi/updatePreproPerson"+urlTimeStamp()
}).then(function successCallback(response) {
success(response.data)
})
},
getTypeList:function(success){
$http({
method: 'GET',
url: "../TaskList/getTypeList"+urlTimeStamp()
}).then(function successCallback(response) {
success(response.data)
})
}
}
});
\ No newline at end of file
src/main/resources/static/views/cardProdPackage/cardProdPackage.html
View file @ 5fb35658
......@@ -48,9 +48,9 @@
<td><input type="text" class="form-control" ng-model="sljg" placeholder="受理机关"></td>
<td>制证类型:</td>
<td style="text-align: left;">
<select class="form-control select2" id="county" data-placeholder="--请选择制证类型--"
style="width: 100%;" ng-model="typeCode">
<option value="{{type.typeCode}}" ng-repeat="type in typeList">{{type.typeName}}</option>
<select class="form-control select2" id="county" ng-model="typeCode">
<option value="">--请选择制证类型--</option>
<option value="{{type.cardTypeId}}" ng-repeat="type in typeList">{{type.cardType}}</option>
</select>
</td>
</tr>
......@@ -103,21 +103,19 @@
</thead>
<tbody>
<tr ng-repeat="item in packageData">
<td>1</td>
<td>411032546565445</td>
<td>张三</td>
<td>130133195608240013</td>
<td>1321454113</td>
<td>1213134556</td>
<td>普通证</td>
<td>
<input type="radio" name="isPackage" value="1" checked>是
<input type="radio" name="isPackage" value="2">否
</td>
<td>{{$index+1}}</td>
<td>{{item.JMSFZSLH}}</td>
<td>{{item.XM}}</td>
<td>{{item.GMSFHM}}</td>
<td>{{item.SOURCE_FILE_NAME}}</td>
<td>{{item.NEW_FILE_NAME}}</td>
<td>{{item.CARD_TYPE}}</td>
<td ng-if="item.IS_VALID==1"><button class="btn btn-primary" ng-click="updateIsValid(item.JMSFZSLH,0)">禁用</button></td>
<td ng-if="item.IS_VALID==0"><button class="btn btn-info" ng-click="updateIsValid(item.JMSFZSLH,1)">启用</button></td>
</tr>
</tbody>
</table>
<p style="color:#9f191f;"><span style="margin-right: 15px;">普通证：3000</span><span style="margin-right: 15px;">邮寄证：2000</span><span>禁用数：2</span></p>
<p style="color:#9f191f;"><span style="margin-right: 15px;">普通证：{{simpleCardCount}}</span><span style="margin-right: 15px;">邮寄证：{{postCardCount}}</span><span>禁用数：{{forbiddenCount}}</span></p>
<div style="padding-left: 27%;">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div>
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.js
View file @ 5fb35658
......@@ -38,6 +38,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
$scope.doPackageQuery=function(){
var date = $("#datepicker").val();
var typeCode = $("#county").val();
var packageType = $("#packageType").val();
if(angular.isUndefined($scope.uploadNo)){
$scope.uploadNo='';
......@@ -54,8 +55,8 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
if(angular.isUndefined($scope.sljg)){
$scope.sljg='';
}
if(angular.isUndefined($scope.typeCode)){
$scope.typeCode='';
if(angular.isUndefined(typeCode)){
typeCode='';
}
if(angular.isUndefined(packageType)){
packageType='';
......@@ -65,10 +66,11 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
HttpService.getPackageData($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg,
$scope.typeCode,packageType,date,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data) {
typeCode,packageType,date,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data) {
$scope.paginationConf.totalItems=data.total;
$scope.simpleCardCount = data.puSum;
$scope.postCardCount = data.youSum;
$scope.forbiddenCount= data.invaildCount;
$scope.packageData = data.list;
console.log(data)
})
......@@ -76,8 +78,72 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
// 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.doPackageQuery);
$scope.downloadXml = function(){
$scope.updateIsValid = function (slh,isValid) {
HttpService.updateIsValidData(slh,isValid,function(data) {
$scope.doPackageQuery();
MessageService.showAlert("更新成功")
})
};
var getCountAndDownloadUrl = function (url) {
var date = $("#datepicker").val();
var packageType = $("#packageType").val();
if(angular.isUndefined($scope.uploadNo)){
url = url + 'uploadNo=' + $scope.uploadNo + '&';
}else{
url = url + 'uploadNo=&';
}
if(angular.isUndefined($scope.idCard)){
url = url + 'IDCard=' + $scope.idCard + '&';
}else{
url = url + 'IDCard=&';
}
if(angular.isUndefined($scope.oldPackageNo)){
url = url + 'oldFile=' + $scope.oldPackageNo + '&';
}else{
url = url + 'oldFile=&';
}
if(angular.isUndefined($scope.newPackageNo)){
url = url + 'newFile=' + $scope.newPackageNo + '&';
}else{
url = url + 'newFile=&';
}
if(angular.isUndefined($scope.sljg)){
url = url + 'SSXQDM=' + $scope.sljg + '&';
}else{
url = url + 'SSXQDM=&';
}
if(angular.isUndefined($scope.typeCode)){
url = url + 'cardType=' + $scope.typeCode + '&';
}else{
url = url + 'cardType=&';
}
if(angular.isUndefined(packageType)){
url = url + 'state=' + packageType + '&';
}else{
url = url + 'state=&';
}
if (date==''){
date=$filter("date")(new Date(), "yyyy-MM-dd");
url = url + 'uploadDate=' + date + '&';
}else{
url = url + 'uploadDate=' + date + '&';
}
return url + 't=' + Math.floor(Date.now());
}
$scope.downloadXml = function(){
var url = '../exportXML/printXmlData?';
var a = document.createElement("a");
document.body.appendChild(a);
a.href = encodeURI(getCountAndDownloadUrl(url));
a.click();
}
var getTypeList = function(){
HttpService.getTypeList(function(data){
$scope.typeList = data;
console.log(data)
})
}
getTypeList();
});
\ No newline at end of file
src/main/resources/static/views/login/login.js
View file @ 5fb35658
......@@ -47,8 +47,8 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
$rootScope.tab = '/taskListSorting';
break;
case 5:
$location.path("/taskListCutting");
$rootScope.tab = '/taskListCutting';
$location.path("/taskListEwriting");
$rootScope.tab = '/taskListEwriting';
break;
case 4:
$location.path("/taskListPushing");
......
src/main/resources/static/views/tagPrint/tagPrint.js
View file @ 5fb35658
......@@ -1022,10 +1022,19 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
}
var getPoliceListDataNotChecked = function () {
HttpService.getPoliceListDataNotCheckedData(function(data){
$scope.tagPrintData = data;
console.log($scope.tagPrintData)
})
}
$scope.searchTagPrintData = function(){
HttpService.selectTagPrintData($scope.idCard,function(data){
$scope.tagPrintData =data;
console.log($scope.tagPrintData)
if(!data){
MessageService.showAlert("生成交接单成功")
}
getPoliceListDataNotChecked();
})
}
......
src/main/resources/static/views/task/taskListCutting.html → src/main/resources/static/views/task/taskListEwriting.html
View file @ 5fb35658
......@@ -44,6 +44,7 @@
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>电写入数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
......@@ -51,15 +52,16 @@
</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 ng-if="task.faileCount==0"><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.saveDate | date:'yyyy-MM-dd'}}</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"></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 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-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
......@@ -68,25 +70,29 @@
<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>
<thead>
<th>组号</th>
<th>派出所名称</th>
<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.GAJG_MC}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.E_WRITER_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>
......
src/main/resources/static/views/task/taskListPreLocating.html
View file @ 5fb35658
......@@ -51,7 +51,7 @@
</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 ng-if="task.faileCount==0"><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.saveDate | date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
......
src/main/resources/static/views/task/taskListPushing.html
View file @ 5fb35658
......@@ -51,7 +51,7 @@
</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 ng-if="task.faileCount==0"><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.saveDate | date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
......
src/main/resources/static/views/task/taskListSorting.html
View file @ 5fb35658
......@@ -49,7 +49,7 @@
</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 ng-if="task.faileCount==0"><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.saveDate| date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
......
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