Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 3c575ec5 authored by zhangzhenbang's avatar zhangzhenbang
Browse files
Options

格口文件导入增加出生日期； 

制证包解析增加出生日期约束；
parent 01f1902a
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 25 deletions
src/main/java/com/yxproject/start/api/ReadExcelApi.java
View file @ 3c575ec5
......@@ -137,21 +137,22 @@ public class ReadExcelApi {
personPostEntity.setPlayState((String) list2.get(6));
personPostEntity.setOrderState((String) list2.get(7));
personPostEntity.setApplicantName((String) list2.get(8));
personPostEntity.setSenderName((String) list2.get(9));
personPostEntity.setSenderPhone((String) list2.get(10));
personPostEntity.setSenderAddress((String) list2.get(11));
personPostEntity.setRecipientName((String) list2.get(12));
personPostEntity.setRecipientPhone((String) list2.get(13));
personPostEntity.setRecipientAddress((String) list2.get(14));
personPostEntity.setBirthDate(replaceDate((String)list2.get(9)));
personPostEntity.setSenderName((String) list2.get(10));
personPostEntity.setSenderPhone((String) list2.get(11));
personPostEntity.setSenderAddress((String) list2.get(12));
personPostEntity.setRecipientName((String) list2.get(13));
personPostEntity.setRecipientPhone((String) list2.get(14));
personPostEntity.setRecipientAddress((String) list2.get(15));
personPostEntity.setOrderBlankNumber("");
personPostEntity.setGetToProvince((String) list2.get(15));
personPostEntity.setGetToCity((String) list2.get(16));
personPostEntity.setGetToCounty((String) list2.get(17));
personPostEntity.setBusinessType((String) list2.get(18));
personPostEntity.setLatticeMouthInformation((String) list2.get(19));
personPostEntity.setNatureOfTheInternal((String) list2.get(20));
personPostEntity.setNatureOfTheInformation((String) list2.get(21));
personPostEntity.setFirstWhite(list2.get(22).toString().substring(5, 27));
personPostEntity.setGetToProvince((String) list2.get(17));
personPostEntity.setGetToCity((String) list2.get(18));
personPostEntity.setGetToCounty((String) list2.get(19));
personPostEntity.setBusinessType((String) list2.get(20));
personPostEntity.setLatticeMouthInformation((String) list2.get(21));
personPostEntity.setNatureOfTheInternal((String) list2.get(22));
personPostEntity.setNatureOfTheInformation((String) list2.get(23));
personPostEntity.setFirstWhite(list2.get(24).toString().substring(5, 27));
personPostEntity.setFileId(fileNameDicEntity.getFileId());
entityList.add(personPostEntity);
}
......@@ -373,4 +374,4 @@ public class ReadExcelApi {
} else return str;
}
}
\ No newline at end of file
}
src/main/java/com/yxproject/start/entity/PersonPostEntity.java
View file @ 3c575ec5
......@@ -46,6 +46,7 @@ public class PersonPostEntity {
private Time formDeadline;
private long id;
private Long state1;
private String birthDate;
@Basic
@Column(name = "WAYBILL_NUMBER")
......@@ -430,6 +431,15 @@ public class PersonPostEntity {
this.formDeadline = formDeadline;
}
@Basic
@Column(name = "BIRTH_DATE")
public String getBirthDate() {
return birthDate;
}
public void setBirthDate(String birthDate) {
this.birthDate = birthDate;
}
@Override
public boolean equals(Object o) {
......@@ -473,12 +483,12 @@ public class PersonPostEntity {
Objects.equals(printDate, that.printDate) &&
Objects.equals(formStartTime, that.formStartTime) &&
Objects.equals(id, that.id) &&
Objects.equals(birthDate, that.birthDate) &&
Objects.equals(formDeadline, that.formDeadline);
}
@Override
public int hashCode() {
return Objects.hash(waybillNumber, backWaybillNumber,id,state1, orderNumber, createDate, openid, wcPlayOrderNumber, playState, orderState, applicantName, senderName, senderPhone, senderAddress, recipientName, recipientPhone, recipientAddress, orderBlankNumber, getToProvince, getToCity, getToCounty, businessType, latticeMouthInformation, natureOfTheInternal, natureOfTheInformation, firstWhite, idCard, acceptTheMatter, beginUsefulLife, validPeriodEnd, note, state, uploadDate, fileId, analysisDate, printDate, formStartTime, formDeadline);
return Objects.hash(waybillNumber, backWaybillNumber,id,state1, orderNumber, createDate, openid, wcPlayOrderNumber, playState, orderState, applicantName, senderName, senderPhone, senderAddress, recipientName, recipientPhone, recipientAddress, orderBlankNumber, getToProvince, getToCity, getToCounty, businessType, latticeMouthInformation, natureOfTheInternal, natureOfTheInformation, firstWhite, idCard, acceptTheMatter, beginUsefulLife, validPeriodEnd, note, state, uploadDate, fileId, analysisDate, printDate, formStartTime, formDeadline,birthDate);
}
}
src/main/java/com/yxproject/start/mapper/LogMapper.java
View file @ 3c575ec5
......@@ -203,7 +203,8 @@ public interface LogMapper {
"FROM PERSON_POST " +
"LEFT JOIN PREPRO_PERSON ON PERSON_POST.FIRST_WHITE = PREPRO_PERSON.JMSFZSLH \n" +
"LEFT JOIN FILES ON FILES.ID = PREPRO_PERSON.FILE_ID \n" +
"WHERE PERSON_POST.STATE1=3 " +
"WHERE PERSON_POST.STATE1=3 \n" +
"AND PERSON_POST.BIRTH_DATE = PREPRO_PERSON.CSRQ \n" +
"and TO_CHAR(FILES.UPLOAD_DATE,'yyyy-mm-dd hh24:mi:ss')=#{uploadDate}")
public List<Map<String, Object>> selectPersonPostUnanalysis(@Param("uploadDate")String uploadDate);
......
src/main/java/com/yxproject/start/mapper/PersonPostMapper.java
View file @ 3c575ec5
......@@ -15,9 +15,9 @@ import java.util.Map;
@Mapper
public interface PersonPostMapper {
@Insert("insert into PERSON_POST " +
"( WAYBILL_NUMBER,BACK_WAYBILL_NUMBER,ORDER_NUMBER,CREATE_DATE,OPENID,WC_PLAY_ORDER_NUMBER,PLAY_STATE,ORDER_STATE,APPLICANT_NAME,SENDER_NAME,SENDER_PHONE,SENDER_ADDRESS,RECIPIENT_NAME,RECIPIENT_PHONE,RECIPIENT_ADDRESS,ORDER_BLANK_NUMBER,GET_TO_PROVINCE,GET_TO_CITY,GET_TO_COUNTY,BUSINESS_TYPE,LATTICE_MOUTH_INFORMATION,NATURE_OF_THE_INTERNAL,NATURE_OF_THE_INFORMATION,FIRST_WHITE,FILE_ID,STATE1) " +
"( WAYBILL_NUMBER,BACK_WAYBILL_NUMBER,ORDER_NUMBER,CREATE_DATE,OPENID,WC_PLAY_ORDER_NUMBER,PLAY_STATE,ORDER_STATE,APPLICANT_NAME,SENDER_NAME,SENDER_PHONE,SENDER_ADDRESS,RECIPIENT_NAME,RECIPIENT_PHONE,RECIPIENT_ADDRESS,ORDER_BLANK_NUMBER,GET_TO_PROVINCE,GET_TO_CITY,GET_TO_COUNTY,BUSINESS_TYPE,LATTICE_MOUTH_INFORMATION,NATURE_OF_THE_INTERNAL,NATURE_OF_THE_INFORMATION,FIRST_WHITE,FILE_ID,STATE1,BIRTH_DATE) " +
"values " +
"(#{waybillNumber},#{backWaybillNumber},#{orderNumber},#{createDate},#{openid},#{wcPlayOrderNumber},#{playState},#{orderState},#{applicantName},#{senderName},#{senderPhone},#{senderAddress},#{recipientName},#{recipientPhone},#{recipientAddress},#{orderBlankNumber},#{getToProvince},#{getToCity},#{getToCounty},#{businessType},#{latticeMouthInformation},#{natureOfTheInternal},#{natureOfTheInformation},#{firstWhite},#{fileId},3)")
"(#{waybillNumber},#{backWaybillNumber},#{orderNumber},#{createDate},#{openid},#{wcPlayOrderNumber},#{playState},#{orderState},#{applicantName},#{senderName},#{senderPhone},#{senderAddress},#{recipientName},#{recipientPhone},#{recipientAddress},#{orderBlankNumber},#{getToProvince},#{getToCity},#{getToCounty},#{businessType},#{latticeMouthInformation},#{natureOfTheInternal},#{natureOfTheInformation},#{firstWhite},#{fileId},3,#{birthDate})")
@Options(useGeneratedKeys=true, keyProperty="id", keyColumn="id")
public boolean savePersonPost(PersonPostEntity personPostEntity);
......
src/main/java/com/yxproject/start/utils/ReadExcel.java
View file @ 3c575ec5
......@@ -56,20 +56,21 @@ public class ReadExcel {
String columns22 = sheet.getCell(22,i).getContents();
String columns23 = sheet.getCell(23,i).getContents();
String columns24 = sheet.getCell(24,i).getContents();
String columns25 = sheet.getCell(25,i).getContents();
if (columns0.equals("")&&columns1.equals("")&&columns2.equals("")&&columns3.equals("")&&
columns4.equals("")&&columns5.equals("")&&columns6.equals("")&&columns7.equals("")&&
columns8.equals("")&&columns9.equals("")&&columns10.equals("")&&columns11.equals("")&&columns12.equals("")&&
columns13.equals("")&&columns14.equals("")&&columns15.equals("")&&columns16.equals("")&&columns17.equals("")&&
columns18.equals("")&&columns19.equals("")&&columns20.equals("")&&columns21.equals("")&&columns22.equals("")&&
columns23.equals("")&&columns24.equals("")){
columns23.equals("")&&columns24.equals("")&&columns25.equals("")){
continue;
}
// sheet.getColumns()返回该页的总列数
for (int j = 0; j < sheet.getColumns(); j++) {
String cellinfo = sheet.getCell(j, i).getContents();
if(cellinfo.isEmpty()){
continue;
}
// if(cellinfo.isEmpty()){
// continue;
// }
innerList.add(cellinfo);
}
outerList.add(i, innerList);
......
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