Skip to content

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

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

parents 4833f3e9 3da5d992
Show whitespace changes
Inline Side-by-side
Showing with 347 additions and 1119 deletions
src/main/java/com/yxproject/start/api/InfoManagementApi.java
View file @ ae25dde9
...@@ -4,7 +4,9 @@ import com.yxproject.start.entity.NewFilesEntity; ...@@ -4,7 +4,9 @@ import com.yxproject.start.entity.NewFilesEntity;
import com.yxproject.start.service.InfoManagementService; import com.yxproject.start.service.InfoManagementService;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.util.List;
...@@ -14,14 +16,58 @@ import java.util.List; ...@@ -14,14 +16,58 @@ import java.util.List;
public class InfoManagementApi { public class InfoManagementApi {
@Autowired @Autowired
private InfoManagementService infoManagementService; private InfoManagementService infoManagementService;
/**
* 按条件查询制证信息数据
* @param beginFileName
* @param endFileName
* @param gajgMc
* @param beginDate
* @param endDate
* @param currPage
* @param pageSize
* @return
*/
@RequestMapping("selectInfoManagement") @RequestMapping("selectInfoManagement")
public List<NewFilesEntity>selectInfoManagement(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate){ public List<NewFilesEntity>selectInfoManagement(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize){
List<NewFilesEntity> resultList = infoManagementService.selectInfoManagement(beginFileName, endFileName, gajgMc, replaceDate(beginDate), replaceDate(endDate)); List<NewFilesEntity> resultList = infoManagementService.selectInfoManagement(beginFileName, endFileName, gajgMc, replaceDate(beginDate), replaceDate(endDate), Long.valueOf(currPage),Long.valueOf(pageSize));
return resultList; return resultList;
} }
/**
* 查询制证信息数据条数
* @param beginFileName
* @param endFileName
* @param gajgMc
* @param beginDate
* @param endDate
* @return
*/
@RequestMapping("selectCount")
public long selectCount(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate){
long count= infoManagementService.count(beginFileName,endFileName,gajgMc,replaceDate(beginDate),replaceDate(endDate));
return count;
}
/**
* 删除制证信息数据
* @param beginFileName
* @param endFileName
* @param gajgMc
* @param beginDate
* @param endDate
* @return
*/
@RequestMapping("deleteInfo")
@Transactional(rollbackFor = Exception.class)
public boolean deleteInfo(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate){
boolean result= infoManagementService.deleteInfo(beginFileName,endFileName,gajgMc,replaceDate(beginDate),replaceDate(endDate));
return result;
}
/** /**
* 去除字符串中中线 * 去除字符串中线
* @param str * @param str
* @return * @return
*/ */
......
src/main/java/com/yxproject/start/api/LogApi.java
View file @ ae25dde9
...@@ -105,7 +105,6 @@ public class LogApi { ...@@ -105,7 +105,6 @@ public class LogApi {
@RequestMapping("analysis") @RequestMapping("analysis")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean analysis(@RequestParam("printDate")String printDate,@RequestParam("latticeMouthInformation")String latticeMouthInformation){ public boolean analysis(@RequestParam("printDate")String printDate,@RequestParam("latticeMouthInformation")String latticeMouthInformation){
System.out.println("时间："+printDate);
logService.changeCardType(replaceDate(printDate),latticeMouthInformation); logService.changeCardType(replaceDate(printDate),latticeMouthInformation);
logService.insertAnalysisDate(replaceDate(printDate),latticeMouthInformation); logService.insertAnalysisDate(replaceDate(printDate),latticeMouthInformation);
return true; return true;
......
src/main/java/com/yxproject/start/api/ReceiptApi.java
View file @ ae25dde9
...@@ -42,15 +42,16 @@ public class ReceiptApi { ...@@ -42,15 +42,16 @@ public class ReceiptApi {
if (countAccept == 0) { if (countAccept == 0) {
//查询特证交接单所需数据 //查询特证交接单所需数据
Map<String, Object> resultDate = receiptService.selectReceiptListDate(id); Map<String, Object> resultDate = receiptService.selectReceiptListDate(id);
System.out.println("111111111111111111111111resultDate"+resultDate);
String acceptNo = (String) resultDate.get("ACCEPT_NO"); String acceptNo = (String) resultDate.get("ACCEPT_NO");
String GAJG_DM = (String) resultDate.get("GAJG_DM"); String GAJG_DM = (String) resultDate.get("GAJG_DM");
String GAJG_MC = (String) resultDate.get("GAJG_MC"); int cardType = (int) resultDate.get("CARD_TYPE");
String cardType = (String) resultDate.get("CARD_TYPE"); int oldCardType = (int) resultDate.get("OLD_CARD_TYPE");
String oldCardType = (String) resultDate.get("OLD_CARD_TYPE");
int state = 0; int state = 0;
int count = (int) resultDate.get("COUNT"); int count = (int) resultDate.get("COUNT");
//生成特证交接单 //生成特证交接单
receiptService.createReceiptList(acceptNo, GAJG_DM, count, state,cardType,oldCardType,GAJG_MC); receiptService.createReceiptList(acceptNo, GAJG_DM, count, state,cardType,oldCardType);
//查询特证详单所需数据 //查询特证详单所需数据
Map<String, Object> detailedData = receiptService.selectDetailedData(id); Map<String, Object> detailedData = receiptService.selectDetailedData(id);
String uploadNo = (String) detailedData.get("UPLOAD_NO"); String uploadNo = (String) detailedData.get("UPLOAD_NO");
...@@ -71,17 +72,17 @@ public class ReceiptApi { ...@@ -71,17 +72,17 @@ public class ReceiptApi {
System.out.println("111111111111111111111"+receiptListDate); System.out.println("111111111111111111111"+receiptListDate);
String groupNo = (String) receiptListDate.get("GROUP_NO"); String groupNo = (String) receiptListDate.get("GROUP_NO");
String GAJG_DM = (String) receiptListDate.get("GAJG_DM"); String GAJG_DM = (String) receiptListDate.get("GAJG_DM");
String GAJG_MC = (String) receiptListDate.get("GAJG_MC"); int cardType = (int) receiptListDate.get("CARD_TYPE");
String cardType = (String) receiptListDate.get("CARD_TYPE"); int oldCardType = (int) receiptListDate.get("OLD_CARD_TYPE");
String oldCardType = (String) receiptListDate.get("OLD_CARD_TYPE");
int count = Integer.valueOf(receiptListDate.get("VALID_COUNT").toString()); int count = Integer.valueOf(receiptListDate.get("VALID_COUNT").toString());
int state = 0; int state = 0;
//查询这个组号是否生成了交接单 //查询这个组号是否生成了交接单
int countGroup = receiptService.selectByGroupNo(groupNo); int countGroup = receiptService.selectByGroupNo(groupNo);
System.out.println("222222222222222countGroup"+countGroup);
//没有生成交接单 //没有生成交接单
if (countGroup == 0) { if (countGroup == 0) {
//生成交接单 //生成交接单
receiptService.createReceiptList(groupNo, GAJG_DM, count, state,cardType,oldCardType,GAJG_MC); receiptService.createReceiptList(groupNo,GAJG_DM,count,state,cardType,oldCardType);
//查询这个身份证是否生成了详单 //查询这个身份证是否生成了详单
int receiptCount = receiptService.selectReceiptById(id); int receiptCount = receiptService.selectReceiptById(id);
//没有生成交接单详单 //没有生成交接单详单
......
src/main/java/com/yxproject/start/mapper/InfoManagementMapper.java
View file @ ae25dde9
package com.yxproject.start.mapper; package com.yxproject.start.mapper;
import com.yxproject.start.entity.NewFilesEntity; import com.yxproject.start.entity.NewFilesEntity;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
...@@ -10,9 +11,31 @@ import java.util.Map; ...@@ -10,9 +11,31 @@ import java.util.Map;
@Mapper @Mapper
public interface InfoManagementMapper { public interface InfoManagementMapper {
@Select("<script> " +
"SELECT * FROM " +
" ( " +
"SELECT A.*, ROWNUM RN " +
"FROM (select * from new_files \n" +
"where 1=1\n" +
"<if test='beginFileName != \"\" '>" +
"and (NEW_FILE_NAME between(#{beginFileName})and (#{endFileName}))\n" +
"</if>" +
"<if test='gajgMc != \"\" '>" +
"and DWMC=#{gajgMc}\n" +
"</if>" +
"<if test='beginDate != \"\" '>" +
"and (subStr(CREATE_DATE,0,8) between(#{beginDate})and(#{endDate}))"+
"</if>" +
") " +
"A" +
")" +
"WHERE RN BETWEEN #{end} AND #{begin}" +
"</script>")
public List<NewFilesEntity> selectInfoManagement(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate, @Param("begin") long begin, @Param("end") long end);
@Select("<script> " + @Select("<script> " +
"select * from new_files \n" + "SELECT COUNT(*) FROM NEW_FILES \n" +
"where 1=1\n" + "where 1=1\n" +
"<if test='beginFileName != \"\" '>" + "<if test='beginFileName != \"\" '>" +
"and (NEW_FILE_NAME between(#{beginFileName})and (#{endFileName}))\n" + "and (NEW_FILE_NAME between(#{beginFileName})and (#{endFileName}))\n" +
...@@ -24,5 +47,26 @@ public interface InfoManagementMapper { ...@@ -24,5 +47,26 @@ public interface InfoManagementMapper {
"and (subStr(CREATE_DATE,0,8) between(#{beginDate})and(#{endDate}))"+ "and (subStr(CREATE_DATE,0,8) between(#{beginDate})and(#{endDate}))"+
"</if>" + "</if>" +
"</script>") "</script>")
public List<NewFilesEntity> selectInfoManagement(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate); public long count(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate);
@Delete("<script> " +
"delete from PREPRO_PERSON \n" +
"where PREPRO_PERSON.NEW_FILE_ID IN (\n" +
"select NEW_FILES.ID from new_files \n" +
"where 1=1\n" +
"<if test='beginFileName != \"\" '>" +
"and (NEW_FILE_NAME between(#{beginFileName})and (#{endFileName}))\n" +
"</if>" +
"<if test='gajgMc != \"\" '>" +
"and DWMC=#{gajgMc}\n" +
"</if>" +
"<if test='beginDate != \"\" '>" +
"and (subStr(CREATE_DATE,0,8) between(#{beginDate})and(#{endDate})))"+
"</if>" +
" </script>")
public boolean deleteInfo(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate);
} }
src/main/java/com/yxproject/start/mapper/PersonPostMapper.java
View file @ ae25dde9
...@@ -97,6 +97,7 @@ public interface PersonPostMapper { ...@@ -97,6 +97,7 @@ public interface PersonPostMapper {
@Select("SELECT count(*) FROM FILE_NAME_DIC a LEFT JOIN PERSON_POST b on a.FILE_ID=b.FILE_ID WHERE substr(a.UPLOAD_DATE,0,8)=#{date} AND b.PRINT_DATE IS NULL") @Select("SELECT count(*) FROM FILE_NAME_DIC a LEFT JOIN PERSON_POST b on a.FILE_ID=b.FILE_ID WHERE substr(a.UPLOAD_DATE,0,8)=#{date} AND b.PRINT_DATE IS NULL")
public int selectPersonalDataCountByImportDate(@Param("date")String date); public int selectPersonalDataCountByImportDate(@Param("date")String date);
@Select("<script> " + @Select("<script> " +
"SELECT PERSON_POST.*" + "SELECT PERSON_POST.*" +
" FROM PERSON_POST " + " FROM PERSON_POST " +
......
src/main/java/com/yxproject/start/mapper/ReceiptMapper.java
View file @ ae25dde9
...@@ -27,7 +27,7 @@ public interface ReceiptMapper { ...@@ -27,7 +27,7 @@ public interface ReceiptMapper {
//生成交接单 //生成交接单
@Insert("INSERT INTO RECEIPT_LIST(QR_CODE,POLICE_CODE,FINISH_COUNT,STATE,CARD_TYPE_ID,OLD_CARD_TYPE_ID)VALUES(#{GROUP_NO},#{GAJG_DM},#{count},#{state},#{cardType},#{oldCardType})") @Insert("INSERT INTO RECEIPT_LIST(QR_CODE,POLICE_CODE,FINISH_COUNT,STATE,CARD_TYPE_ID,OLD_CARD_TYPE_ID)VALUES(#{GROUP_NO},#{GAJG_DM},#{count},#{state},#{cardType},#{oldCardType})")
public boolean createReceiptList(@Param("GROUP_NO")String GROUP_NO,@Param("GAJG_DM")String GAJG_DM,@Param("count")int count,@Param("state")int state,@Param("cardType")String cardType,@Param("oldCardType")String oldCardType,@Param("GAJG_MC")String GAJG_MC); public boolean createReceiptList(@Param("GROUP_NO")String GROUP_NO,@Param("GAJG_DM")String GAJG_DM,@Param("count")int count,@Param("state")int state,@Param("cardType")int cardType,@Param("oldCardType")int oldCardType);
...@@ -53,21 +53,21 @@ public interface ReceiptMapper { ...@@ -53,21 +53,21 @@ public interface ReceiptMapper {
//根据组号查询特证表 //根据组号查询特证表
@Select("SELECT count(*) FROM SPECIAL_CARD WHERE subStr(ACCEPT_NO,0,8) =#{GROUP_NO}") @Select("SELECT count(*) FROM SPECIAL_CARD WHERE subStr(ACCEPT_NO,0,8) =#{GROUP_NO}")
public int selectSpecialCard(String GROUP_NO); public int selectSpecialCard(@Param("GROUP_NO") String GROUP_NO);
@Select("select FINISH_COUNT from RECEIPT_LIST where QR_CODE=#{GROUP_NO}") @Select("select FINISH_COUNT from RECEIPT_LIST where QR_CODE=#{GROUP_NO}")
public int selectCount(String GROUP_NO); public int selectCount(@Param("GROUP_NO") String GROUP_NO);
@Update("update RECEIPT_LIST set FINISH_COUNT=#{count} where QR_CODE=#{GROUP_NO}") @Update("update RECEIPT_LIST set FINISH_COUNT=#{count} where QR_CODE=#{GROUP_NO}")
public boolean updateFinishCount(String GROUP_NO,int count); public boolean updateFinishCount(@Param("GROUP_NO") String GROUP_NO,@Param("count") int count);
//根据身份证号查询特证表count //根据身份证号查询特证表count
@Select("select count(*) from SPECIAL_CARD \n" + @Select("select count(*) from SPECIAL_CARD \n" +
"left join prod_card_t@prod_link on special_card.accept_no = prod_card_t.accept_no\n" + "left join prod_card_t@prod_link on special_card.accept_no = prod_card_t.accept_no\n" +
"where prod_card_t.id_no = #{id}") "where prod_card_t.id_no = #{id}")
public int selectSpecialCardByAcceptNo(String id); public int selectSpecialCardByAcceptNo(@Param("id") String id);
...@@ -79,7 +79,7 @@ public interface ReceiptMapper { ...@@ -79,7 +79,7 @@ public interface ReceiptMapper {
@Select("SELECT RECEIPT_LIST.* FROM RECEIPT_LIST \n" + @Select("SELECT RECEIPT_LIST.* FROM RECEIPT_LIST \n" +
"LEFT JOIN PROD_CARD_T@PROD_LINK ON subStr(PROD_CARD_T.ACCEPT_NO,0,8) =RECEIPT_LIST.QR_CODE\n" + "LEFT JOIN PROD_CARD_T@PROD_LINK ON subStr(PROD_CARD_T.ACCEPT_NO,0,8) =RECEIPT_LIST.QR_CODE\n" +
"WHERE PROD_CARD_T.ID_NO =#{id}") "WHERE PROD_CARD_T.ID_NO =#{id}")
public Map<String,Object> selectReceiptList(String id); public Map<String,Object> selectReceiptList(@Param("id") String id);
//根据交接单号查详单信息 //根据交接单号查详单信息
...@@ -125,7 +125,7 @@ public interface ReceiptMapper { ...@@ -125,7 +125,7 @@ public interface ReceiptMapper {
"count(prod_trace_t.ELECTRIC_WRITER_NO)as electricCount\n" + "count(prod_trace_t.ELECTRIC_WRITER_NO)as electricCount\n" +
"from prod_trace_t@PROD_LINK \n" + "from prod_trace_t@PROD_LINK \n" +
"WHERE subStr(ACCEPT_NO,0,8) = #{groupNo} or ACCEPT_NO=#{groupNo}") "WHERE subStr(ACCEPT_NO,0,8) = #{groupNo} or ACCEPT_NO=#{groupNo}")
public Map<String,Object> selectCountTime(String groupNo); public Map<String,Object> selectCountTime(@Param("groupNo") String groupNo);
@Select("select \n" + @Select("select \n" +
"prod_trace_t.DOWNLOAD_DATE as downloadDate,\n" + "prod_trace_t.DOWNLOAD_DATE as downloadDate,\n" +
......
src/main/java/com/yxproject/start/service/InfoManagementService.java
View file @ ae25dde9
...@@ -6,5 +6,10 @@ import org.apache.ibatis.annotations.Param; ...@@ -6,5 +6,10 @@ import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
public interface InfoManagementService { public interface InfoManagementService {
public List<NewFilesEntity> selectInfoManagement(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate); public List<NewFilesEntity> selectInfoManagement(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate,@Param("begin")long begin,@Param("end")long end);
public long count(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate);
public boolean deleteInfo(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate);
} }
src/main/java/com/yxproject/start/service/ReceiptService.java
View file @ ae25dde9
...@@ -10,7 +10,7 @@ public interface ReceiptService { ...@@ -10,7 +10,7 @@ public interface ReceiptService {
public Map<String,Object> selectReceiptListDate(String id); public Map<String,Object> selectReceiptListDate(String id);
public boolean createReceiptList(@Param("GROUP_NO")String GROUP_NO, @Param("GAJG_DM")String GAJG_DM, @Param("count")int count,@Param("state")int state,@Param("cardType")String cardType,@Param("oldCardType")String oldCardType,@Param("GAJG_MC")String GAJG_MC); public boolean createReceiptList(@Param("GROUP_NO")String GROUP_NO, @Param("GAJG_DM")String GAJG_DM, @Param("count")int count,@Param("state")int state,@Param("cardType")int cardType,@Param("oldCardType")int oldCardType);
public Map<String,Object>selectDetailedData(String id); public Map<String,Object>selectDetailedData(String id);
......
src/main/java/com/yxproject/start/service/impl/InfoManagementServiceImpl.java
View file @ ae25dde9
...@@ -15,10 +15,22 @@ public class InfoManagementServiceImpl implements InfoManagementService { ...@@ -15,10 +15,22 @@ public class InfoManagementServiceImpl implements InfoManagementService {
@Override @Override
public List<NewFilesEntity> selectInfoManagement(String beginFileName, String endFileName, String gajgMc, String beginDate, String endDate) { public List<NewFilesEntity> selectInfoManagement(String beginFileName, String endFileName, String gajgMc, String beginDate, String endDate,long currPage,long pageSize) {
List<NewFilesEntity> newFilesEntities = infoManagementMapper.selectInfoManagement(beginFileName, endFileName, gajgMc, beginDate, endDate); List<NewFilesEntity> newFilesEntities = infoManagementMapper.selectInfoManagement(beginFileName, endFileName, gajgMc, beginDate, endDate,currPage * pageSize,(currPage - 1) * pageSize + 1);
return newFilesEntities; return newFilesEntities;
} }
@Override
public long count(String beginFileName, String endFileName, String gajgMc, String beginDate, String endDate) {
long count= infoManagementMapper.count(beginFileName,endFileName,gajgMc,beginDate,endDate);
return count;
}
@Override
public boolean deleteInfo(String beginFileName, String endFileName, String gajgMc, String beginDate, String endDate) {
infoManagementMapper.deleteInfo(beginFileName,endFileName,gajgMc,beginDate,endDate);
return true;
}
} }
src/main/java/com/yxproject/start/service/impl/ReceiptServiceImpl.java
View file @ ae25dde9
...@@ -19,8 +19,8 @@ public class ReceiptServiceImpl implements ReceiptService { ...@@ -19,8 +19,8 @@ public class ReceiptServiceImpl implements ReceiptService {
} }
@Override @Override
public boolean createReceiptList(String GROUP_NO, String GAJG_DM, int count,int state,String cardType,String oldCardType, String GAJG_MC) { public boolean createReceiptList(String GROUP_NO, String GAJG_DM, int count,int state,int cardType,int oldCardType) {
receiptMapper.createReceiptList(GROUP_NO,GAJG_DM,count,state,cardType,oldCardType,GAJG_MC); receiptMapper.createReceiptList(GROUP_NO,GAJG_DM,count,state,cardType,oldCardType);
return true; return true;
} }
......
src/main/resources/static/dialogs/confirmDeleteProdCards.html 0 → 100644
View file @ ae25dde9
<div class="ui-dialog-title">
提示
</div>
<div class="ui-dialog-content">
<div>确认删除{{startDate}}到{{endDate}}导入的{{total}}条记录吗？</div>
</div>
<div class="ui-dialog-confirm">
<button type="submit" class="btn btn-info" ng-click="confirmDelete()">确认删除</button>
<button type="submit" class="btn btn-danger" ng-click="closeThisDialog()">取消</button>
</div>
src/main/resources/static/js/service.js
View file @ ae25dde9
...@@ -276,21 +276,59 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -276,21 +276,59 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
selectXmlData:function(uploadNo,idCard,name,packageNo,importDate, selectXmlData:function(startPackageNo,endPackageNo,pcs_name,startDate,endDate,currPage,pageSize,success){
typeCode,packageType,orderStartDate,orderEndDate,success){
$http({ $http({
method: 'GET', method: 'GET',
url: "../selectDetailedInformation/selectDetailedInfo"+urlTimeStamp(), url: "../InfoManagementApi/selectInfoManagement"+urlTimeStamp(),
params:{ params:{
uploadNo:uploadNo, beginFileName:startPackageNo,
idCard:idCard, endFileName:endPackageNo,
name:name, gajgMc:pcs_name,
packageNo:packageNo, beginDate:startDate,
readDate:importDate, endDate:endDate,
cardType:typeCode, currPage:currPage,
packageType:packageType, pageSize:pageSize
startDate:orderStartDate, }
endDate:orderEndDate }).then(function successCallback(response) {
success(response.data)
})
},
selectXmlDataCount:function (startPackageNo,endPackageNo,pcs_name,startDate,endDate,success) {
$http({
method: 'GET',
url: "../InfoManagementApi/selectCount"+urlTimeStamp(),
params:{
beginFileName:startPackageNo,
endFileName:endPackageNo,
gajgMc:pcs_name,
beginDate:startDate,
endDate:endDate
}
}).then(function successCallback(response) {
success(response.data)
})
},
getPoliceCardsList:function(id,success) {
$http({
method: 'GET',
url: "../ReceiptApi/selectDetailList"+urlTimeStamp(),
params:{
receiptId:id
}
}).then(function successCallback(response) {
success(response.data)
})
},
deleteProdCards:function (startPackageNo,endPackageNo,pcs_name,startDate,endDate,success) {
$http({
method: 'GET',
url: "../InfoManagementApi/deleteInfo"+urlTimeStamp(),
params:{
beginFileName:startPackageNo,
endFileName:endPackageNo,
gajgMc:pcs_name,
beginDate:startDate,
endDate:endDate
} }
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
...@@ -691,7 +729,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -691,7 +729,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
getPoliceListDataNotCheckedData:function(success) { getPoliceListDataNotCheckedData:function(success) {
$http({ $http({
method: 'GET', method: 'GET',
url: "../ReceiptApi/updatePreproPerson"+urlTimeStamp() url: "../ReceiptApi/selectRecriptData"+urlTimeStamp()
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
}) })
...@@ -703,6 +741,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -703,6 +741,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
}) })
},
downloadGAinfoData:function(date,success){
$http({
method: 'GET',
url: "../exportExcel/printExcelData"+urlTimeStamp(),
params:{
date:date
}
}).then(function successCallback(response) {
success(response.data)
})
} }
} }
}); });
\ No newline at end of file
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.html
View file @ ae25dde9
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<td colspan="2"> <td colspan="2">
<div style="text-align: right;"> <div style="text-align: right;">
<button class="btn btn-primary" ng-click="doXmlQuery()">查询</button> <button class="btn btn-primary" ng-click="doXmlQuery()">查询</button>
<button type="submit" class="btn btn-danger" ng-click="downloadXml()">删除</button> <button type="submit" class="btn btn-danger" ng-click="deleteXml()">删除</button>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<div class="box box-default"> <div class="box box-default">
<strong class="box-header with-border">查询结果</strong> <strong class="box-header with-border">查询结果</strong>
<div class="box-info" style="padding: 10px;"> <div class="box-info" style="padding: 10px;">
<table class="table table-bordered table-hover" ng-if="xmlDatas"> <table class="table table-bordered table-hover" ng-if="xmlDatas.length>0">
<thead> <thead>
<tr> <tr>
<th>NO.</th> <th>NO.</th>
...@@ -93,47 +93,20 @@ ...@@ -93,47 +93,20 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr ng-repeat="item in xmlDatas">
<td>1</td> <td>{{$index+1}}</td>
<td>11020</td> <td>{{item.dwdm}}</td>
<td>马连洼派出所</td> <td>{{item.dwmc}}</td>
<td>30</td> <td>{{item.recordNumber}}</td>
<td>2019-03-03 16:30</td> <td>{{item.createDate | myDateFilter}}</td>
<td>11020180227001</td> <td>{{item.newFileName}}</td>
</tr>
<tr>
<td>2</td>
<td>11020</td>
<td>农大南路派出所</td>
<td>30</td>
<td>2019-03-03 16:30</td>
<td>11020180227001</td>
</tr>
<tr>
<td>3</td>
<td>11020</td>
<td>朝阳分局</td>
<td>30</td>
<td>2019-03-03 16:30</td>
<td>11020180227001</td>
</tr>
<tr ng-repeat="item in postData | orderBy:item.id" ng-click="showDetail(item)" style="cursor: pointer;">
<td>{{item.id}}</td>
<td>{{item.ddh}}</td>
<td>{{item.yjh}}</td>
<td>{{item.fxyjh}}</td>
<td>{{item.sbsll}}</td>
<td>{{item.sqrxm}}</td>
<td>{{item.sjrlxfs}}</td>
<td>{{item.sjrdz}}</td>
<td>{{item.printTime | date:"yyyy-MM-dd hh:mm:ss"}}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div style="padding-left: 27%;" ng-if="xmlDatas"> <div style="padding-left: 27%;" ng-if="xmlDatas.length>0">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination> <tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div> </div>
<h4 ng-if="postData.length==0">暂无记录。</h4> <h4 ng-if="xmlDatas.length==0">暂无记录。</h4>
</div> </div>
</div> </div>
</div> </div>
......
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.js
View file @ ae25dde9
...@@ -51,15 +51,87 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http']) ...@@ -51,15 +51,87 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
itemsPerPage: 10, itemsPerPage: 10,
perPageOptions: [10, 20, 30, 40, 50] perPageOptions: [10, 20, 30, 40, 50]
}; };
$scope.paginationConf.totalItems = 50;
$scope.doXmlQuery = function() { $scope.doXmlQuery = function() {
console.log($scope.uploadNo,$scope.idCard,$scope.name,$scope.packageNo,$("#datepicker1").val(),$scope.typeCode,$scope.packageType,$("#datepicker2").val(),$("#datepicker3").val()) var startDate=$("#datepicker1").val();
HttpService.selectXmlData($scope.applicantName,$scope.orderNo,$scope.name,$scope.packageNo,$("#datepicker1").val(), var endDate =$("#datepicker2").val();
$scope.typeCode,$scope.packageType,$("#datepicker2").val(),$("#datepicker3").val(),function(data) { if(angular.isUndefined($scope.startPackageNo)){
$scope.startPackageNo='';
}
if(angular.isUndefined($scope.endPackageNo)){
$scope.endPackageNo='';
}
if(angular.isUndefined($scope.pcs_name)){
$scope.pcs_name='';
}
if(startDate==''){
startDate=$filter("date")(new Date(), "yyyy-MM-dd");
}
if(endDate==''){
endDate=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage)
HttpService.selectXmlDataCount($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,function(data){
$scope.paginationConf.totalItems=data;
console.log($scope.paginationConf.totalItems,"count")
})
HttpService.selectXmlData($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function (data) {
$scope.xmlDatas = data; $scope.xmlDatas = data;
console.log($scope.xmlDatas) console.log($scope.xmlDatas)
}) })
} }
// 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.doXmlQuery);
var reGet = $scope.doXmlQuery;
$scope.deleteXml = function() {
var startDate=$("#datepicker1").val();
var endDate =$("#datepicker2").val();
var startPackageNo = $scope.startPackageNo;
var endPackageNo=$scope.endPackageNo;
var pcs_name=$scope.pcs_name;
if(angular.isUndefined(startPackageNo)){
startPackageNo='';
}
if(angular.isUndefined(endPackageNo)){
endPackageNo='';
}
if(angular.isUndefined(pcs_name)){
pcs_name='';
}
if(startDate==''){
startDate=$filter("date")(new Date(), "yyyy-MM-dd");
}
if(endDate==''){
endDate=$filter("date")(new Date(), "yyyy-MM-dd");
}
ngDialog.open({
template: 'dialogs/confirmDeleteProdCards.html' + urlTimeStamp(),
width: 600,
cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.startDate = startDate;
$scope.endDate = endDate;
HttpService.selectXmlDataCount(startPackageNo,endPackageNo,pcs_name,startDate,endDate,function(data){
$scope.total=data;
console.log($scope.total,"count")
})
$scope.confirmDelete = function () {
HttpService.deleteProdCards(startPackageNo,endPackageNo,pcs_name,startDate,endDate, function (data) {
if(data){
MessageService.showAlert("删除成功");
$scope.closeThisDialog();
reGet();
}else{
MessageService.showAlert("删除失败")
}
})
};
}]
});
}
}); });
\ No newline at end of file
src/main/resources/static/views/receitp/receitp.html
View file @ ae25dde9
...@@ -153,7 +153,8 @@ ...@@ -153,7 +153,8 @@
<div class="box-footer"> <div class="box-footer">
<div class="pull-right" style="margin-left: 10px;"> <div class="pull-right" style="margin-left: 10px;">
<button class="btn btn-primary" ng-click="goes()">生成交接单</button> <button class="btn btn-primary" ng-click="printReceitp()">打印交接单</button>
<button class="btn btn-primary" ng-click="downloadGAinfo()">下载公安网反馈信息</button>
</div> </div>
</div> </div>
</div> </div>
......
src/main/resources/static/views/receitp/receitp.js
View file @ ae25dde9
...@@ -22,5 +22,13 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http']) ...@@ -22,5 +22,13 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.downloadGAinfo = function(){
var date = $("#datepicker").val();
var url = "../exportExcel/printExcelData?date="+date;
var a = document.createElement("a");
document.body.appendChild(a);
a.href = encodeURI(url);
a.click();
}
}); });
\ No newline at end of file
src/main/resources/static/views/tagPrint/tagPrint.html
View file @ ae25dde9
...@@ -38,9 +38,9 @@ ...@@ -38,9 +38,9 @@
<div class="box-header with-border"> <div class="box-header with-border">
<strong >详情信息</strong> <strong >详情信息</strong>
</div> </div>
<div class="box-body no-padding col-md-12"> <div class="box-body col-md-12">
<div class="col-md-5" style="padding-right: 0px;" > <div class="col-md-5" style="padding:0" >
<table class="table table-bordered table-hover postTable "> <table class="table table-bordered table-hover postTable" ng-if="tagPrintData.length>0">
<thead> <thead>
<tr> <tr>
<th>NO.</th> <th>NO.</th>
...@@ -53,45 +53,23 @@ ...@@ -53,45 +53,23 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-click="showDetail(1)"> <tr ng-click="showDetail(item.ID)" ng-repeat="item in tagPrintData">
<td>1</td> <td>{{$index+1}}</td>
<td>110021</td> <td>{{item.POLICE_CODE}}</td>
<td>东城派出所</td> <td>{{item.POLICE_NAME}}</td>
<td>2</td> <td>{{item.download}}</td>
<td>2</td> <td>{{item.electricCount}}</td>
<td>0</td> <td ng-if="item.STATE==0">未复核</td>
<td></td> <td></td>
</tr>
<tr ng-click="showDetail(2)">
<td>2</td>
<td>110021</td>
<td>东城派出所</td>
<td>3</td>
<td>3</td>
<td>3</td>
<td></td> <td></td>
</tr> </tr>
<tr ng-repeat="item in postMsgDetail">
<td>
<input ng-if="$index==0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)" checked="checked">
<input ng-if="$index!=0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)">
</td>
<td>{{item.id}}</td>
<td>{{item.ddh}}</td>
<td>{{item.yjh}}</td>
<td>{{item.fxyjh}}</td>
<td>{{item.sbsll}}</td>
<td>{{item.sjrxm}}</td>
<td>{{item.sjrlxfs}}</td>
<td>{{item.sjrdz}}</td>
<td>{{item.sqrxm}}</td>
<td>{{item.printTime | date:'yyyy-MM-dd hh:mm:ss'}}</td>
</tr>
</tbody> </tbody>
</table> </table>
<h4 class="col-md-7" ng-if="tagPrintData.length==0" style="padding: 0;">
暂无数据
</h4>
</div> </div>
<div class="col-md-7" style="" ng-if="policeCardsList"> <div class="col-md-7" ng-if="json.policeCardsList.length>0">
<table class="table table-bordered"> <table class="table table-bordered">
<thead> <thead>
<tr> <tr>
...@@ -105,7 +83,7 @@ ...@@ -105,7 +83,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="item in policeCardsList"> <tr ng-repeat="item in json.policeCardsList">
<td>{{$index+1}}</td> <td>{{$index+1}}</td>
<td>{{item.acceptNo}}</td> <td>{{item.acceptNo}}</td>
<td>{{item.username}}</td> <td>{{item.username}}</td>
...@@ -130,15 +108,14 @@ ...@@ -130,15 +108,14 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div class="box-footer clearfix" style="border: 0;">
<button class="btn btn-success pull-right" style="margin-right: 20px;" ng-click="checkSame(json.id)">复核一致</button>
<button class="btn btn-info pull-right" style="margin-right: 20px;">打印标签</button>
</div> </div>
</div> </div>
<div class="box-footer clearfix"> <h4 class="col-md-7" ng-if="json.policeCardsList.length==0">
<button class="btn btn-success pull-right " 暂无数据
style="margin-right: 20px;">复核一致 </h4>
</button>
<button class="btn btn-info pull-right"
style="margin-right: 20px;">打印标签
</button>
</div> </div>
</div> </div>
</div> </div>
......
src/main/resources/static/views/tagPrint/tagPrint.js
View file @ ae25dde9
...@@ -30,996 +30,14 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin ...@@ -30,996 +30,14 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
}; };
$scope.paginationConf.totalItems = 50; $scope.paginationConf.totalItems = 50;
$scope.showDetail = function(index){ $scope.showDetail = function(id){
if(index==1){ $scope.json={
$scope.policeCardsList = [ id:id
{
acceptNo:'E000201',
username:'伯阳',
idCard:'130133199605250012',
qfjg:'成寿寺派出所',
isPrint:0,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
} }
] HttpService.getPoliceCardsList(id,function(data) {
}else{ $scope.json.policeCardsList = data;
$scope.policeCardsList=[ console.log($scope.json)
{ })
acceptNo:'E000201',
username:'伯阳',
idCard:'130133199605250012',
qfjg:'成寿寺派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
]
}
} }
var getPoliceListDataNotChecked = function () { var getPoliceListDataNotChecked = function () {
...@@ -1028,16 +46,24 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin ...@@ -1028,16 +46,24 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
console.log($scope.tagPrintData) console.log($scope.tagPrintData)
}) })
} }
getPoliceListDataNotChecked();
$scope.searchTagPrintData = function(){ $scope.searchTagPrintData = function(){
HttpService.selectTagPrintData($scope.idCard,function(data){ HttpService.selectTagPrintData($scope.idCard,function(data){
if(!data){ console.log(data)
MessageService.showAlert("生成交接单成功") if(data){
} getPoliceListDataNotChecked();
}else{
MessageService.showAlert("生成交接单失败")
getPoliceListDataNotChecked(); getPoliceListDataNotChecked();
}
}) })
} }
$scope.checkSame = function () {
}
}); });
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