Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 2c79fe34 authored by wuzhilong's avatar wuzhilong
Browse files
Options

添加封签打印历史 

修改公安网反馈下载派出所名称
更新交接单排序
parent 053af0c5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 456 additions and 36 deletions
src/main/java/com/yxproject/start/api/ReceiptApi.java
View file @ 2c79fe34
...@@ -68,7 +68,7 @@ public class ReceiptApi { ...@@ -68,7 +68,7 @@ public class ReceiptApi {
ReceiptListEntity receiptListEntity=new ReceiptListEntity(); ReceiptListEntity receiptListEntity=new ReceiptListEntity();
//邮寄证的单位代码设为人口大队的 //邮寄证的单位代码设为人口大队的
Long card_type=Long.valueOf((BigDecimal) resultDate.get("CARD_TYPE") + ""); Long card_type=Long.valueOf((BigDecimal) resultDate.get("CARD_TYPE") + "");
receiptListEntity.setCardTypeId(card_type); receiptListEntity.setCardTypeId(Long.valueOf(9));
String fjmc; String fjmc;
//交接单派出所代码 card_type重做返回2 快证1 //交接单派出所代码 card_type重做返回2 快证1
if(card_type==2){//重做返回 if(card_type==2){//重做返回
...@@ -171,7 +171,7 @@ public class ReceiptApi { ...@@ -171,7 +171,7 @@ public class ReceiptApi {
String fjmc=null; String fjmc=null;
if (card_type == 9) { if (card_type == 9) {
receiptListEntity.setFjdm("110001"); receiptListEntity.setFjdm("110001");
fjmc = "异地个人邮寄"; fjmc = "北京市公安局";
} else if (card_type == 5) { } else if (card_type == 5) {
fjmc=receiptListDate.get(0).get("FJMC").toString()+"(港澳)"; fjmc=receiptListDate.get(0).get("FJMC").toString()+"(港澳)";
} else if (card_type == 7) { } else if (card_type == 7) {
...@@ -375,7 +375,7 @@ public class ReceiptApi { ...@@ -375,7 +375,7 @@ public class ReceiptApi {
/** /**
* 查询交接单数据 * 查询封签打印信息
* @param name 生成人姓名 * @param name 生成人姓名
* @return * @return
*/ */
...@@ -390,17 +390,20 @@ public class ReceiptApi { ...@@ -390,17 +390,20 @@ public class ReceiptApi {
String machineNum = resultMap.get(i).get("MACHINE_NUM") + ""; String machineNum = resultMap.get(i).get("MACHINE_NUM") + "";
String gajgMc = resultMap.get(i).get("GAJG_MC") + ""; String gajgMc = resultMap.get(i).get("GAJG_MC") + "";
switch (cardType) { switch (cardType) {
case "9":
resultMap.get(i).put("FJMC", "异地个人邮寄");
break;
case "3": case "3":
resultMap.get(i).put("GAJG_MC", gajgMc + "(" + machineNum + ")"); resultMap.get(i).put("GAJG_MC", gajgMc + "(" + machineNum + ")");
break; break;
case "5": case "5":
resultMap.get(i).put("GAJG_MC", gajgMc + "(港澳证)"); resultMap.get(i).put("FJMC", "港澳证"+resultMap.get(i).get("FJMC").toString());
break; break;
case "6": case "7":
resultMap.get(i).put("GAJG_MC", gajgMc + "(台湾证)"); resultMap.get(i).put("FJMC", "台湾证"+resultMap.get(i).get("FJMC").toString());
break;
case "8":
resultMap.get(i).put("FJMC","异地证"+resultMap.get(i).get("FJMC").toString());
break;
case "9":
resultMap.get(i).put("FJMC", "异地速递");
break; break;
} }
} }
...@@ -413,6 +416,103 @@ public class ReceiptApi { ...@@ -413,6 +416,103 @@ public class ReceiptApi {
return resultMap; return resultMap;
} }
/**
* 查询历史封签打印数据
*
* @param name 核验用户
* @param date 核验时间
* @return
*/
@RequestMapping("selectRecriptInHistory")
public List<Map<String, Object>> selectRecriptInHistory(String name,String date) {
//返回交接单数据
List<Map<String, Object>> resultMap = new ArrayList<>();
resultMap = receiptService.selectRecriptInHistory(name,stripNonDigits(date));
for (int i = 0; i < resultMap.size(); i++) {
String cardtype= resultMap.get(i).get("CARD_TYPE_ID").toString();
String groupNo = (String) resultMap.get(i).get("QR_CODE");
String machineNum =String.valueOf(resultMap.get(i).get("MACHINE_NUM"));
switch (cardtype) {
case "3":
resultMap.get(i).put("GAJG_MC", resultMap.get(i).get("gajgMc").toString() + "(" + machineNum + ")");
break;
case "5":
resultMap.get(i).put("FJMC", "港澳证"+resultMap.get(i).get("FJMC").toString());
break;
case "7":
resultMap.get(i).put("FJMC", "台湾证"+resultMap.get(i).get("FJMC").toString());
break;
case "8":
resultMap.get(i).put("FJMC","异地证"+resultMap.get(i).get("FJMC").toString());
break;
case "9":
resultMap.get(i).put("FJMC", "异地速递");
break;
}
//判断是否是特证
if (groupNo.length() == 10) {//受理号长度为10
Map<String, Object> map = receiptService.selectCountTimeT(groupNo);
resultMap.get(i).put("download", map.get("DOWNLOAD"));
resultMap.get(i).put("checkerCount", map.get("CHECKERCOUNT"));
resultMap.get(i).put("electricCount", map.get("ELECTRICCOUNT"));
} else {
Map<String, Object> map = receiptService.selectCountTime(groupNo);
resultMap.get(i).put("download", map.get("DOWNLOAD"));
resultMap.get(i).put("checkerCount", map.get("CHECKERCOUNT"));
resultMap.get(i).put("electricCount", map.get("ELECTRICCOUNT"));
}
}
return resultMap;
}
/**
* 根据历史交接单查询详细信息
*
* @param name 核验人
* @param date 核验日期
* @param cardId 身份证号码
* @param startDate 起始有效期
* @param endDate 截止有效期
* @return
*/
@RequestMapping("selectDetailListInHistory")
public Map<String, Object> selectDetailListInHistory(String name,String date,String cardId,String startDate,String endDate) {
Map<String, Object> resultList = new HashMap<>();
resultList = receiptService.selectDetailListInHistory(name,stripNonDigits(date),cardId,stripNonDigits(startDate),stripNonDigits(endDate));
if (resultList == null){
resultList = receiptService.selectDetailListInHistoryById(cardId,stripNonDigits(startDate),stripNonDigits(endDate));
resultList.put("date","不存在");
}else {
resultList.put("date","存在");
String acceptNo = (String) resultList.get("ACCEPT_NO");
Map<String, Object> map = receiptService.selectTimes(acceptNo);
if (map == null) {
resultList.put("downloadDate", "数据已迁移");
resultList.put("checkDate", "数据已迁移");
resultList.put("electricDate", "数据已迁移");
resultList.put("styleClass", "");
} else {
resultList.put("downloadDate", map.get("DOWNLOADDATE"));
resultList.put("checkDate", map.get("CHECKDATE"));
resultList.put("electricDate", map.get("ELECTRICDATE"));
resultList.put("styleClass", "");
}
}
return resultList;
}
/**
* 判断刷证是否在在打开的交接单详单
*
* @param groupNo 组号
* @param cardId 身份证号码
* @param startDate 起始有效期
* @param endDate 截止有效期
* @return
*/
@RequestMapping("judgeCardInDetailReceiptList")
public Boolean judgeCardInDetailReceiptList(String groupNo,String cardId,String startDate,String endDate) {
return receiptService.judgeCardInDetailReceiptList(groupNo,cardId,stripNonDigits(startDate),stripNonDigits(endDate));
}
/** /**
* 根据任务单查询详细信息 * 根据任务单查询详细信息
......
src/main/java/com/yxproject/start/mapper/DetailReceiptListMapper.java
View file @ 2c79fe34
...@@ -45,7 +45,7 @@ public interface DetailReceiptListMapper { ...@@ -45,7 +45,7 @@ public interface DetailReceiptListMapper {
* @return * @return
*/ */
@Select("select QR_CODE,to_char(receipt_date,'yyyyMMddHH24') receipt_date ,\n" + @Select("select QR_CODE,to_char(receipt_date,'yyyyMMddHH24') receipt_date ,\n" +
"POLICE_CODE,FINISH_COUNT,DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC,CARD_TYPE_DIC.CARD_TYPE\n" + "POLICE_CODE,FINISH_COUNT,DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID\n" +
"from RECEIPT_LIST \n" + "from RECEIPT_LIST \n" +
"left join PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO = RECEIPT_LIST.POLICE_CODE\n" + "left join PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO = RECEIPT_LIST.POLICE_CODE\n" +
"left join CARD_TYPE_DIC on RECEIPT_LIST.CARD_TYPE_ID = CARD_TYPE_DIC.CARD_TYPE_ID\n" + "left join CARD_TYPE_DIC on RECEIPT_LIST.CARD_TYPE_ID = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
......
src/main/java/com/yxproject/start/mapper/LogMapper.java
View file @ 2c79fe34
...@@ -46,7 +46,8 @@ public interface LogMapper { ...@@ -46,7 +46,8 @@ public interface LogMapper {
"FROM PERSON_POST \n" + "FROM PERSON_POST \n" +
"LEFT JOIN PREPRO_PERSON ON PERSON_POST.FIRST_WHITE = PREPRO_PERSON.JMSFZSLH\n" + "LEFT JOIN PREPRO_PERSON ON PERSON_POST.FIRST_WHITE = PREPRO_PERSON.JMSFZSLH\n" +
"LEFT JOIN FILES ON FILES.ID=PREPRO_PERSON.FILE_ID "+ "LEFT JOIN FILES ON FILES.ID=PREPRO_PERSON.FILE_ID "+
"WHERE PERSON_POST.BIRTH_DATE = PREPRO_PERSON.CSRQ " + "WHERE PERSON_POST.STATE1=3 " +
"AND PERSON_POST.BIRTH_DATE = PREPRO_PERSON.CSRQ " +
"AND TO_CHAR(FILES.UPLOAD_DATE,'yyyy-mm-dd hh24:mi:ss')=#{printDate} )") "AND TO_CHAR(FILES.UPLOAD_DATE,'yyyy-mm-dd hh24:mi:ss')=#{printDate} )")
public boolean changeCardTypeByPrintDate(@Param("printDate")String printDate); public boolean changeCardTypeByPrintDate(@Param("printDate")String printDate);
...@@ -57,7 +58,8 @@ public interface LogMapper { ...@@ -57,7 +58,8 @@ public interface LogMapper {
" where file_id IN (SELECT DISTINCT PERSON_POST.file_id FROM PERSON_POST " + " where file_id IN (SELECT DISTINCT PERSON_POST.file_id FROM PERSON_POST " +
" LEFT JOIN PREPRO_PERSON ON PERSON_POST.FIRST_WHITE = PREPRO_PERSON.JMSFZSLH " + " LEFT JOIN PREPRO_PERSON ON PERSON_POST.FIRST_WHITE = PREPRO_PERSON.JMSFZSLH " +
" LEFT JOIN FILES ON FILES.ID=PREPRO_PERSON.FILE_ID " + " LEFT JOIN FILES ON FILES.ID=PREPRO_PERSON.FILE_ID " +
" WHERE PERSON_POST.BIRTH_DATE = PREPRO_PERSON.CSRQ " + " WHERE PERSON_POST.BIRTH_DATE = PREPRO_PERSON.CSRQ" +
" AND PERSON_POST.STATE1=3 " +
" AND TO_CHAR(FILES.UPLOAD_DATE,'yyyy-mm-dd hh24:mi:ss')=#{printDate} ) ") " AND TO_CHAR(FILES.UPLOAD_DATE,'yyyy-mm-dd hh24:mi:ss')=#{printDate} ) ")
public boolean insertAnalysisDateByPrintDate(@Param("analysisDate")String analysisDate,@Param("printDate")String printDate); public boolean insertAnalysisDateByPrintDate(@Param("analysisDate")String analysisDate,@Param("printDate")String printDate);
......
src/main/java/com/yxproject/start/mapper/PersonPostMapper.java
View file @ 2c79fe34
...@@ -25,7 +25,7 @@ public interface PersonPostMapper { ...@@ -25,7 +25,7 @@ public interface PersonPostMapper {
"where JMSFZSLH in(select FIRST_WHITE from person_post where FILE_ID=#{fileId}) and files.CREAT_TIME=#{creatTime} )") "where JMSFZSLH in(select FIRST_WHITE from person_post where FILE_ID=#{fileId}) and files.CREAT_TIME=#{creatTime} )")
public boolean updateIsPost(@Param("fileId")String fileId,@Param("creatTime") String creatTime); public boolean updateIsPost(@Param("fileId")String fileId,@Param("creatTime") String creatTime);
@Select("SELECT * FROM PERSON_POST WHERE ID_CARD=#{idCard} AND BEGIN_USEFUL_LIFE=#{startDate} AND VALID_PERIOD_END=#{endDate}") @Select("SELECT * FROM PERSON_POST WHERE ID_CARD=#{idCard} AND BEGIN_USEFUL_LIFE=#{startDate} AND VALID_PERIOD_END=#{endDate} AND STATE1=0")
public List<PersonPostEntity> findAllByIdCardAndStartDateAndEndDate(@Param("idCard") String idCard, @Param("startDate")String startDate, @Param("endDate")String endDate); public List<PersonPostEntity> findAllByIdCardAndStartDateAndEndDate(@Param("idCard") String idCard, @Param("startDate")String startDate, @Param("endDate")String endDate);
......
src/main/java/com/yxproject/start/mapper/ReceiptMapper.java
View file @ 2c79fe34
...@@ -168,6 +168,14 @@ public interface ReceiptMapper { ...@@ -168,6 +168,14 @@ public interface ReceiptMapper {
"order by RECEIPT_LIST.id ") "order by RECEIPT_LIST.id ")
public List<Map<String,Object>>selectReceiptListOfSpecialCard (@Param("name")String name); public List<Map<String,Object>>selectReceiptListOfSpecialCard (@Param("name")String name);
//查询历史交接单
@Select("SELECT RECEIPT_LIST.* ,DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC ,POLICE_DIC.POLICE_NAME FJMC \n" +
"FROM RECEIPT_LIST\n" +
"LEFT JOIN PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK ON RECEIPT_LIST.POLICE_CODE=DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO \n" +
"LEFT JOIN POLICE_DIC ON RECEIPT_LIST.FJDM=POLICE_DIC.POLICE_CODE " +
"where state=1 and check_name =#{name} and to_char(CHECK_DATE,'yyyyMMdd') = #{date} order by RECEIPT_LIST.id\n")
public List<Map<String,Object>>selectRecriptInHistory(@Param("name")String name, @Param("date")String date);
//根据身份证号查询普通证交接单 //根据身份证号查询普通证交接单
@Select("SELECT RECEIPT_LIST.* FROM RECEIPT_LIST \n" + @Select("SELECT RECEIPT_LIST.* FROM RECEIPT_LIST \n" +
"LEFT JOIN PRODYD_DBA.PROD_CARD_T@PRODYD_LINK ON subStr(PROD_CARD_T.ACCEPT_NO,0,8) =RECEIPT_LIST.QR_CODE\n" + "LEFT JOIN PRODYD_DBA.PROD_CARD_T@PRODYD_LINK ON subStr(PROD_CARD_T.ACCEPT_NO,0,8) =RECEIPT_LIST.QR_CODE\n" +
...@@ -392,4 +400,31 @@ public interface ReceiptMapper { ...@@ -392,4 +400,31 @@ public interface ReceiptMapper {
"and cardT.ACCEPT_NO like #{groupNo}") "and cardT.ACCEPT_NO like #{groupNo}")
public boolean createDetailReceiptList(@Param("receiptId")String receiptId,@Param("groupNo")String groupNo,@Param("policeCode")String policeCode); public boolean createDetailReceiptList(@Param("receiptId")String receiptId,@Param("groupNo")String groupNo,@Param("policeCode")String policeCode);
//查询历史交接单详单是否存在
@Select("select detail_receipt_list.UPLOAD_NO,detail_receipt_list.ACCEPT_NO,detail_receipt_list.NAME,\n" +
"detail_receipt_list.POLICE_CODE,detail_receipt_list.CARD_ID ,detail_receipt_list.NOTE,\n" +
"detail_receipt_list.SIGN_GOVT,detail_receipt_list.RECEIPT_ID,detail_receipt_list.SEX, \n" +
"RECEIPT_LIST.QR_CODE,RECEIPT_LIST.RECEIPT_DATE,RECEIPT_LIST.FINISH_COUNT,POLICE_DIC.POLICE_NAME GAJG_MC\n" +
"from detail_receipt_list \n" +
"left join RECEIPT_LIST on detail_receipt_list.RECEIPT_ID = RECEIPT_LIST.id \n" +
"left join POLICE_DIC on POLICE_DIC.POLICE_CODE = RECEIPT_LIST.POLICE_CODE \n" +
"LEFT JOIN PREPRO_PERSON ON detail_receipt_list.UPLOAD_NO = PREPRO_PERSON.JMSFZSLH\n" +
"where RECEIPT_LIST.state=1 and RECEIPT_LIST.CHECK_NAME=#{name} AND TO_CHAR(RECEIPT_LIST.CHECK_DATE,'yyyyMMdd') = #{date}\n" +
"AND PREPRO_PERSON.GMSFHM = #{cardId} AND PREPRO_PERSON.YXQQSRQ = #{startDate} AND PREPRO_PERSON.YXQJZRQ = #{endDate} \n" +
"order by detail_receipt_list.ACCEPT_NO ")
public Map<String,Object> selectDetailListInHistory(@Param("name")String name, @Param("date")String date, @Param("cardId")String cardId, @Param("startDate")String startDate,@Param("endDate") String endDate);
@Select("SELECT RECEIPT_LIST.QR_CODE,RECEIPT_LIST.CHECK_DATE,RECEIPT_LIST.CHECK_NAME FROM detail_receipt_list\n" +
"left join RECEIPT_LIST on detail_receipt_list.RECEIPT_ID = RECEIPT_LIST.id \n" +
"LEFT JOIN PREPRO_PERSON ON detail_receipt_list.UPLOAD_NO = PREPRO_PERSON.JMSFZSLH\n" +
"where RECEIPT_LIST.state=1 and PREPRO_PERSON.GMSFHM = #{cardId} AND PREPRO_PERSON.YXQQSRQ = #{startDate} AND PREPRO_PERSON.YXQJZRQ = #{endDate} \n" +
"order by detail_receipt_list.ACCEPT_NO ")
public Map<String,Object> selectDetailListInHistoryById(@Param("cardId")String cardId, @Param("startDate")String startDate,@Param("endDate") String endDate);
@Select("SELECT * FROM detail_receipt_list\n" +
"left join RECEIPT_LIST on detail_receipt_list.RECEIPT_ID = RECEIPT_LIST.id \n" +
"LEFT JOIN PREPRO_PERSON ON detail_receipt_list.UPLOAD_NO = PREPRO_PERSON.JMSFZSLH\n" +
"WHERE RECEIPT_LIST.QR_CODE = #{groupNo} AND PREPRO_PERSON.GMSFHM = #{cardId} AND PREPRO_PERSON.YXQQSRQ = #{startDate} AND PREPRO_PERSON.YXQJZRQ = #{endDate}")
public Map<String,Object> judgeCardInDetailReceiptList(@Param("groupNo")String groupNo, @Param("cardId")String cardId, @Param("startDate")String startDate,@Param("endDate")String endDate );
} }
src/main/java/com/yxproject/start/service/ReceiptService.java
View file @ 2c79fe34
...@@ -27,6 +27,8 @@ public interface ReceiptService { ...@@ -27,6 +27,8 @@ public interface ReceiptService {
public List<Map<String,Object>>selectReceiptListOfSpecialCard (String name); public List<Map<String,Object>>selectReceiptListOfSpecialCard (String name);
public List<Map<String,Object>>selectRecriptInHistory (String name,String date);
// public Map<String,Object> selectReceiptList(String id); // public Map<String,Object> selectReceiptList(String id);
public List<Map<String,Object>> selectDetailList(String receiptId); public List<Map<String,Object>> selectDetailList(String receiptId);
...@@ -101,5 +103,11 @@ public interface ReceiptService { ...@@ -101,5 +103,11 @@ public interface ReceiptService {
public boolean createDetailReceiptList(String receiptId,String groupNo,String policeCode); public boolean createDetailReceiptList(String receiptId,String groupNo,String policeCode);
public Map<String,Object> selectDetailListInHistory(String name,String date,String cardId,String startDate,String endDate);
public Map<String,Object> selectDetailListInHistoryById(String cardId,String startDate,String endDate);
public Boolean judgeCardInDetailReceiptList(String groupNo,String cardId,String startDate,String endDate);
} }
src/main/java/com/yxproject/start/service/impl/ReceiptServiceImpl.java
View file @ 2c79fe34
...@@ -70,7 +70,11 @@ public class ReceiptServiceImpl implements ReceiptService { ...@@ -70,7 +70,11 @@ public class ReceiptServiceImpl implements ReceiptService {
List<Map<String,Object>> resultList= receiptMapper.selectReceiptListOfSpecialCard(name); List<Map<String,Object>> resultList= receiptMapper.selectReceiptListOfSpecialCard(name);
return resultList; return resultList;
} }
@Override
public List<Map<String, Object>> selectRecriptInHistory(String name, String date) {
List<Map<String,Object>> resultList= receiptMapper.selectRecriptInHistory(name,date);
return resultList;
}
// @Override // @Override
// public Map<String, Object> selectReceiptList(String id) { // public Map<String, Object> selectReceiptList(String id) {
// Map<String, Object> resultMap = receiptMapper.selectReceiptList(id); // Map<String, Object> resultMap = receiptMapper.selectReceiptList(id);
...@@ -429,13 +433,13 @@ public class ReceiptServiceImpl implements ReceiptService { ...@@ -429,13 +433,13 @@ public class ReceiptServiceImpl implements ReceiptService {
String card_type_id=countyMap.get("CARD_TYPE_ID")+""; String card_type_id=countyMap.get("CARD_TYPE_ID")+"";
switch(card_type_id) { switch(card_type_id) {
case "9": case "9":
countyName = "异地个人邮寄"; countyName = "北京市公安局";
break; break;
case "7": case "7":
countyName = countyMap.get("COUNTYNAME") + "(台湾)"; countyName ="台湾证"+countyMap.get("COUNTYNAME");
break; break;
case "5": case "5":
countyName = countyMap.get("COUNTYNAME") + "(港澳)"; countyName ="港澳证"+countyMap.get("COUNTYNAME");
break; break;
default: default:
countyName = "" + countyMap.get("COUNTYNAME"); countyName = "" + countyMap.get("COUNTYNAME");
...@@ -530,6 +534,25 @@ public class ReceiptServiceImpl implements ReceiptService { ...@@ -530,6 +534,25 @@ public class ReceiptServiceImpl implements ReceiptService {
} }
return ""; return "";
} }
@Override
public Map<String, Object> selectDetailListInHistory(String name, String date, String cardId, String startDate, String endDate) {
return receiptMapper.selectDetailListInHistory(name,date,cardId,startDate,endDate);
}
@Override
public Map<String, Object> selectDetailListInHistoryById(String cardId, String startDate, String endDate) {
return receiptMapper.selectDetailListInHistoryById(cardId,startDate,endDate);
}
@Override
public Boolean judgeCardInDetailReceiptList(String groupNo, String cardId, String startDate, String endDate) {
Map<String,Object> map = receiptMapper.judgeCardInDetailReceiptList(groupNo,cardId,startDate,endDate);
if (map == null){
return false;
}else {
return true;
}
}
/** /**
* 字符串去除空格 * 字符串去除空格
......
src/main/java/com/yxproject/start/utils/ExportExcel.java
View file @ 2c79fe34
package com.yxproject.start.utils; package com.yxproject.start.utils;
import org.apache.poi.hssf.usermodel.*; import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.CellRangeAddress;
import org.springframework.util.ObjectUtils;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.*; import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.Date;
import java.util.List;
import java.util.Map;
import static com.yxproject.start.utils.YXStringUtils.getCurrentDate2String; import static com.yxproject.start.utils.YXStringUtils.getCurrentDate2String;
...@@ -157,16 +158,23 @@ public class ExportExcel { ...@@ -157,16 +158,23 @@ public class ExportExcel {
// cell1.setCellValue("null".equals(list.get(i).get("POLICE_CODE") + "") ? "" : list.get(i).get("POLICE_CODE") + ""); // cell1.setCellValue("null".equals(list.get(i).get("POLICE_CODE") + "") ? "" : list.get(i).get("POLICE_CODE") + "");
//更改个人邮寄单位代码，使用北京市公安局代码 //更改个人邮寄单位代码，使用北京市公安局代码
String POLICE_CODE="null".equals(list.get(i).get("POLICE_CODE") + "") ? "" : list.get(i).get("POLICE_CODE") + ""; String POLICE_CODE="null".equals(list.get(i).get("POLICE_CODE") + "") ? "" : list.get(i).get("POLICE_CODE") + "";
String POLICE_NAME="null".equals(list.get(i).get("GAJG_MC") + "") ? "" : list.get(i).get("GAJG_MC") + "";
if ("110001580800".equals(POLICE_CODE)){ if ("110001580800".equals(POLICE_CODE)){
POLICE_CODE="110000000000"; POLICE_CODE="110000000000";
POLICE_NAME="北京市公安局";
} }
cell1.setCellValue(POLICE_CODE); cell1.setCellValue(POLICE_CODE);
cell1 = row1.createCell(2); //设定值 cell1 = row1.createCell(2); //设定值
cell1.setCellValue("null".equals(list.get(i).get("GAJG_MC") + "") ? "" : list.get(i).get("GAJG_MC") + ""); cell1.setCellValue(POLICE_NAME);
cell1 = row1.createCell(3); //设定值 cell1 = row1.createCell(3); //设定值
cell1.setCellValue("null".equals(list.get(i).get("FINISH_COUNT") + "") ? "" : list.get(i).get("FINISH_COUNT") + ""); cell1.setCellValue("null".equals(list.get(i).get("FINISH_COUNT") + "") ? "" : list.get(i).get("FINISH_COUNT") + "");
cell1 = row1.createCell(4); //设定值 cell1 = row1.createCell(4); //设定值
cell1.setCellValue("null".equals(list.get(i).get("CARD_TYPE") + "") ? "" : list.get(i).get("CARD_TYPE") + ""); String CARD_TYPE="null".equals(list.get(i).get("CARD_TYPE") + "") ? "" : list.get(i).get("CARD_TYPE") + "";
String CARD_TYPE_ID="null".equals(list.get(i).get("CARD_TYPE_ID") + "") ? "" : list.get(i).get("CARD_TYPE_ID") + "";
if ("5".equals(CARD_TYPE_ID)||"7".equals(CARD_TYPE_ID)){
CARD_TYPE="港澳台证";
}
cell1.setCellValue(CARD_TYPE);
cell1 = row1.createCell(5); //设定值 cell1 = row1.createCell(5); //设定值
cell1.setCellValue("null".equals(list.get(i).get("RECEIPT_DATE") + "") ? "" : list.get(i).get("RECEIPT_DATE") + ""); cell1.setCellValue("null".equals(list.get(i).get("RECEIPT_DATE") + "") ? "" : list.get(i).get("RECEIPT_DATE") + "");
} }
......
src/main/resources/mapper/config/mybatis-config.xml
View file @ 2c79fe34
...@@ -6,6 +6,6 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN" ...@@ -6,6 +6,6 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
<settings> <settings>
<setting name="mapUnderscoreToCamelCase" value="true"/> <setting name="mapUnderscoreToCamelCase" value="true"/>
<setting name="callSettersOnNulls" value="true"/> <setting name="callSettersOnNulls" value="true"/>
<setting name="logImpl" value="STDOUT_LOGGING" /> <!-- <setting name="logImpl" value="STDOUT_LOGGING" />-->
</settings> </settings>
</configuration> </configuration>
\ No newline at end of file
src/main/resources/static/index.html
View file @ 2c79fe34
...@@ -224,6 +224,7 @@ ...@@ -224,6 +224,7 @@
<script src="views/confirmNotDeliveredInfo/confirmNotDeliveredInfo.js"></script> <script src="views/confirmNotDeliveredInfo/confirmNotDeliveredInfo.js"></script>
<script src="views/machinePackageImport/machinePackageImport.js"></script> <script src="views/machinePackageImport/machinePackageImport.js"></script>
<script src="views/addAuditFailure/addAuditFailure.js"></script> <script src="views/addAuditFailure/addAuditFailure.js"></script>
<script src="views/historyTagPrint/historyTagPrint.js"></script>
</body> </body>
</html> </html>
\ No newline at end of file
src/main/resources/static/js/app.js
View file @ 2c79fe34
...@@ -47,6 +47,7 @@ angular.module('AvatarCheck', [ ...@@ -47,6 +47,7 @@ angular.module('AvatarCheck', [
"AvatarCheck.confirmNotDeliveredInfo", "AvatarCheck.confirmNotDeliveredInfo",
'AvatarCheck.getPoliceList', 'AvatarCheck.getPoliceList',
"AvatarCheck.machinePackageImport", "AvatarCheck.machinePackageImport",
"AvatarCheck.historyTagPrint",
'AvatarCheck.blank', 'AvatarCheck.blank',
'AvatarCheck.addAuditFailure' 'AvatarCheck.addAuditFailure'
]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider',function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) { ]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider',function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) {
......
src/main/resources/static/js/service.js
View file @ 2c79fe34
...@@ -1985,6 +1985,48 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -1985,6 +1985,48 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
}) })
} },
getTagPrintHistoryData:function(date, success) {
$http({
method: 'GET',
url: "../ReceiptApi/selectRecriptInHistory" + urlTimeStamp(),
params:{
date:date,
name:$rootScope.loginData.name
}
}).then(function successCallback(response) {
success(response.data)
})
},
selectDetailListInHistory:function(date,idCard,startDate,endDate,success) {
$http({
method: 'GET',
url: "../ReceiptApi/selectDetailListInHistory" + urlTimeStamp(),
params:{
date:date,
cardId: idCard,
startDate: startDate,
endDate: endDate,
name:$rootScope.loginData.name
}
}).then(function successCallback(response) {
success(response.data)
})
},
judgeCardInDetailReceiptList:function (groupNo,cardId,startDate,endDate) {
debugger
$http({
method: 'GET',
url: "../ReceiptApi/judgeCardInDetailReceiptList" + urlTimeStamp(),
params:{
groupNo:groupNo,
cardId: cardId,
startDate: startDate,
endDate: endDate
}
}).then(function successCallback(response) {
success(response.data)
})
},
} }
}); });
\ No newline at end of file
src/main/resources/static/views/confirmNotDeliveredInfo/confirmNotDeliveredInfo.js
View file @ 2c79fe34
...@@ -121,8 +121,8 @@ angular.module("AvatarCheck.confirmNotDeliveredInfo",['ngRoute', 'AvatarCheck.ht ...@@ -121,8 +121,8 @@ angular.module("AvatarCheck.confirmNotDeliveredInfo",['ngRoute', 'AvatarCheck.ht
LODOP.SET_PRINT_STYLEA(4, "Bold", 1); LODOP.SET_PRINT_STYLEA(4, "Bold", 1);
LODOP.SET_PRINT_STYLEA(4, "Alignment", 2); LODOP.SET_PRINT_STYLEA(4, "Alignment", 2);
LODOP.SET_PRINT_STYLEA(4, "FontSize", 12); LODOP.SET_PRINT_STYLEA(4, "FontSize", 12);
// LODOP.PREVIEW(); LODOP.PREVIEW();
LODOP.PRINT(); // LODOP.PRINT();
} }
//接收并打印标签 //接收并打印标签
......
src/main/resources/static/views/downloadGongan/downloadGongan.html
View file @ 2c79fe34
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="police in item.list"> <tr ng-repeat="police in item.list | orderBy:'QR_CODE'">
<td><input type="checkbox" ng-checked="all" name="checkPolice{{item.date}}" value="{{police.ID}}" class="checkPoliceBox"></td> <td><input type="checkbox" ng-checked="all" name="checkPolice{{item.date}}" value="{{police.ID}}" class="checkPoliceBox"></td>
<td>{{$index+1}}</td> <td>{{$index+1}}</td>
<td>{{police.POLICE_CODE}}</td> <td>{{police.POLICE_CODE}}</td>
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="police in item.list"> <tr ng-repeat="police in item.list | orderBy:'QR_CODE'">
<td><input type="checkbox" ng-checked="all" name="checkPolice{{item.date}}" value="{{police.ID}}" class="checkPoliceBox"></td> <td><input type="checkbox" ng-checked="all" name="checkPolice{{item.date}}" value="{{police.ID}}" class="checkPoliceBox"></td>
<td>{{$index+1}}</td> <td>{{$index+1}}</td>
<td>{{police.POLICE_CODE}}</td> <td>{{police.POLICE_CODE}}</td>
......
src/main/resources/static/views/historyTagPrint/historyTagPrint.html 0 → 100644
View file @ 2c79fe34
<style>
.postTable th, .postTable td {
text-align: center;
vertical-align: middle!important;
}
</style>
<section class="content row">
<div class="col-md-12 no-padding" style="margin-top:20px;">
<div class="box">
<div class="box-header with-border">
<strong >标签打印历史</strong>
</div>
<form name="myform" class="box box-primary" style="padding: 7px;padding-top: 0;">
<table class="table table-bordered postTable" style="margin-bottom: 0;">
<tr>
<td width="200px"><span>选择日期:</span></td>
<td width="200px">
<input type="text" class="form-control" ng-model="choseDate" id="datepicker" readonly/>
</td>
<td style="text-align: left;">
<button class="btn btn-primary" ng-click="getTagPrintHistory()">查询历史</button>
</td>
</tr>
</table>
</form>
</div>
</div>
<div class="col-md-12 no-padding" ng-if="tagPrintHistoryData.length>0">
<div class="box">
<div class="box-header with-border">
<strong>标签重打</strong>
</div>
<form name="myform" class="box box-primary" style="padding: 7px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td style="text-align: center;vertical-align: middle!important;">身份证号:</td>
<td>
<input type="text" name="idCard" class="form-control" placeholder="身份证号" ng-model="idCard"/>
</td>
<td style="text-align: center;vertical-align: middle!important;">
有效期:
</td>
<td>
<input class="form-control" name="yxqstart" type="text" ng-model="startDate" placeholder="起始日期">
</td>
<td style="text-align: center;vertical-align: middle!important;">至</td>
<td><input class="form-control" name="yxqend" type="text" ng-model="endDate" placeholder="截至日期"></td>
<td style="text-align: left;">
<button class="btn btn-primary" ng-click="doQueryByIdCard(idCard,startDate,endDate)">查询</button>
<button class="btn btn-primary" ng-click="startReading()">开始读卡</button>
<button class="btn btn-primary" ng-click="endReading()">停止读卡</button>
</td>
</tr>
</table>
</form>
</div>
</div>
<div class="row">
<div class="col-md-5">
<div class="box box-default">
<div class="box-header with-border">
<strong >组号信息</strong>
</div>
<div class="box box-body">
<div style="padding:0" >
<table class="table table-bordered postTable" ng-if="tagPrintHistoryData.length>0">
<thead>
<tr>
<th>NO.</th>
<!--<th>派出所代码</th>-->
<th>受理组号</th>
<th>派出所名称</th>
<th>数量</th>
<th>打印卸载</th>
<th>电质检</th>
</tr>
</thead>
<tbody>
<tr ng-click="showDetail(item)" ng-repeat="item in tagPrintHistoryData" class="{{item.styleClass}}">
<td>{{$index+1}}</td>
<!--<td>{{item.POLICE_CODE}}</td>-->
<td>{{item.QR_CODE}}</td>
<td>{{item.GAJG_MC}}
</td>
<td>{{item.FINISH_COUNT}}</td>
<td>{{item.download}}</td>
<td>{{item.electricCount}}</td>
</tr>
</tbody>
</table>
<h4 class="col-md-7" ng-if="tagPrintHistoryData.length==0" style="padding: 0;">
暂无数据
</h4>
</div>
</div>
</div>
</div>
<div class="col-md-7">
<div class="box box-default">
<div class="box-header with-border">
<strong >组号详情信息</strong>
</div>
<div class="box box-body">
<div>
<table class="table table-bordered" ng-if="tagPrintHistoryData.length>0">
<thead>
<tr>
<th>No.</th>
<th>受理号</th>
<th>姓名</th>
<th>身份证号</th>
<th>打印标记</th>
<th>电写标记</th>
<th>电质检标记</th>
</tr>
</thead>
<tbody>
<tr ng-show="json.isShow" ng-repeat="item in json.policeCardsList | orderBy:'acceptNo'" class="{{item.styleClass}}">
<td>{{$index+1}}</td>
<td>{{item.ACCEPT_NO}}</td>
<td>{{item.NAME}}</td>
<td>{{item.CARD_ID}}</td>
<td>
<span ng-if="item.DOWNLOAD_DATE==null"
style="color: red"
class="glyphicon glyphicon-remove">
</span>
<span ng-if="item.DOWNLOAD_DATE!=null"
style="size: 6px">{{item.DOWNLOAD_DATE | date:'MM-dd hh:mm'}}</span>
</td>
<td>
<span ng-if="item.ELECTRIC_WRITE_DATE==null"
style="color: red"
class="glyphicon glyphicon-remove">
</span>
<span ng-if="item.ELECTRIC_WRITE_DATE!=null"
style="size: 6px">{{item.ELECTRIC_WRITE_DATE| date:'MM-dd hh:mm'}}</span>
</td>
<td>
<span ng-if="item.CHECK_DATE==null"
style="color: red"
class="glyphicon glyphicon-remove">
</span>
<span ng-if="item.CHECK_DATE!=null"
style="size: 6px">{{item.CHECK_DATE| date:'MM-dd hh:mm'}}</span>
</td>
</tr>
</tbody>
</table>
<h4 class="col-md-7" ng-if="tagPrintHistoryData.length==0" style="padding: 0;">
暂无详情信息
</h4>
<div ng-show="json.isShow" class="box-footer clearfix" style="border: 0;">
<button class="btn btn-info pull-right" style="margin-right: 20px;" ng-click="PreviewMytableRotate()">打印标签</button>
<!--<button class="btn btn-info pull-right" style="margin-right: 20px;" ng-click="closeRight()">关闭</button>-->
</div>
</div>
</div>
</div>
</div>
</div>
</section>
<div style="display: none;">
<!--<div id="div1">
<p>
<object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0>
<embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0 pluginspage="install_lodop32.exe"></embed>
</object>
</p>
<div style="font-family:'黑体';height:7mm;position: absolute;top:5mm;left:4mm;">{{json.policeData}}</div>
<div style="font-family:'黑体';height:7mm;position: absolute;top:12mm;left:3mm;">{{json.policeName}}</div>
<div style="font-family:'黑体';height:7mm;position: absolute;top:20mm;left:5mm;">数量：{{json.count}}张</div>
</div>-->
<div id="tagDiv">
<p>
<object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA"
width=0 height=0>
<embed id="LODOP_EM" type="application/x-print-lodop"
width=0 height=0 pluginspage="install_lodop32.exe"></embed>
</object>
</p >
<!--<div style="font-size:3mm ;">
<p style="text-align:center;margin:1mm 0mm 0mm 0mm;">
<span style="font-size:5mm ;">{{json.policeData}}</span>
</p>
<p style="text-align:center;margin:1.7mm 0mm 0mm 0mm;">
<span style="font-size: 3.5mm;">{{json.policeName}}</span>
</p>
<p style="text-align:center;margin:1.7mm 0mm 0mm 0mm;">
<span style="">数量：
<span style="font-size:5mm;">{{json.count}}</span>张
</span>
</p>
</div>-->
</div>
</div>
src/main/resources/static/views/receitp/receitp.html
View file @ 2c79fe34
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<th width="10%">操作</th> <th width="10%">操作</th>
</tr> </tr>
</thead> </thead>
<tbody ng-repeat="item in type.countyList"> <tbody ng-repeat="item in type.countyList | orderBy:'countyCode'">
<tr style="background-color: #eee"> <tr style="background-color: #eee">
<td><input type="checkbox" ng-checked="all" class="check{{type.typeCode}}" ng-click="checkAllPolice($event,type.typeCode,item.countyCode)"></td> <td><input type="checkbox" ng-checked="all" class="check{{type.typeCode}}" ng-click="checkAllPolice($event,type.typeCode,item.countyCode)"></td>
<td>{{item.countyCode}}</td> <td>{{item.countyCode}}</td>
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<th>交接单打印时间</th> <th>交接单打印时间</th>
</tr> </tr>
</thead> </thead>
<tbody ng-repeat="item in type.countyList"> <tbody ng-repeat="item in type.countyList | orderBy:'countyCode'">
<tr style="background-color: #eee"> <tr style="background-color: #eee">
<td><input type="checkbox" ng-checked="all" class="check{{type.typeCode}}" ng-click="checkAllPolice($event,type.typeCode,item.countyCode)"></td> <td><input type="checkbox" ng-checked="all" class="check{{type.typeCode}}" ng-click="checkAllPolice($event,type.typeCode,item.countyCode)"></td>
<td>{{item.countyCode}}</td> <td>{{item.countyCode}}</td>
......
src/main/resources/static/views/receitp/receitp.js
View file @ 2c79fe34
...@@ -197,16 +197,16 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http']) ...@@ -197,16 +197,16 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
} }
$scope.result = []; $scope.result = [];
for(var i=0;i<$scope.receitpDataToPrint.list[0].countyList.length;i++){ for(var i=0;i<$scope.receitpDataToPrint.list[0].countyList.length;i++){
for (var j=0;j<$scope.receitpDataToPrint.list[0].countyList[i].policeList.length;j+=37){ for (var j=0;j<$scope.receitpDataToPrint.list[0].countyList[i].policeList.length;j+=34){
var json = {}; var json = {};
if(($scope.receitpDataToPrint.list[0].countyList[i].policeList.length-j)>37){ if(($scope.receitpDataToPrint.list[0].countyList[i].policeList.length-j)>34){
json.value = 1 json.value = 1
}else{ }else{
json.value = 0; json.value = 0;
} }
json.county = $scope.receitpDataToPrint.list[0].countyList[i].countyName; json.county = $scope.receitpDataToPrint.list[0].countyList[i].countyName;
json.total = $scope.receitpDataToPrint.list[0].countyList[i].countyValidCount; json.total = $scope.receitpDataToPrint.list[0].countyList[i].countyValidCount;
json.policeList = $scope.receitpDataToPrint.list[0].countyList[i].policeList.slice(j,j+37); json.policeList = $scope.receitpDataToPrint.list[0].countyList[i].policeList.slice(j,j+34);
$scope.result.push(json); $scope.result.push(json);
} }
} }
...@@ -223,7 +223,7 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http']) ...@@ -223,7 +223,7 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
// LODOP.SET_PRINT_STYLEA(1, "Bold", 1); // LODOP.SET_PRINT_STYLEA(1, "Bold", 1);
LODOP.SET_PRINT_STYLEA(1, "Alignment", 2); LODOP.SET_PRINT_STYLEA(1, "Alignment", 2);
LODOP.SET_PRINT_STYLEA(1, "FontSize", 16); LODOP.SET_PRINT_STYLEA(1, "FontSize", 16);
LODOP.ADD_PRINT_TEXT(35, 0, "100%", 20, $scope.result[i].county +" 证件交接单"); LODOP.ADD_PRINT_TEXT(35, 0, "100%", 20, $scope.result[i].county +"证件交接单");
// LODOP.SET_PRINT_STYLEA(2, "Bold", 1); // LODOP.SET_PRINT_STYLEA(2, "Bold", 1);
LODOP.SET_PRINT_STYLEA(2, "Alignment", 2); LODOP.SET_PRINT_STYLEA(2, "Alignment", 2);
LODOP.SET_PRINT_STYLEA(2, "FontSize", 16); LODOP.SET_PRINT_STYLEA(2, "FontSize", 16);
......
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