Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 1b6ea55f authored by wuzhilong's avatar wuzhilong
Browse files
Options

更新制证包生成：添加民族文字制证包解析和下载； 

公安网反馈下载：更新派出所代码，派出所名称；
本地dblink改为yddblink
parent 55aaa3e5
Hide whitespace changes
Inline Side-by-side
Showing with 214 additions and 38 deletions
src/main/java/com/yxproject/start/api/ExportXMLApi.java
View file @ 1b6ea55f
......@@ -153,6 +153,7 @@ public class ExportXMLApi {
String xml = null;
try {
//生成XML制证包
xml = createToMakePackageXML(preproPersonEntityList1, finalFilesEntity, "\\zhang");
} catch (Exception e) {
......@@ -294,6 +295,29 @@ public class ExportXMLApi {
NO++;
preproPersonEntity.setNewFileId(newFilesEntity.getId());
cardType = preproPersonEntity.getCardTypeId();
//民族文字 sid=010210
if (preproPersonEntity.getSid().equals("010210")){
Element XMMZWZ = RECORD.addElement("XMMZWZ");
XMMZWZ.setText(replaceNullString(preproPersonEntity.getXmmzwz()));
Element XBMZWZ = RECORD.addElement("XBMZWZ");
XBMZWZ.setText(replaceNullString(preproPersonEntity.getXbmzwz()));
Element MZMZWZ = RECORD.addElement("MZMZWZ");
MZMZWZ.setText(replaceNullString(preproPersonEntity.getMzmzwz()));
Element ZZHYMZWZ = RECORD.addElement("ZZHYMZWZ");
ZZHYMZWZ.setText(replaceNullString(preproPersonEntity.getZzhymzwz()));
Element ZZHEMZWZ = RECORD.addElement("ZZHEMZWZ");
ZZHEMZWZ.setText(replaceNullString(preproPersonEntity.getZzhemzwz()));
Element ZZHSMZWZ = RECORD.addElement("ZZHSMZWZ");
ZZHSMZWZ.setText(replaceNullString(preproPersonEntity.getZzhsmzwz()));
Element QFJGMZWZ = RECORD.addElement("QFJGMZWZ");
QFJGMZWZ.setText(replaceNullString(preproPersonEntity.getQfjgmzwz()));
}
}
threadPool.execute(new Runnable() {
@Override
......
src/main/java/com/yxproject/start/dto/PreproPersonDto.java
View file @ 1b6ea55f
......@@ -42,6 +42,14 @@ public class PreproPersonDto {
private long id;
private long isValid;
private String tpPath;
//少数民族文字
private String xmmzwz;
private String xbmzwz;
private String mzmzwz;
private String zzhymzwz;
private String zzhemzwz;
private String zzhsmzwz;
private String qfjgmzwz;
@Id
@Column(name = "ID")
......@@ -381,4 +389,117 @@ public class PreproPersonDto {
public void setTpPath(String tpPath) {
this.tpPath = tpPath;
}
//少数民族文字
@Basic
@Column(name = "XMMZWZ")
public String getXmmzwz() {
return xmmzwz;
}
public void setXmmzwz(String xmmzwz) {
this.xmmzwz = xmmzwz;
}
@Basic
@Column(name = "XBMZWZ")
public String getXbmzwz() {
return xbmzwz;
}
public void setXbmzwz(String xbmzwz) {
this.xbmzwz = xbmzwz;
}
@Basic
@Column(name = "MZMZWZ")
public String getMzmzwz() {
return mzmzwz;
}
public void setMzmzwz(String mzmzwz) {
this.mzmzwz = mzmzwz;
}
@Basic
@Column(name = "ZZHYMZWZ")
public String getZzhymzwz() {
return zzhymzwz;
}
public void setZzhymzwz(String zzhymzwz) {
this.zzhymzwz = zzhymzwz;
}
@Basic
@Column(name = "ZZHEMZWZ")
public String getZzhemzwz() {
return zzhemzwz;
}
public void setZzhemzwz(String zzhemzwz) {
this.zzhemzwz = zzhemzwz;
}
@Basic
@Column(name = "ZZHSMZWZ")
public String getZzhsmzwz() {
return zzhsmzwz;
}
public void setZzhsmzwz(String zzhsmzwz) {
this.zzhsmzwz = zzhsmzwz;
}
@Basic
@Column(name = "QFJGMZWZ")
public String getQfjgmzwz() {
return qfjgmzwz;
}
public void setQfjgmzwz(String qfjgmzwz) {
this.qfjgmzwz = qfjgmzwz;
}
@Override
public String toString() {
return "PreproPersonDto{" +
"jmsfzslh='" + jmsfzslh + '\'' +
", gmsfhm='" + gmsfhm + '\'' +
", xm='" + xm + '\'' +
", xbdm='" + xbdm + '\'' +
", mzdm='" + mzdm + '\'' +
", dwmc='" + dwmc + '\'' +
", dwdm='" + dwdm + '\'' +
", csrq='" + csrq + '\'' +
", ssxqdm='" + ssxqdm + '\'' +
", dzmc='" + dzmc + '\'' +
", sdxp='" + sdxp + '\'' +
", zwyZwtxsj='" + zwyZwtxsj + '\'' +
", zwyZwtzsj='" + zwyZwtzsj + '\'' +
", zweZwtxsj='" + zweZwtxsj + '\'' +
", zweZwtzsj='" + zweZwtzsj + '\'' +
", qfjgGajgmc='" + qfjgGajgmc + '\'' +
", yxqqsrq='" + yxqqsrq + '\'' +
", yxqjzrq='" + yxqjzrq + '\'' +
", jmsfzslyydm='" + jmsfzslyydm + '\'' +
", jmsfzzzlxdm='" + jmsfzzzlxdm + '\'' +
", jmsfzlzfsdm='" + jmsfzlzfsdm + '\'' +
", sjrXm='" + sjrXm + '\'' +
", sjrLxdh='" + sjrLxdh + '\'' +
", sjrYzbm='" + sjrYzbm + '\'' +
", sjrTxdz='" + sjrTxdz + '\'' +
", sid='" + sid + '\'' +
", no='" + no + '\'' +
", fileId=" + fileId +
", cardTypeId=" + cardTypeId +
", newFileId=" + newFileId +
", state=" + state +
", id=" + id +
", isValid=" + isValid +
", tpPath='" + tpPath + '\'' +
", xmmzwz='" + xmmzwz + '\'' +
", xbmzwz='" + xbmzwz + '\'' +
", mzmzwz='" + mzmzwz + '\'' +
", zzhymzwz='" + zzhymzwz + '\'' +
", zzhemzwz='" + zzhemzwz + '\'' +
", zzhsmzwz='" + zzhsmzwz + '\'' +
", qfjgmzwz='" + qfjgmzwz + '\'' +
'}';
}
}
src/main/java/com/yxproject/start/mapper/DetailReceiptListMapper.java
View file @ 1b6ea55f
......@@ -21,13 +21,13 @@ public interface DetailReceiptListMapper {
* @return
*/
@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,\n" +
"to_char(RECEIPT_LIST.CHECK_DATE,'yyyyMMdd') CHECK_DATE,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" +
"from DETAIL_RECEIPT_LIST left join RECEIPT_LIST on DETAIL_RECEIPT_LIST.RECEIPT_ID = RECEIPT_LIST.ID\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" +
"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" +
"where RECEIPT_LIST.id in (${str}) " +
" order by DETAIL_RECEIPT_LIST.ACCEPT_NO " +
"")
"left join PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO = DETAIL_RECEIPT_LIST.POLICE_CODE\n" +
"where RECEIPT_LIST.id in (${str}) order by DETAIL_RECEIPT_LIST.ACCEPT_NO ")
public List<Map<String, Object>> selectPostDetails(@Param("str") String str);
......@@ -47,9 +47,9 @@ public interface DetailReceiptListMapper {
@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" +
"from RECEIPT_LIST \n" +
"left join PROD_DBA.DIC_UPLOAD_UNIT_T@PROD_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" +
"where DOWNLOAD_DATE is null and RECEIPT_LIST.id in (${str}) order by receipt_date")
"where RECEIPT_LIST.id in (${str}) order by receipt_date")
public List<Map<String, Object>> selectPoliceDataById(@Param("str") String str);
/**
......
src/main/java/com/yxproject/start/mapper/PoliceStationApplyReasonMapper.java
View file @ 1b6ea55f
......@@ -15,7 +15,7 @@ import java.util.List;
public interface PoliceStationApplyReasonMapper {
@Select("SELECT SUBSTR(B.UPLOAD_NO,0,9) police_station_code,B.DRAW_TYPE,count(b.UPLOAD_NO) apply_count from GROUP_NO a\n" +
" LEFT JOIN PROD_DBA.PROD_APPLY_INFO_T@PRODYD_LINK b ON a.GROUP_NO=substr(b.ACCEPT_NO,0,8)\n" +
" LEFT JOIN PRODYD_DBA.PROD_APPLY_INFO_T@PRODYD_LINK b ON a.GROUP_NO=substr(b.ACCEPT_NO,0,8)\n" +
"WHERE TASK_ID=#{taskId} GROUP BY SUBSTR(B.UPLOAD_NO,0,9),B.DRAW_TYPE")
public List<PoliceApplyCountDto> getPoliceStationApplyReason(@Param("taskId") String taskId);
......
src/main/java/com/yxproject/start/mapper/PreproPersonMapper.java
View file @ 1b6ea55f
......@@ -14,9 +14,10 @@ import java.util.Map;
public interface PreproPersonMapper {
/*导入XMl*/
@Insert("INSERT INTO PREPRO_PERSON (JMSFZSLH,GMSFHM,XM,XBDM,MZDM,CSRQ,SSXQDM,DZMC," +
"QFJG_GAJGMC,YXQQSRQ,YXQJZRQ,JMSFZSLYYDM,JMSFZZZLXDM,JMSFZLZFSDM,SJR_XM,SJR_LXDH,SJR_YZBM,SJR_TXDZ,SID,FILE_ID,TP_PATH)" +
"QFJG_GAJGMC,YXQQSRQ,YXQJZRQ,JMSFZSLYYDM,JMSFZZZLXDM,JMSFZLZFSDM,SJR_XM,SJR_LXDH,SJR_YZBM,SJR_TXDZ,SID,FILE_ID,TP_PATH," +
"XMMZWZ,XBMZWZ,MZMZWZ,ZZHYMZWZ,ZZHEMZWZ,ZZHSMZWZ,QFJGMZWZ)" +
"VALUES(#{jmsfzslh},#{gmsfhm},#{xm},#{xbdm},#{mzdm},#{csrq},#{ssxqdm},#{dzmc},#{qfjgGajgmc},#{yxqqsrq},#{yxqjzrq},#{jmsfzslyydm},#{jmsfzzzlxdm},#{jmsfzlzfsdm},#{sjrXm},#{sjrLxdh},#{sjrYzbm}," +
"#{sjrTxdz},#{sid},#{fileId},#{tpPath})")
"#{sjrTxdz},#{sid},#{fileId},#{tpPath},#{xmmzwz},#{xbmzwz},#{mzmzwz},#{zzhymzwz},#{zzhemzwz},#{zzhsmzwz},#{qfjgmzwz})")
@Options(useGeneratedKeys=true, keyProperty="id", keyColumn="ID")
public boolean savePreproPersonEntity(PreproPersonDto preproPersonDto);
......@@ -152,7 +153,8 @@ public interface PreproPersonMapper {
"SELECT PREPRO_PERSON.JMSFZSLH JMSFZSLH,PREPRO_PERSON.GMSFHM GMSFHM,PREPRO_PERSON.XM XM,PREPRO_PERSON.XBDM XBDM,PREPRO_PERSON.MZDM MZDM, PREPRO_PERSON.CSRQ CSRQ,PREPRO_PERSON.SSXQDM SSXQDM,\n" +
"PREPRO_PERSON.DZMC DZMC,PREPRO_PERSON.QFJG_GAJGMC QFJG_GAJGMC,PREPRO_PERSON.YXQQSRQ YXQQSRQ, PREPRO_PERSON.YXQJZRQ YXQJZRQ,PREPRO_PERSON.JMSFZSLYYDM JMSFZSLYYDM,PREPRO_PERSON.JMSFZZZLXDM JMSFZZZLXDM,\n" +
"PREPRO_PERSON.JMSFZLZFSDM JMSFZLZFSDM, PREPRO_PERSON.SJR_XM SJR_XM,PREPRO_PERSON.SJR_LXDH SJR_LXDH,PREPRO_PERSON.SJR_YZBM SJR_YZBM,PREPRO_PERSON.SJR_TXDZ SJR_TXDZ,PREPRO_PERSON.SID SID, \n" +
"PREPRO_PERSON.FILE_ID FILE_ID,PREPRO_PERSON.CARD_TYPE_ID CARD_TYPE_ID,PREPRO_PERSON.NEW_FILE_ID NEW_FILE_ID,PREPRO_PERSON.STATE STATE,PREPRO_PERSON.ID ID, PREPRO_PERSON.IS_VALID IS_VALID,PREPRO_PERSON.TP_PATH TP_PATH, \n" +
"PREPRO_PERSON.FILE_ID FILE_ID,PREPRO_PERSON.CARD_TYPE_ID CARD_TYPE_ID,PREPRO_PERSON.NEW_FILE_ID NEW_FILE_ID,PREPRO_PERSON.STATE STATE,PREPRO_PERSON.ID ID, PREPRO_PERSON.IS_VALID IS_VALID,PREPRO_PERSON.TP_PATH TP_PATH," +
"prepro_person.XMMZWZ,prepro_person.XBMZWZ,prepro_person.MZMZWZ,prepro_person.ZZHYMZWZ,prepro_person.ZZHEMZWZ,prepro_person.ZZHSMZWZ,prepro_person.QFJGMZWZ, \n" +
"FILES.VERSION_CODE VERSION_CODE,FILES.DWDM DWDM,FILES.DWMC DWMC, FILES.RECORD_NUMBER RECORD_NUMBER,FILES.CREATE_TIME CREATE_TIME,FILES.SOURCE_FILE_NAME SOURCE_FILE_NAME,FILES.NEW_TIME NEW_TIME,\n" +
"FILES.UPLOAD_DATE UPLOAD_DATE, NEW_FILES.CREATE_DATE CREATE_DATE,NEW_FILES.NEW_FILE_NAME NEW_FILE_NAME \n" +
"FROM PREPRO_PERSON \n" +
......
src/main/java/com/yxproject/start/mapper/ReceiptMapper.java
View file @ 1b6ea55f
......@@ -107,9 +107,9 @@ public interface ReceiptMapper {
//根据身份证号查询交接单详单信息(特殊情况，不存在导入制证包)
@Select("select prod_card_t.upload_no,PROD_CARD_T.ACCEPT_NO,prod_card_t.name,prod_card_t.SEX_NO,prod_card_t.id_no," +
"DIC_UPLOAD_UNIT_T.UNIT_NAME AS GAJG_MC,PROD_CARD_T.SIGN_GOVT,DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO AS GAJG_DM,receipt_list.ID\n" +
"from PRODYD_DBA.prod_card_t@PROD_LINK \n" +
"LEFT JOIN PRODYD_DBA.PROD_GROUP_RELATION_T@PROD_LINK on PROD_GROUP_RELATION_T.GROUP_NO = subStr(prod_card_t.ACCEPT_NO,0,8) \n" +
"LEFT JOIN PRODYD_DBA.DIC_UPLOAD_UNIT_T@PROD_LINK ON PROD_GROUP_RELATION_T.UPLOAD_UNIT_NO=DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO \n" +
"from PRODYD_DBA.prod_card_t@PRODYD_LINK \n" +
"LEFT JOIN PRODYD_DBA.PROD_GROUP_RELATION_T@PRODYD_LINK on PROD_GROUP_RELATION_T.GROUP_NO = subStr(prod_card_t.ACCEPT_NO,0,8) \n" +
"LEFT JOIN PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK ON PROD_GROUP_RELATION_T.UPLOAD_UNIT_NO=DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO \n" +
"left join receipt_list on receipt_list.QR_CODE =prod_card_t.accept_no \n" +
"where prod_card_t.id_no=#{id} and prod_card_t.BEGIN_DATE= #{beginDate} and prod_card_t.EXPIRE_DATE = #{expireDate}")
public Map<String,Object>selectDetailedData3(@Param("id")String id,@Param("beginDate")String beginDate,@Param("expireDate")String expireDate);
......@@ -213,10 +213,10 @@ public interface ReceiptMapper {
@Select("<script>" +
"select RECEIPT_LIST.id,RECEIPT_LIST.QR_CODE,RECEIPT_LIST.RECEIPT_DATE,RECEIPT_LIST.POLICE_CODE,decode(RECEIPT_LIST.Old_CARD_TYPE_ID,null,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.Old_CARD_TYPE_ID) CARD_TYPE_ID,\n" +
"RECEIPT_LIST.FINISH_COUNT,subStr(DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,0,9) GAJG_DM,DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC,RECEIPT_LIST.CHECK_DATE,RECEIPT_LIST.CHECK_NAME\n" +
"RECEIPT_LIST.FINISH_COUNT,DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO GAJG_DM,DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC,RECEIPT_LIST.CHECK_DATE,RECEIPT_LIST.CHECK_NAME\n" +
",CARD_TYPE_DIC.CARD_TYPE,COUNTY_DIC.COUNTY_CODE ,COUNTY_DIC.COUNTYNAME,RECEIPT_LIST.state,RECEIPT_LIST.IS_PRINT from RECEIPT_LIST \n" +
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = decode(RECEIPT_LIST.Old_CARD_TYPE_ID,null,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.Old_CARD_TYPE_ID)\n" +
"left join PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on subStr(DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,0,9) = 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 COUNTY_DIC on substr(RECEIPT_LIST.POLICE_CODE,0,6) = COUNTY_DIC.COUNTY_CODE" +
" where CHECK_DATE is not null and RECEIPT_LIST.IS_PRINT = 0 " +
"<if test ='startDate != null'> " +
......@@ -230,10 +230,10 @@ public interface ReceiptMapper {
@Select("select RECEIPT_LIST.id,RECEIPT_LIST.QR_CODE,RECEIPT_LIST.RECEIPT_DATE,RECEIPT_LIST.POLICE_CODE,decode(RECEIPT_LIST.Old_CARD_TYPE_ID,null,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.Old_CARD_TYPE_ID) CARD_TYPE_ID,\n" +
"RECEIPT_LIST.FINISH_COUNT,subStr(DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,0,9) GAJG_DM,DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC,RECEIPT_LIST.CHECK_DATE,RECEIPT_LIST.CHECK_NAME\n" +
"RECEIPT_LIST.FINISH_COUNT,DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO GAJG_DM,DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC,RECEIPT_LIST.CHECK_DATE,RECEIPT_LIST.CHECK_NAME\n" +
",CARD_TYPE_DIC.CARD_TYPE,COUNTY_DIC.COUNTY_CODE ,COUNTY_DIC.COUNTYNAME,RECEIPT_LIST.state,RECEIPT_LIST.IS_PRINT from RECEIPT_LIST \n" +
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = decode(RECEIPT_LIST.Old_CARD_TYPE_ID,null,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.Old_CARD_TYPE_ID)\n" +
"left join PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on subStr(DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,0,9) = 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 COUNTY_DIC on substr(RECEIPT_LIST.POLICE_CODE,0,6) = COUNTY_DIC.COUNTY_CODE" +
" where to_char(RECEIPT_DATE,'yyyyMMddhhmmss') BETWEEN ${startDate} and ${endDate} order by RECEIPT_LIST.id ")
public List<Map<String,Object>> selectReceiptDateByReceiptDate(@Param("startDate") String startDate,@Param("endDate") String endDate);
......@@ -287,7 +287,7 @@ public interface ReceiptMapper {
@Select("select RECEIPT_LIST.id,QR_CODE,to_char(DOWNLOAD_DATE,'yyyyMMddHH24') receipt_date ,\n" +
"POLICE_CODE,FINISH_COUNT,RECEIPT_LIST.CARD_TYPE_ID,DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC,CARD_TYPE_DIC.CARD_TYPE\n" +
"from RECEIPT_LIST \n" +
"left join PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on subStr(DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,0,9) = 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" +
"where to_char(DOWNLOAD_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate}")
public List<Map<String, Object>> selectPoliceDataByDownLoadDate(@Param("startDate") String startDate,@Param("endDate") String endDate);
......
src/main/java/com/yxproject/start/utils/ExportExcel.java
View file @ 1b6ea55f
......@@ -57,24 +57,26 @@ public class ExportExcel {
cell = row.createCell(3); //设定值
cell.setCellValue("性别");
cell = row.createCell(4); //设定值
cell.setCellValue("派出所代码");
cell.setCellValue("派出所名称");
cell = row.createCell(5); //设定值
cell.setCellValue("身份证号");
cell.setCellValue("派出所代码");
cell = row.createCell(6); //设定值
cell.setCellValue("条形码号");
cell.setCellValue("身份证号");
cell = row.createCell(7); //设定值
cell.setCellValue("签发机关");
cell.setCellValue("条形码号");
cell = row.createCell(8); //设定值
cell.setCellValue("运单号");
cell.setCellValue("签发机关");
cell = row.createCell(9); //设定值
cell.setCellValue("制证类型");
cell.setCellValue("运单号");
cell = row.createCell(10); //设定值
cell.setCellValue("原制证类型");
cell.setCellValue("制证类型");
cell = row.createCell(11); //设定值
cell.setCellValue("交接日期");
cell.setCellValue("原制证类型");
cell = row.createCell(12); //设定值
cell.setCellValue("交接人");
cell.setCellValue("复核日期");
cell = row.createCell(13); //设定值
cell.setCellValue("复核人");
cell = row.createCell(14); //设定值
cell.setCellValue("备注");
for (int i =0;i<mapList.size();i++){
......@@ -88,25 +90,28 @@ public class ExportExcel {
cell = row.createCell(3); //设定值
cell.setCellValue("null".equals(mapList.get(i).get("SEX")+"")?"":mapList.get(i).get("SEX")+"");
cell = row.createCell(4); //设定值
cell.setCellValue("null".equals(mapList.get(i).get("POLICE_CODE")+"")?"":mapList.get(i).get("POLICE_CODE")+"");
cell.setCellValue("null".equals(mapList.get(i).get("POLICE_NAME")+"")?"":mapList.get(i).get("POLICE_NAME")+"");
cell = row.createCell(5); //设定值
cell.setCellValue("null".equals(mapList.get(i).get("CARD_ID")+"")?"":mapList.get(i).get("CARD_ID")+"");
cell.setCellValue("null".equals(mapList.get(i).get("POLICE_CODE")+"")?"":mapList.get(i).get("POLICE_CODE")+"");
cell = row.createCell(6); //设定值
cell.setCellValue("null".equals(mapList.get(i).get("QR_CODE")+"")?"":mapList.get(i).get("QR_CODE")+"");
cell.setCellValue("null".equals(mapList.get(i).get("CARD_ID")+"")?"":mapList.get(i).get("CARD_ID")+"");
cell = row.createCell(7); //设定值
cell.setCellValue("null".equals(mapList.get(i).get("SIGN_GOVT")+"")?"":mapList.get(i).get("SIGN_GOVT")+"");
cell.setCellValue("null".equals(mapList.get(i).get("QR_CODE")+"")?"":mapList.get(i).get("QR_CODE")+"");
cell = row.createCell(8); //设定值
cell.setCellValue("null".equals(mapList.get(i).get("WAYBILL_NUMBER")+"")?"":mapList.get(i).get("WAYBILL_NUMBER")+"");
cell.setCellValue("null".equals(mapList.get(i).get("SIGN_GOVT")+"")?"":mapList.get(i).get("SIGN_GOVT")+"");
cell = row.createCell(9); //设定值
cell.setCellValue("null".equals(mapList.get(i).get("CARD_TYPE_ID")+"")?"":mapList.get(i).get("CARD_TYPE_ID")+"");
cell.setCellValue("null".equals(mapList.get(i).get("WAYBILL_NUMBER")+"")?"":mapList.get(i).get("WAYBILL_NUMBER")+"");
cell = row.createCell(10); //设定值
cell.setCellValue("null".equals(mapList.get(i).get("OLD_CARD_TYPE_ID")+"")?"":mapList.get(i).get("OLD_CARD_TYPE_ID")+"");
cell.setCellValue("null".equals(mapList.get(i).get("CARD_TYPE_ID")+"")?"":mapList.get(i).get("CARD_TYPE_ID")+"");
cell = row.createCell(11); //设定值
cell.setCellValue(mapList.get(i).get("CHECK_DATE")+"");
cell.setCellValue("null".equals(mapList.get(i).get("OLD_CARD_TYPE_ID")+"")?"":mapList.get(i).get("OLD_CARD_TYPE_ID")+"");
cell = row.createCell(12); //设定值
cell.setCellValue("null".equals(mapList.get(i).get("CHECK_NAME")+"")?"":mapList.get(i).get("CHECK_NAME")+"");
cell.setCellValue(mapList.get(i).get("CHECK_DATE")+"");
cell = row.createCell(13); //设定值
cell.setCellValue("null".equals(mapList.get(i).get("CHECK_NAME")+"")?"":mapList.get(i).get("CHECK_NAME")+"");
cell = row.createCell(14); //设定值
cell.setCellValue("null".equals(mapList.get(i).get("NOTE")+"")?"":mapList.get(i).get("NOTE")+"");
}
HSSFSheet sheet1 = wb.createSheet("公安网信息交接表");
......
src/main/java/com/yxproject/start/utils/IDCardFactory.java
View file @ 1b6ea55f
......@@ -68,6 +68,30 @@ public class IDCardFactory {
preproPersonEntity.setSjrLxdh(e.element("SJR_LXDH").getStringValue());
preproPersonEntity.setSjrYzbm(e.element("SJR_YZBM").getStringValue());
preproPersonEntity.setSjrTxdz(e.element("SJR_TXDZ").getStringValue());
//民族文字 sid=010210
if(preproPersonEntity.getSid().equals("010210")) {
preproPersonEntity.setXmmzwz(e.element("XMMZWZ").getStringValue());
preproPersonEntity.setXbmzwz(e.element("XBMZWZ").getStringValue());
preproPersonEntity.setMzmzwz(e.element("MZMZWZ").getStringValue());
preproPersonEntity.setZzhymzwz(e.element("ZZHYMZWZ").getStringValue());
preproPersonEntity.setZzhemzwz(e.element("ZZHEMZWZ").getStringValue());
preproPersonEntity.setZzhsmzwz(e.element("ZZHSMZWZ").getStringValue());
preproPersonEntity.setQfjgmzwz(e.element("QFJGMZWZ").getStringValue());
}else if (preproPersonEntity.getSid().equals("010209")){
preproPersonEntity.setXmmzwz("");
preproPersonEntity.setXbmzwz("");
preproPersonEntity.setMzmzwz("");
preproPersonEntity.setZzhymzwz("");
preproPersonEntity.setZzhemzwz("");
preproPersonEntity.setZzhsmzwz("");
preproPersonEntity.setQfjgmzwz("");
}
preproPersonEntityList.add(preproPersonEntity);
}
resultMap.put("preproPerson",preproPersonEntityList);
......
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