Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit e9e69313 authored by liuxinben's avatar liuxinben
Browse files
Options

commit

parents d3bd4e7a fcebf23b
Show whitespace changes
Inline Side-by-side
Showing with 102 additions and 49 deletions
src/main/java/com/yxproject/start/api/PersonPostApi.java
View file @ e9e69313
......@@ -202,6 +202,7 @@ public class PersonPostApi {
String applicantName = jsonObject.getString("applicantName");
String orderNumber = jsonObject.getString("orderNumber");
String state = jsonObject.getString("state");
String district = jsonObject.getString("district");
String latticeMouthInformation = jsonObject.getString("latticeMouthInformation");
JSONArray jsonArray = (JSONArray) jsonObject.get("getToCounty");
String startDate = replaceDate(jsonObject.getString("startDate"));
......@@ -209,7 +210,7 @@ public class PersonPostApi {
String emailNo = jsonObject.getString("emailNo");
String notNull = jsonObject.getString("notNull");
String printDate = stripNonDigits(jsonObject.getString("printDate"));
count = personPostService.findPersonalDataCount(applicantName, orderNumber, state, latticeMouthInformation, jsonArray, startDate,endDate, emailNo, notNull,printDate);
count = personPostService.findPersonalDataCount(applicantName, orderNumber, state, district,latticeMouthInformation, jsonArray, startDate,endDate, emailNo, notNull,printDate);
} catch (Exception e) {
logger.error("个人邮寄信息：" + jsonObject);
logger.error("Exception 按条件查询个人邮寄信息异常", e);
......@@ -235,6 +236,7 @@ public class PersonPostApi {
String applicantName = jsonObject.getString("applicantName");
String orderNumber = jsonObject.getString("orderNumber");
String state = jsonObject.getString("state");
String district = jsonObject.getString("district");
String latticeMouthInformation = jsonObject.getString("latticeMouthInformation");
JSONArray jsonArray = (JSONArray) jsonObject.get("getToCounty");
String startDate = replaceDate(jsonObject.getString("startDate"));
......@@ -244,7 +246,7 @@ public class PersonPostApi {
String emailNo = jsonObject.getString("emailNo");
int notNull = Integer.parseInt((jsonObject.getString("notNull")));
String printDate = stripNonDigits(jsonObject.getString("printDate"));
list = personPostService.findPersonalData(applicantName, orderNumber, state, latticeMouthInformation, jsonArray, startDate, endDate, firstIndex, pageSize, emailNo, notNull,printDate);
list = personPostService.findPersonalData(applicantName, orderNumber, state,district, latticeMouthInformation, jsonArray, startDate, endDate, firstIndex, pageSize, emailNo, notNull,printDate);
} catch (Exception e) {
logger.error("个人邮寄信息：" + jsonObject);
logger.error("Exception 按条件查询个人邮寄信息异常", e);
......@@ -320,7 +322,7 @@ public class PersonPostApi {
@RequestMapping("download")
public void exportExcel(HttpServletRequest request, HttpServletResponse response,
@RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate, @RequestParam("hasPrinted") String hasPrinted,
@RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate, @RequestParam("hasPrinted") String hasPrinted,@RequestParam("district") String district,
@RequestParam("djx") List<String> djx, @RequestParam("gkxx") String gkxx, @RequestParam("ddh") String ddh, @RequestParam("notNull") String notNull,
@RequestParam("sequence") String sequence, @RequestParam("sqrxm") String sqrxm, @RequestParam("emailNo") String emailNo,@RequestParam("printDate") String printDate) throws Exception {
String remoteAddr = request.getRemoteAddr();
......@@ -328,7 +330,7 @@ public class PersonPostApi {
JSONArray jsonArray = new JSONArray();
try {
jsonArray = JSONArray.fromObject(djx);
List<PersonPostEntity> list = personPostService.downLoadReportForm(request, response, sqrxm, ddh, hasPrinted, gkxx, jsonArray, replaceDate(startDate),replaceDate(endDate), emailNo,stripNonDigits(printDate),notNull);
List<PersonPostEntity> list = personPostService.downLoadReportForm(request, response, sqrxm, ddh, hasPrinted,district, gkxx, jsonArray, replaceDate(startDate),replaceDate(endDate), emailNo,stripNonDigits(printDate),notNull);
exportExcel(request, response, list);
} catch (Exception e) {
logger.error("上传时间：" + startDate + endDate + "类型普证-0，邮寄-9：" + hasPrinted + "格口信息：" + gkxx + "订单号：" + ddh + "申请人姓名：" + sqrxm + "运单号码：" + emailNo);
......
src/main/java/com/yxproject/start/api/ReceiptApi.java
View file @ e9e69313
......@@ -353,7 +353,7 @@ public class ReceiptApi {
map.put("msg", "交接单生成成功");
}else {
//-------------------已生成交接单-------------------
map.put("msg","交接单已生成，操作人： "+resultProd.get(0).get("CHECK_NAME")+" 日期："+resultProd.get(0).get("CHECK_DATE"));
map.put("msg","封签已生成，操作人： "+resultProd.get(0).get("CHECK_NAME")+" 复核日期："+resultProd.get(0).get("CHECK_DATE"));
//已经生成特证交接单，不做操作。
map.put("show", false);
map.put("state", 2);
......
src/main/java/com/yxproject/start/mapper/DetailReceiptListMapper.java
View file @ e9e69313
......@@ -22,7 +22,7 @@ public interface DetailReceiptListMapper {
*/
@Select("select DETAIL_RECEIPT_LIST.id,DETAIL_RECEIPT_LIST.ACCEPT_NO,DETAIL_RECEIPT_LIST.SIGN_GOVT,DETAIL_RECEIPT_LIST.NAME,DETAIL_RECEIPT_LIST.UPLOAD_NO,\n" +
"DETAIL_RECEIPT_LIST.sex,DETAIL_RECEIPT_LIST.CARD_ID,DETAIL_RECEIPT_LIST.POLICE_CODE,DIC_UPLOAD_UNIT_T.UNIT_NAME POLICE_NAME,to_char(RECEIPT_LIST.CHECK_DATE,'yyyyMMdd') CHECK_DATE,\n" +
"RECEIPT_LIST.CHECK_NAME,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.OLD_CARD_TYPE_ID,PERSON_POST.WAYBILL_NUMBER,DETAIL_RECEIPT_LIST.note,RECEIPT_LIST.QR_CODE \n" +
"RECEIPT_LIST.CHECK_NAME,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.OLD_CARD_TYPE_ID,PERSON_POST.WAYBILL_NUMBER,DETAIL_RECEIPT_LIST.note,RECEIPT_LIST.QR_CODE,DETAIL_RECEIPT_LIST.APPLY_PHONE \n" +
"from DETAIL_RECEIPT_LIST \n" +
"left join RECEIPT_LIST on DETAIL_RECEIPT_LIST.RECEIPT_ID = RECEIPT_LIST.ID\n" +
"left join PERSON_POST on PERSON_POST.FIRST_WHITE = DETAIL_RECEIPT_LIST.UPLOAD_NO\n" +
......
src/main/java/com/yxproject/start/mapper/PersonPostMapper.java
View file @ e9e69313
......@@ -44,6 +44,8 @@ public interface PersonPostMapper {
" <when test='orderNumber!=\"\"'> and PERSON_POST.ORDER_NUMBER=${orderNumber} </when>" +
" <if test='state== 0 '> and PERSON_POST.print_date is null </if>" +
" <if test='state== 1 '> and PERSON_POST.print_date is not null </if>" +
" <when test='district== 1 '> and PERSON_POST.FIRST_WHITE like '110018%' </when>" +
" <when test='district== 0 '> and SUBSTR(PERSON_POST.FIRST_WHITE,0,6) != '110018' </when>" +
" <if test='notNull== 1 '> and PERSON_POST.state1=1 </if>" +
" <if test='notNull== 0 '> and PERSON_POST.state1=0 </if>" +
" <if test='notNull== 3 '> and PERSON_POST.state1=3 </if>" +
......@@ -57,7 +59,7 @@ public interface PersonPostMapper {
"WHERE RN BETWEEN ${pageSize} AND ${firstIndex}" +
" order by rn " +
"</script>")
public List <PersonPostEntity> findAllPersonalData( @Param("applicantName") String applicantName, @Param("orderNumber") String orderNumber, @Param("state") String state, @Param("latticeMouthInformation") String latticeMouthInformation, @Param("getToCounty") String getToCounty, @Param("startDate") String startDate,@Param("endDate") String endDate, @Param("firstIndex") long firstIndex, @Param("pageSize") long pageSize, @Param("emailNo") String emailNo, @Param("notNull") int notNull , @Param("printDate") String printDate);
public List <PersonPostEntity> findAllPersonalData( @Param("applicantName") String applicantName, @Param("orderNumber") String orderNumber, @Param("state") String state,@Param("district") String district, @Param("latticeMouthInformation") String latticeMouthInformation, @Param("getToCounty") String getToCounty, @Param("startDate") String startDate,@Param("endDate") String endDate, @Param("firstIndex") long firstIndex, @Param("pageSize") long pageSize, @Param("emailNo") String emailNo, @Param("notNull") int notNull , @Param("printDate") String printDate);
@Select("select ID,FIRST_WHITE,APPLICANT_NAME,NOTE from person_post where FIRST_WHITE=#{uploadId}")
......@@ -77,6 +79,8 @@ public interface PersonPostMapper {
" <when test='orderNumber!=\"\"'> and PERSON_POST.ORDER_NUMBER=#{orderNumber} </when>" +
" <when test='state== 0 '> and PERSON_POST.print_date is null </when>" +
" <when test='state== 1 '> and PERSON_POST.print_date is not null </when>" +
" <when test='district== 1 '> and PERSON_POST.FIRST_WHITE like '110018%' </when>" +
" <when test='district== 0 '> and SUBSTR(PERSON_POST.FIRST_WHITE,0,6) != '110018' </when>" +
" <if test='notNull== 1 '> and PERSON_POST.state1=1 </if>" +
" <if test='notNull== 0 '> and PERSON_POST.state1=0 </if>" +
" <if test='notNull== 3 '> and PERSON_POST.state1=3 </if>" +
......@@ -86,7 +90,7 @@ public interface PersonPostMapper {
" <when test='printDate!=\"\"'> and to_char(PERSON_POST.print_Date,'yyyyMMdd')=${printDate} </when>" +
" order by PERSON_POST.id " +
"</script>")
public int findPersonalDataCount( @Param("applicantName")String applicantName,@Param("orderNumber") String orderNumber,@Param("state") String state,@Param("latticeMouthInformation") String latticeMouthInformation,@Param("getToCounty") String getToCounty,@Param("startDate") String startDate,@Param("endDate") String endDate, @Param("emailNo")String emailNo,@Param("notNull")String notNull,@Param("printDate")String printDate);
public int findPersonalDataCount( @Param("applicantName")String applicantName,@Param("orderNumber") String orderNumber,@Param("state") String state, @Param("district") String district,@Param("latticeMouthInformation") String latticeMouthInformation,@Param("getToCounty") String getToCounty,@Param("startDate") String startDate,@Param("endDate") String endDate, @Param("emailNo")String emailNo,@Param("notNull")String notNull,@Param("printDate")String printDate);
......@@ -132,6 +136,8 @@ public interface PersonPostMapper {
// " <when test='hasPrinted!=\"\"'> and PERSON_POST.STATE=#{hasPrinted} </when>" +
" <when test='hasPrinted== 0 '> and PERSON_POST.print_date is null </when>" +
" <when test='hasPrinted== 1 '> and PERSON_POST.print_date is not null </when>" +
" <when test='district== 1 '> and PERSON_POST.FIRST_WHITE like '110018%' </when>" +
" <when test='district== 0 '> and SUBSTR(PERSON_POST.FIRST_WHITE,0,6) != '110018' </when>" +
" <when test='gkxx!=\"\"'> and PERSON_POST.LATTICE_MOUTH_INFORMATION=#{gkxx} </when>" +
" <when test='emailNo!=\"\"'> and PERSON_POST.WAYBILL_NUMBER=TO_NUMBER(#{emailNo}) </when>" +
" <when test='str!=\"\"'> and PERSON_POST.GET_TO_COUNTY in ( ${str} ) </when>" +
......@@ -140,7 +146,7 @@ public interface PersonPostMapper {
" <when test='notNull!=\"\"'> and PERSON_POST.state1=${notNull} </when>" +
" order by PERSON_POST.id " +
"</script>")
public List <PersonPostEntity> findAllPersonalDataNoPage( @Param("sqrxm") String sqrxm, @Param("ddh") String ddh, @Param("hasPrinted") String hasPrinted,
public List <PersonPostEntity> findAllPersonalDataNoPage( @Param("sqrxm") String sqrxm, @Param("ddh") String ddh, @Param("hasPrinted") String hasPrinted,@Param("district") String district,
@Param("gkxx") String gkxx, @Param("str") String str, @Param("startDate") String startDate,@Param("endDate") String endDate, @Param("emailNo") String emailNo,@Param("printDate") String printDate,@Param("notNull") String notNull );
@Select("SELECT distinct first_White,applicant_Name,recipient_Name,nature_Of_The_Information,ACCEPT_THE_MATTER " +
......@@ -167,7 +173,7 @@ public interface PersonPostMapper {
"on pp.FILE_ID=fi.id \n" +
"left join COUNTY_DIC cd\n" +
"on substr(dwdm,0,6）=cd.COUNTY_CODE\n" +
"where TO_CHAR(fi.UPLOAD_DATE,'yyyyMMdd') BETWEEN #{strDate} AND #{endDate}\n" +
"where pp.YXQQSRQ BETWEEN #{strDate} AND #{endDate}\n" +
"and pp.CARD_TYPE_ID=0\n" +
"group by cd.COUNTYNAME,fi.DWDM,fi.dwmc,pp.CARD_TYPE_ID " +
"order by fi.DWDM \n" +
......@@ -180,7 +186,7 @@ public interface PersonPostMapper {
"on pp.FILE_ID=fi.id \n" +
"left join COUNTY_DIC cd\n" +
"on substr(dwdm,0,6）=cd.COUNTY_CODE\n" +
"where TO_CHAR(fi.UPLOAD_DATE,'yyyyMMdd') BETWEEN #{strDate} AND #{endDate}\n" +
"where pp.YXQQSRQ BETWEEN #{strDate} AND #{endDate}\n" +
"and pp.CARD_TYPE_ID=9\n" +
"group by cd.COUNTYNAME,fi.DWDM,fi.dwmc,pp.CARD_TYPE_ID ) datab\n" +
"on dataa.DWDM=datab.DWDM")
......
src/main/java/com/yxproject/start/mapper/ReceiptMapper.java
View file @ e9e69313
......@@ -390,9 +390,11 @@ public interface ReceiptMapper {
public List<Map<String,Object>> findReceiptListCount(@Param("groupNo")String groupNo);
//生成交接单详单
@Insert("INSERT INTO DETAIL_RECEIPT_LIST(UPLOAD_NO,accept_no,name,POLICE_CODE,card_id,SIGN_GOVT,RECEIPT_ID,SEX)\n" +
"select UPLOAD_NO,ACCEPT_NO,NAME,#{policeCode},ID_NO,SIGN_GOVT,#{receiptId},SEX_NO\n" +
"from PRODYD_DBA.prod_card_t@PRODYD_LINK cardT \n" +
@Insert("INSERT INTO DETAIL_RECEIPT_LIST(UPLOAD_NO,accept_no,name,POLICE_CODE,card_id,SIGN_GOVT,RECEIPT_ID,SEX,APPLY_PHONE)\n" +
"select cardT.UPLOAD_NO,cardT.ACCEPT_NO,cardT.NAME,#{policeCode},cardT.ID_NO,cardT.SIGN_GOVT,#{receiptId},cardT.SEX_NO,applyInfo.APPLY_PHONE\n" +
"from PRODYD_DBA.prod_card_t@PRODYD_LINK cardT " +
"LEFT JOIN PRODYD_DBA.PROD_APPLY_INFO_T@PRODYD_LINK applyInfo \n" +
"ON applyInfo.ACCEPT_NO = cardT.ACCEPT_NO\n" +
"where cardT.ACCEPT_NO not in \n" +
"(select ACCEPT_NO from SPECIAL_CARD \n" +
"where GROUP_NO like #{groupNo} " +
......
src/main/java/com/yxproject/start/service/PersonPostService.java
View file @ e9e69313
......@@ -27,7 +27,7 @@ public interface PersonPostService {
public boolean savePersonPost(List<PersonPostEntity> personPostEntities);
public List<PersonPostEntity> findPersonalData(@Param("applicantName") String applicantName,@Param("orderNumber") String orderNumber,@Param("state") String state,@Param("latticeMouthInformation") String latticeMouthInformation,@Param("getToCounty") List<String> getToCounty,@Param("startDate") String startDate,@Param("endDate") String endDate,@Param("firstIndex") String firstIndex,@Param("pageSize") String pageSize, String emailNo,int notNull,String printDate);
public List<PersonPostEntity> findPersonalData(@Param("applicantName") String applicantName,@Param("orderNumber") String orderNumber,@Param("state") String state,@Param("district") String district,@Param("latticeMouthInformation") String latticeMouthInformation,@Param("getToCounty") List<String> getToCounty,@Param("startDate") String startDate,@Param("endDate") String endDate,@Param("firstIndex") String firstIndex,@Param("pageSize") String pageSize, String emailNo,int notNull,String printDate);
public boolean deletePersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String starDate,String endDate);
......@@ -37,11 +37,11 @@ public interface PersonPostService {
public boolean printPostList(int id, Date printDateTime);
public int findPersonalDataCount(String applicantName, String orderNumber, String state, String latticeMouthInformation, List<String> getToCounty, String startDate,String endDate, String emailNo,String notNull,String printDate);
public int findPersonalDataCount(String applicantName, String orderNumber, String state,String district, String latticeMouthInformation, List<String> getToCounty, String startDate,String endDate, String emailNo,String notNull,String printDate);
public int findPersonalDataCountByImportDate(String starDate,String endDate);
public List<PersonPostEntity> downLoadReportForm(HttpServletRequest request,HttpServletResponse response,String sqrxm, String ddh, String hasPrinted, String gkxx, JSONArray jsonArray,String starDate,String endDate,String emailNo,String printDate,String notNull);
public List<PersonPostEntity> downLoadReportForm(HttpServletRequest request,HttpServletResponse response,String sqrxm, String ddh, String hasPrinted,String district, String gkxx, JSONArray jsonArray,String starDate,String endDate,String emailNo,String printDate,String notNull);
public Map<String,Object> selectNote(@Param("uploadId")String uploadId);
......
src/main/java/com/yxproject/start/service/impl/PersonPostServiceImpl.java
View file @ e9e69313
......@@ -52,7 +52,7 @@ public class PersonPostServiceImpl implements PersonPostService {
return true;
}
@Override
public List<PersonPostEntity> findPersonalData(String applicantName, String orderNumber, String state, String latticeMouthInformation, List<String> getToCounty, String startDate, String endDate, String firstIndex, String pageSize, String emailNo, int notNull, String printDate) {
public List<PersonPostEntity> findPersonalData(String applicantName, String orderNumber, String state,String district, String latticeMouthInformation, List<String> getToCounty, String startDate, String endDate, String firstIndex, String pageSize, String emailNo, int notNull, String printDate) {
String str = "";
long firstIndexLong = Long.valueOf(firstIndex);
long pageSizeLong = Long.valueOf(pageSize);
......@@ -63,7 +63,7 @@ public class PersonPostServiceImpl implements PersonPostService {
str += "'" + getToCounty.get(i) + "',";
}
}
List<PersonPostEntity> list = personPostMapper.findAllPersonalData(applicantName, orderNumber, state, latticeMouthInformation, str, startDate, endDate, firstIndexLong * pageSizeLong, (firstIndexLong - 1) * pageSizeLong + 1, emailNo, notNull, printDate);
List<PersonPostEntity> list = personPostMapper.findAllPersonalData(applicantName, orderNumber, state,district, latticeMouthInformation, str, startDate, endDate, firstIndexLong * pageSizeLong, (firstIndexLong - 1) * pageSizeLong + 1, emailNo, notNull, printDate);
return list;
}
......@@ -96,7 +96,7 @@ public class PersonPostServiceImpl implements PersonPostService {
}
@Override
public int findPersonalDataCount(@Param("applicantName") String applicantName, @Param("orderNumber") String orderNumber, @Param("state") String state, @Param("latticeMouthInformation") String latticeMouthInformation, @Param("getToCounty") List<String> getToCounty, @Param("startDate") String startDate, @Param("endDate") String endDate, String emailNo, String notNull, String printDate) {
public int findPersonalDataCount(@Param("applicantName") String applicantName, @Param("orderNumber") String orderNumber, @Param("state") String state,@Param("district") String district, @Param("latticeMouthInformation") String latticeMouthInformation, @Param("getToCounty") List<String> getToCounty, @Param("startDate") String startDate, @Param("endDate") String endDate, String emailNo, String notNull, String printDate) {
String str = "";
for (int i = 0; i < getToCounty.size(); i++) {
if (i == getToCounty.size() - 1) {
......@@ -105,7 +105,7 @@ public class PersonPostServiceImpl implements PersonPostService {
str += "'" + getToCounty.get(i) + "',";
}
}
int count = personPostMapper.findPersonalDataCount(applicantName, orderNumber, state, latticeMouthInformation, str, startDate, endDate, emailNo, notNull, printDate);
int count = personPostMapper.findPersonalDataCount(applicantName, orderNumber, state, district,latticeMouthInformation, str, startDate, endDate, emailNo, notNull, printDate);
return count;
}
......@@ -116,7 +116,7 @@ public class PersonPostServiceImpl implements PersonPostService {
}
@Override
public List<PersonPostEntity> downLoadReportForm(HttpServletRequest request, HttpServletResponse response, String sqrxm, String ddh, String hasPrinted, String gkxx, JSONArray jsonArray, String starDate, String endDate, String emailNo, String printDate, String notNull) {
public List<PersonPostEntity> downLoadReportForm(HttpServletRequest request, HttpServletResponse response, String sqrxm, String ddh, String hasPrinted, String district,String gkxx, JSONArray jsonArray, String starDate, String endDate, String emailNo, String printDate, String notNull) {
String str = "";
for (int i = 0; i < jsonArray.size(); i++) {
if (i == jsonArray.size() - 1) {
......@@ -125,7 +125,7 @@ public class PersonPostServiceImpl implements PersonPostService {
str += "'" + jsonArray.get(i) + "',";
}
}
List<PersonPostEntity> list = personPostMapper.findAllPersonalDataNoPage(sqrxm, ddh, hasPrinted, gkxx, str, starDate, endDate, emailNo, printDate, notNull);
List<PersonPostEntity> list = personPostMapper.findAllPersonalDataNoPage(sqrxm, ddh, hasPrinted,district, gkxx, str, starDate, endDate, emailNo, printDate, notNull);
return list;
}
......
src/main/resources/static/views/receitp/receitp.js
View file @ e9e69313
......@@ -175,6 +175,10 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
if(json.list.length==0){
MessageService.showAlert("请选择要打印的分局或派出所")
}else{
var LODOP = getLodop();
if( $scope.priterNum==100){
$scope.priterNum=LODOP.SELECT_PRINTER();
}else {
HttpService.printReceitpData(json,function (data) {
if($scope.isHistory==0){
$scope.doSearchReceitp();
......@@ -204,10 +208,9 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
$scope.result.push(json);
}
}
$timeout(function () {
for (var i=0;i<$scope.result.length;i++){
var LODOP = getLodop();
LODOP.SET_LICENSES("", "15F0BE661E7F32F37491843CB2510905", "C94CEE276DB2187AE6B65D56B3FC2848", "");
//初始化
LODOP.PRINT_INIT("打印交接单");
......@@ -229,17 +232,15 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
// LODOP.SET_PRINT_STYLEA(5, "Bold", 0);
LODOP.SET_PRINT_STYLEA(5, "HOrient", 2);
LODOP.SET_PRINT_STYLEA(5, "Vorient", 3);
if( $scope.priterNum==100){
$scope.priterNum=LODOP.SELECT_PRINTER();
}else {
// LODOP.PREVIEW();
LODOP.PRINT();
}
}
})
})
}
}
}
......
src/main/resources/static/views/searchCardMsg/searchCardMsg.html
View file @ e9e69313
......@@ -56,7 +56,7 @@
<div class="box-footer" style="text-align: right;">
<button class="btn btn-primary" ng-click="startReading()">开始读卡</button>
<button class="btn btn-info" ng-click="endReading()">停止读卡</button>
<!--<button class="btn btn-info" ng-click="test()">打印测试</button>-->
<!-- <button class="btn btn-info" ng-click="test()">打印测试</button>-->
</div>
</div>
<div class="box box-default">
......@@ -70,10 +70,10 @@
<th>订单号</th>
<th>邮件号</th>
<th>反向邮件号</th>
<th>受理号</th>
<th>收件人</th>
<th>联系方式</th>
<th>地址</th>
<th>受理区县</th>
<th>申请人姓名</th>
<th>打印时间</th>
</tr>
......@@ -88,10 +88,14 @@
<td>{{item.orderNumber}}</td>
<td>{{item.waybillNumber}}</td>
<td>{{item.backWaybillNumber}}</td>
<td>{{item.firstWhite}}</td>
<td>{{item.recipientName}}</td>
<td>{{item.recipientPhone}}</td>
<td>{{item.recipientAddress}}</td>
<td>
-<span ng-if="(item.firstWhite|limitTo:6)==110018">
密云区
</span>-
</td>
<td>{{item.applicantName}}</td>
<td>{{item.printDate | date:'yyyy-MM-dd hh:mm:ss'}}</td>
</tr>
......@@ -332,7 +336,7 @@
</tr>
<tr>
<td>
<table cellspacing="0" cellpadding="0" style="border:1px dashed #000;
<table cellspacing="0" cellpadding="0" style="border:1px dashed #000;border-bottom:none;
border-top:none;border-collapse:collapse;height:17mm;font-size: 3mm;">
<tr>
<td style="border-right:1px dashed #000;width:40mm">
......@@ -349,25 +353,41 @@
</tr>
<tr>
<td>
<table cellspacing="0" cellpadding="0" style="border:1px dashed #000;border-top:none;border-collapse:collapse;height:15mm">
<table cellspacing="0" cellpadding="0" style="border-collapse:collapse;border-left:1px dashed #000;height:15mm">
<tr>
<td style="border-right:1px dashed #000;width:68mm">
<td style="border-bottom:1px dashed #000;border-top:1px dashed #000;width:60mm">
<span style="position:absolute;top:124mm;left:1.5mm;font-size:3mm;">备注：</span>
</td>
<td style="border:0px dashed #000;width:28mm"></td>
<td style="width:7mm;border: 2px solid #000;border-bottom: 2px solid #000; text-align: center;">
<p><span style="font-size:3mm;">已<br/>检</span><strong>京</strong></p>
</td>
<td style="border:2px solid #000;width:29mm;height: 15mm;">
<div style="width:29mm;height:8mm;padding-top: 2mm;">
<span style="padding-left: 1mm;" >丰台分公司</span>
</div>
<div style="width:29mm;;height:7mm;border-top: 2px solid #000;">
<p style="padding-left: 1mm;font-size: 3mm;">
检验人：马超
</p>
</div>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td>
<table cellspacing="0" cellpadding="0" style="border:1px dashed #000;border-top:none;border-collapse:collapse;height:7mm">
<table cellspacing="0" cellpadding="0" style="border:1px dashed #000;border-top:none;border-collapse:collapse;height:6mm">
<tr>
<td style="border-right:1px dashed #000;width:68mm">
<span style="font-size: 3mm; margin-left: 3mm;">网址：www.ems.com.cn</span>
<span style="font-size: 3mm; margin-left: 3mm;">客服电话：11183</span>
</td>
<td style="border:0px dashed #000;width:28mm"></td>
<td style="border:0px dashed #000;width:28mm">
<span>
{{postMsgDetail[idx].UploadDistrict}}
</span>
</td>
</tr>
</table>
</td>
......
src/main/resources/static/views/searchCardMsg/searchCardMsg.js
View file @ e9e69313
......@@ -56,6 +56,9 @@ angular.module('AvatarCheck.searchCardMsg', ['ngRoute', 'AvatarCheck.http'])
$scope.postMsgDetail = [];
HttpService.doPostAndGetData(postData, function (data) {
$scope.postMsgDetail = data;
if($scope.postMsgDetail[$scope.idx].firstWhite.substr(0,6)==110018){
$scope.postMsgDetail[$scope.idx].UploadDistrict="密云区";
}
$timeout(function () {
if ($scope.postMsgDetail.length == 1&&$scope.postMsgDetail[$scope.idx].printDate == null&&flag == true&&$scope.postMsgDetail[0].idCard==postData.idCard){
$scope.PreviewMytableRotate();
......@@ -66,16 +69,15 @@ angular.module('AvatarCheck.searchCardMsg', ['ngRoute', 'AvatarCheck.http'])
//测试打印快递单
// $scope.test=function () {
// var ss = {
// idCard: '360124199610210611',
// startDate: '20160212',
// endDate: '20260212'
// idCard: '220181199312140025',
// startDate: '20210625',
// endDate: '20410625'
// }
// HttpService.doPostAndGetData(ss, function (data) {
// $scope.postMsgDetail = data;
// console.log("$scope.postMsgDetail:",ss, $scope.postMsgDetail);
// var flag=true;
// $timeout(function () {
// console.log($scope.postMsgDetail.length == 1,flag == true, $scope.postMsgDetail[$scope.idx].printDate == null,$scope.postMsgDetail[$scope.idx].idCard==ss.idCard)
// if ($scope.postMsgDetail.length == 1&&flag == true && $scope.postMsgDetail[$scope.idx].printDate == null&&$scope.postMsgDetail[$scope.idx].idCard==ss.idCard) {
// $scope.PreviewMytableRotate();
// }
......
src/main/resources/static/views/tagPrint/tagPrint.js
View file @ e9e69313
......@@ -135,14 +135,12 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
}
}
}else if(data.state===2){
MessageService.showAlert(data.msg+"复核人："+data.checkName+" 复核时间："+data.checkDate)
getPoliceListDataNotChecked();
getDetailListById(data.id);
MessageService.showAlert(data.msg);
}else{
MessageService.showAlert("无该证件的制证记录");
$scope.json.isShow=false;
getPoliceListDataNotChecked();
getDetailListById(data.id);
// getDetailListById(data.id);
}
})
}
......
src/main/resources/static/views/task/taskListSorting.html
View file @ e9e69313
......@@ -57,7 +57,7 @@
<tbody ng-repeat="task in type.countyList">
<tr>
<td >
<input ng-if="type.typeCode=='100'||(task.faileCount==0&&task.countyValidCount==task.eWriteCount)"
<input ng-if="type.typeCode=='100'||(task.faileCount==0)"
type="checkbox" class="checkOneBox"
ng-checked="isSelected(task)" value="{{task.taskId}}"
ng-click="updateSelection($event,task)">
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.html
View file @ e9e69313
......@@ -123,8 +123,15 @@
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div>
</td>
<td></td>
<td></td>
<td>受理区县:</td>
<td style="text-align: left;">
<select class="form-control select2" id="district"
ng-model="district">
<option value="">--请选择受理区县--</option>
<option value="1">密云</option>
<option value="0">其他（除密云外所有区县）</option>
</select>
</td>
<td colspan="2">
<div style="float: left">
<button class="btn btn-primary" style="margin-right: 7px;" ng-click="doQuery()">查询</button>
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js
View file @ e9e69313
......@@ -87,6 +87,11 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else {
json.state=$("#print").val();
}
if ($("#district").val() == '') {
json.district=-1;
}else {
json.district=$("#district").val() ;
}
if(angular.isUndefined($scope.emailNo)){
json.emailNo = ''
}else{
......@@ -146,6 +151,11 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else {
json.state=$("#print").val();
}
if ($("#district").val() == '') {
json.district=-1;
}else {
json.district=$("#district").val() ;
}
if(angular.isUndefined($scope.emailNo)){
json.emailNo = ''
}else{
......@@ -235,6 +245,11 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else{
url = url + 'djx=&';
}
if ($("#district").val() != '') {
url = url + 'district=' + $("#district").val() + '&';
}else {
url = url + 'district=-1&';
}
if(angular.isUndefined($scope.emailNo)){
url = url + 'emailNo=&';
}else{
......
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