Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit e1d43445 authored by liboyang's avatar liboyang
Browse files
Options

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

parents 3c9ee015 3cabe391
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 37 deletions
src/main/java/com/yxproject/start/api/FailedCardApi.java
View file @ e1d43445
......@@ -72,7 +72,7 @@ public class FailedCardApi {
for (Object o : jsonarray) {
String acceptNo = o.toString().replace("e", "E").replace("g", "G").replace("l", "L");
List<Map<String, Object>> resultMap = failedCardService.selectInfoByCardId(acceptNo);
if (resultMap == null) {
if (resultMap == null || resultMap.size() ==0) {
Map<String, Object> map = new LinkedHashMap<>();
map.put("ID_NO", o.toString());
map.put("NAME", "查无此人");
......
src/main/java/com/yxproject/start/api/ReceiptApi.java
View file @ e1d43445
......@@ -19,6 +19,7 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@RestController
@RequestMapping("ReceiptApi")
/**
......@@ -59,7 +60,7 @@ public class ReceiptApi {
//判断是否生成了交接单
if(mapList.size() == 0){
try {
//查询特证交接单所需数据
//查询特证交接单所需数据(制证库)
Map <String, Object> resultDate=receiptService.selectReceiptListDate(id, replaceDate(beginDate), replaceDate(expireDate));
ReceiptListEntity receiptListEntity=new ReceiptListEntity();
//邮寄证的单位代码设为人口大队的
......@@ -81,14 +82,18 @@ public class ReceiptApi {
receiptListEntity.setCheckName(name);
//生成特证交接单
long S=receiptService.createReceiptList(receiptListEntity);
//查询特证详单所需数据
//查询特证详单所需数据(盈信库)
Map <String, Object> detailedData=receiptService.selectDetailedData2(id, replaceDate(beginDate), replaceDate(expireDate));
String gajg_dm=(String) detailedData.get("GAJG_DM");
if (gajg_dm == null || "".equals(gajg_dm.trim())){
detailedData = receiptService.selectDetailedData3(id, replaceDate(beginDate), replaceDate(expireDate));
gajg_dm=(String) detailedData.get("GAJG_DM");
}
String uploadNo=(String) detailedData.get("UPLOAD_NO");
String acceptNo2=(String) detailedData.get("ACCEPT_NO");
String name2=(String) detailedData.get("NAME");
String sex=(String) detailedData.get("SEX_NO");
String signGovt=(String) detailedData.get("SIGN_GOVT");
String gajg_dm=(String) detailedData.get("GAJG_DM");
Long receiptId=receiptListEntity.getId();
//生成特证详单
receiptService.createDetailedList(uploadNo, acceptNo2, name2, id, gajg_dm, receiptId, sex, signGovt);
......@@ -125,7 +130,7 @@ public class ReceiptApi {
try {
//根据身份证号查组号
String groupNo=receiptService.selectGroupNoById(id, replaceDate(beginDate), replaceDate(expireDate));
//查询详单所需数据
//查询详单所需数据(制证库)
List <Map <String, Object>> receiptListDate=receiptService.selectReceiptListDate2(groupNo);
for (int i=0; i < receiptListDate.size(); i++) {
......@@ -160,12 +165,16 @@ public class ReceiptApi {
int receiptCount=receiptService.selectReceiptByAcceptNo(receiptListDate.get(n).get("ACCEPT_NO").toString());
//没有生成交接单详单
Map <String, Object> detailedData=receiptService.selectDetailedData(receiptListDate.get(n).get("ACCEPT_NO").toString());
String gajg_dm=(String) detailedData.get("GAJG_DM");
if (gajg_dm == null || "".equals(gajg_dm.trim())){
detailedData = receiptService.selectDetailedData4(receiptListDate.get(n).get("ACCEPT_NO").toString());
gajg_dm=(String) detailedData.get("GAJG_DM");
}
String uploadNo=(String) detailedData.get("UPLOAD_NO");
String acceptNo2=(String) detailedData.get("ACCEPT_NO");
String name2=(String) detailedData.get("NAME");
String sex=(String) detailedData.get("SEX_NO");
String signGovt=(String) detailedData.get("SIGN_GOVT");
String gajg_dm=(String) detailedData.get("GAJG_DM");
map.put("policeName", receiptService.selectPoliceName(gajg_dm));
int receiptId=Integer.parseInt((BigDecimal) detailedData.get("ID") + "");
if(receiptCount == 0){
......
src/main/java/com/yxproject/start/mapper/DetailReceiptListMapper.java
View file @ e1d43445
......@@ -20,7 +20,7 @@ public interface DetailReceiptListMapper {
*
* @return
*/
@Select("select DETAIL_RECEIPT_LIST.id,DETAIL_RECEIPT_LIST.ACCEPT_NO,DETAIL_RECEIPT_LIST.NAME,DETAIL_RECEIPT_LIST.UPLOAD_NO,\n" +
@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" +
......
src/main/java/com/yxproject/start/mapper/InfoManagementMapper.java
View file @ e1d43445
......@@ -12,7 +12,7 @@ public interface InfoManagementMapper {
"SELECT * FROM " +
" ( " +
"SELECT A.*, ROWNUM RN " +
"FROM (select new_files.*,PREPRO_PERSON.CARD_TYPE_ID " +
"FROM (select DISTINCT new_files.*,PREPRO_PERSON.CARD_TYPE_ID " +
"from new_files left join PREPRO_PERSON ON new_files.ID = PREPRO_PERSON.NEW_FILE_ID \n" +
"where 1=1\n" +
"<if test='beginFileName != \"\" '>" +
......
src/main/java/com/yxproject/start/mapper/LogMapper.java
View file @ e1d43445
......@@ -203,4 +203,8 @@ public interface LogMapper {
@Update("UPDATE PERSON_POST SET ID_CARD=NULL where PERSON_POST.FILE_ID=#{fileId}")
public boolean updateNullIdDate(@Param("fileId")String fileId);
//置空Excel文件状态
@Update("update FILE_NAME_DIC set STATE =NULL WHERE FILE_ID =#{fileId} ")
public boolean updateNullFileState(@Param("fileId") String fileId);
}
src/main/java/com/yxproject/start/mapper/ReceiptMapper.java
View file @ e1d43445
......@@ -12,15 +12,15 @@ import java.util.Map;
public interface ReceiptMapper {
//根据身份证号查询特证交接单信息
@Select("select prod_group_t.group_no,prod_card_t.accept_no,prod_card_t.UPLOAD_NO as GAJG_DM,\n" +
@Select("select PROD_GROUP_RELATION_T.GROUP_NO,prod_card_t.accept_no,DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO as GAJG_DM,\n" +
"count(prod_card_t.accept_no) valid_count,DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC, task.CARD_TYPE,task.OLD_CARD_TYPE \n" +
"from PRODYD_DBA.prod_card_t@PRODYD_LINK \n" +
"left join SPECIAL_CARD on SPECIAL_CARD.ACCEPT_NO = prod_card_t.accept_no\n" +
"left join GROUP_NO on GROUP_NO.GROUP_NO = SPECIAL_CARD.GROUP_NO \n" +
"left join task on task.task_id =SPECIAL_CARD.task_id \n" +
"left join PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on subStr(prod_card_t.UPLOAD_NO,0,9)= subStr(DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,0,9) \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" +
"where prod_card_t.id_no=#{id} and prod_card_t.BEGIN_DATE= #{beginDate} and prod_card_t.EXPIRE_DATE = #{expireDate} \n" +
"group by GROUP_NO.GROUP_NO, prod_card_t.accept_no, DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO, DIC_UPLOAD_UNIT_T.UNIT_NAME, task.CARD_TYPE, task.OLD_CARD_TYPE ")
"group by PROD_GROUP_RELATION_T.GROUP_NO,prod_card_t.accept_no,DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,DIC_UPLOAD_UNIT_T.UNIT_NAME,task.CARD_TYPE,task.OLD_CARD_TYPE")
public Map<String,Object> selectReceiptListDate(@Param("id")String id,@Param("beginDate")String beginDate,@Param("expireDate")String expireDate);
//根据身份证号查组号
......@@ -29,13 +29,15 @@ public interface ReceiptMapper {
//根据组号查询普通证交接单信息
@Select("select subStr(prod_card_t.accept_no,0,8) group_no,prod_card_t.accept_no,DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO as GAJG_DM,\n" +
"count(prod_card_t.accept_no) valid_count,DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC, task.CARD_TYPE,task.OLD_CARD_TYPE,prod_card_t.id_no,prod_card_t.sex_no,prod_card_t.upload_no \n" +
"count(prod_card_t.accept_no) valid_count,DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC,\n" +
"task.CARD_TYPE,task.OLD_CARD_TYPE,prod_card_t.id_no,prod_card_t.sex_no,prod_card_t.upload_no \n" +
"from PRODYD_DBA.prod_card_t@PRODYD_LINK \n" +
"left join group_no on group_no.group_no =subStr(prod_card_t.accept_no,0,8)\n" +
"left join task on task.task_id =group_no.task_id \n" +
"left join PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on subStr(prod_card_t.UPLOAD_NO,0,9)= subStr(DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,0,9) \n" +
"left join PRODYD_DBA.PROD_GROUP_RELATION_T@PRODYD_LINK on subStr(prod_card_t.accept_no,0,8) = PROD_GROUP_RELATION_T.GROUP_NO \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" +
"where substr(prod_card_t.accept_no,0,8) =substr(#{groupNo},0,8) and prod_card_t.accept_no not in (select accept_no from SPECIAL_CARD where accept_no like #{groupNo} ) \n" +
"group by prod_card_t.accept_no,DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO, DIC_UPLOAD_UNIT_T.UNIT_NAME, task.CARD_TYPE,task.OLD_CARD_TYPE,prod_card_t.id_no,prod_card_t.sex_no,prod_card_t.upload_no")
"group by subStr(prod_card_t.accept_no,0,8), prod_card_t.accept_no, DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO, DIC_UPLOAD_UNIT_T.UNIT_NAME, task.CARD_TYPE, task.OLD_CARD_TYPE, prod_card_t.id_no, prod_card_t.sex_no, prod_card_t.upload_no ")
public List<Map<String,Object>> selectReceiptListDate2(String groupNo);
//查询这个组号是否已经生成交接单
......@@ -72,25 +74,46 @@ 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 GAJG_MC,"+
"PROD_CARD_T.SIGN_GOVT,DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO GAJG_DM,receipt_list.ID\n" +
"prod_card_t.SEX_NO, prod_card_t.id_no,FILES.DWMC AS GAJG_MC,"+
"PROD_CARD_T.SIGN_GOVT,FILES.DWDM AS GAJG_DM,receipt_list.ID\n" +
"from PRODYD_DBA.prod_card_t@PRODYD_LINK\n" +
"left join PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on subStr(DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,0,9) = subStr(prod_card_t.UPLOAD_NO,0,9) "+
"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 FILES on PROD_GROUP_RELATION_T.ORIGINAL_NO = FILES.SOURCE_FILE_NAME \n" +
"left join receipt_list on receipt_list.QR_CODE = subStr(prod_card_t.accept_no,0,8) \n" +
"where PROD_CARD_T.ACCEPT_NO=#{acceptNo}")
public Map<String,Object>selectDetailedData(String acceptNo);
//根据身份证号查询交接单详单信息(特殊情况，不存在导入制证包)
@Select("select prod_card_t.upload_no, PROD_CARD_T.ACCEPT_NO, prod_card_t.name,\n" +
"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@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 = subStr(prod_card_t.accept_no,0,8)" +
"where PROD_CARD_T.ACCEPT_NO=#{acceptNo}")
public Map<String,Object>selectDetailedData4(String acceptNo);
//根据身份证号查询交接单详单信息
@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 GAJG_MC,PROD_CARD_T.SIGN_GOVT,DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO AS GAJG_DM," +
"receipt_list.ID\n" +
@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," +
"FILES.DWMC AS GAJG_MC,PROD_CARD_T.SIGN_GOVT,FILES.DWDM AS GAJG_DM,receipt_list.ID\n" +
"from PRODYD_DBA.prod_card_t@PRODYD_LINK \n" +
"left join PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on subStr(DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,0,9) = subStr(prod_card_t.UPLOAD_NO,0,9) "+
"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 FILES on PROD_GROUP_RELATION_T.ORIGINAL_NO = FILES.SOURCE_FILE_NAME \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>selectDetailedData2(@Param("id")String id,@Param("beginDate")String beginDate,@Param("expireDate")String expireDate);
//根据身份证号查询交接单详单信息(特殊情况，不存在导入制证包)
@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" +
"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);
//生成交接单详单
@Insert("INSERT INTO DETAIL_RECEIPT_LIST (UPLOAD_NO,accept_no,name,card_id,POLICE_CODE,RECEIPT_ID,SEX,SIGN_GOVT)" +
"VALUES(#{UPLOAD_NO},#{ACCEPT_NO},#{NAME},#{CARD_ID},#{GAJG_DM},#{RECEIPT_ID},#{SEX},#{signGovt})")
......
src/main/java/com/yxproject/start/mapper/SelectSerialNumberMapper.java
View file @ e1d43445
......@@ -85,7 +85,7 @@ public interface SelectSerialNumberMapper {
"from TASK \n" +
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n" +
"LEFT JOIN GROUP_NO ON GROUP_NO.TASK_ID = TASK.TASK_ID\n" +
"LEFT JOIN PRODYD_DBA.PROD_CARD_T@PRODYD_LINK ON PROD_CARD_T.ACCEPT_NO=GROUP_NO.GROUP_NO "+
"LEFT JOIN PRODYD_DBA.PROD_CARD_T@PRODYD_LINK ON SUBSTR(PROD_CARD_T.ACCEPT_NO,0,8)=GROUP_NO.GROUP_NO "+
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
"WHERE PROD_CARD_T.ACCEPT_NO =#{id} OR PROD_CARD_T.ID_NO=#{id} and GROUP_NO.GROUP_NO is not null\n" +
"group by task.WORK_GROUP,TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
......@@ -118,7 +118,7 @@ public interface SelectSerialNumberMapper {
"LEFT JOIN GROUP_NO ON GROUP_NO.TASK_ID = TASK.TASK_ID\n" +
"LEFT JOIN ACCYD_DBA.ACC_CARD_T@ACCUYD_LINK ON SUBSTR(ACC_CARD_T.ACCEPT_NO,0,8)=GROUP_NO.GROUP_NO "+
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
"WHERE GROUP_NO.GROUP_NO =substr(#{id},0,8) OR ACC_CARD_T.ID_NO=#{id} and GROUP_NO.GROUP_NO is not null\n" +
"WHERE ACC_CARD_T.ACCEPT_NO =#{id} OR ACC_CARD_T.ID_NO=#{id} and GROUP_NO.GROUP_NO is not null\n" +
"group by task.WORK_GROUP,TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
"TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" +
"TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE\n" +
......
src/main/java/com/yxproject/start/service/ReceiptService.java
View file @ e1d43445
......@@ -15,6 +15,8 @@ public interface ReceiptService {
public Map<String,Object>selectDetailedData(String acceptNo);
public Map<String,Object>selectDetailedData4(String acceptNo);
public boolean createDetailedList(String UPLOAD_NO,String ACCEPT_NO,String NAME,String CARD_ID,String GAJG_DM,long RECEIPT_ID,String SEX,String signGovt);
// public int selectSpecialCard(String GROUP_NO);
......@@ -70,6 +72,8 @@ public interface ReceiptService {
public Map<String,Object>selectDetailedData2(String id,String beginDate,String expireDate);
public Map<String,Object>selectDetailedData3(String id,String beginDate,String expireDate);
public List<Map<String, Object>> selectReceiptListDate2(String groupNo);
public String selectGroupNoById(String id,String beginDate,String expireDate);
......
src/main/java/com/yxproject/start/service/impl/LogServiceImpl.java
View file @ e1d43445
......@@ -153,7 +153,9 @@ public class LogServiceImpl implements LogService {
@Override
public boolean updateNullIdDate(String fileId){
logMapper.deleteAnalysis(fileId);
logMapper.updateNullIdDate(fileId);
logMapper.updateNullFileState(fileId);
return true;
}
}
src/main/java/com/yxproject/start/service/impl/ReceiptServiceImpl.java
View file @ e1d43445
......@@ -33,6 +33,12 @@ public class ReceiptServiceImpl implements ReceiptService {
return resultMap;
}
@Override
public Map<String, Object> selectDetailedData4(String acceptNo) {
Map<String,Object> resultMap = receiptMapper.selectDetailedData4(acceptNo);
return resultMap;
}
@Override
public boolean createDetailedList(String UPLOAD_NO, String ACCEPT_NO, String NAME, String CARD_ID, String GAJG_DM, long RECEIPT_ID,String SEX,String signGovt) {
receiptMapper.createDetailedList(UPLOAD_NO,ACCEPT_NO,NAME,CARD_ID,GAJG_DM,RECEIPT_ID,SEX,signGovt);
......@@ -201,6 +207,12 @@ public class ReceiptServiceImpl implements ReceiptService {
return resultMap;
}
@Override
public Map<String, Object> selectDetailedData3(String id,String beginDate,String expireDate) {
Map<String,Object> resultMap= receiptMapper.selectDetailedData3(id,beginDate,expireDate);
return resultMap;
}
@Override
public List<Map<String, Object>> selectReceiptListDate2(String groupNo) {
List<Map<String, Object>> mapList = new ArrayList<>();
......
src/main/java/com/yxproject/start/utils/ExportExcel.java
View file @ e1d43445
......@@ -61,18 +61,20 @@ public class ExportExcel {
cell = row.createCell(5); //设定值
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 = row.createCell(13); //设定值
cell.setCellValue("备注");
for (int i =0;i<mapList.size();i++){
......@@ -90,18 +92,20 @@ public class ExportExcel {
cell = row.createCell(5); //设定值
cell.setCellValue("null".equals(mapList.get(i).get("CARD_ID")+"")?"":mapList.get(i).get("CARD_ID")+"");
cell = row.createCell(6); //设定值
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(7); //设定值
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(8); //设定值
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(9); //设定值
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(10); //设定值
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(11); //设定值
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(12); //设定值
cell.setCellValue("null".equals(mapList.get(i).get("CHECK_NAME")+"")?"":mapList.get(i).get("CHECK_NAME")+"");
cell = row.createCell(13); //设定值
cell.setCellValue("null".equals(mapList.get(i).get("NOTE")+"")?"":mapList.get(i).get("NOTE")+"");
}
//第六步将生成excel文件保存到指定路径下
......
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