Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit c350e90a authored by xiachenqi's avatar xiachenqi
Browse files
Options

支持港澳台0.7

parent e7b0c24b
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 3 deletions
src/main/java/com/yxproject/start/api/ReadExcelApi.java
View file @ c350e90a
...@@ -64,7 +64,10 @@ public class ReadExcelApi { ...@@ -64,7 +64,10 @@ public class ReadExcelApi {
@Consumes(MediaType.MULTIPART_FORM_DATA) @Consumes(MediaType.MULTIPART_FORM_DATA)
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Map<String, String> ReadPersonPost(@RequestParam("formStartTime") String startDate, @RequestParam("formDeadLine") String endDate, HttpServletResponse resp, HttpServletRequest requ) { public Map<String, String> ReadPersonPost(@RequestParam("formStartTime") String startDate,
@RequestParam("formDeadLine") String endDate,
@RequestParam(value = "isGAT", required = false, defaultValue = "false") Boolean isGAT,
HttpServletResponse resp, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
YXJSONResponse yxresp = new YXJSONResponse(); YXJSONResponse yxresp = new YXJSONResponse();
...@@ -140,6 +143,44 @@ public class ReadExcelApi { ...@@ -140,6 +143,44 @@ public class ReadExcelApi {
if (list2 == null || i == 0) { if (list2 == null || i == 0) {
continue; continue;
} }
if (isGAT) {
personPostEntity.setWaybillNumber((String) list2.get(17));
// personPostEntity.setBackWaybillNumber((String) list2.get(1));
personPostEntity.setOrderNumber((String) list2.get(0));
personPostEntity.setCreateDate((String) list2.get(30));
// personPostEntity.setOpenid((String) list2.get(4));
// personPostEntity.setWcPlayOrderNumber((String) list2.get(5));
// personPostEntity.setPlayState((String) list2.get(6));
personPostEntity.setOrderState((String) list2.get(4));
personPostEntity.setApplicantName((String) list2.get(47));
if ("".equals(replaceDate((String)list2.get(9)))){
birthStr=birthStr+list2.get(2).toString()+"、";
birthDate++;
}
personPostEntity.setBirthDate(replaceDate((String)list2.get(48)));
personPostEntity.setSenderName((String) list2.get(18));
personPostEntity.setSenderPhone((String) list2.get(19));
//todo 地址格式
personPostEntity.setSenderAddress((String) list2.get(23));
personPostEntity.setRecipientName((String) list2.get(24));
personPostEntity.setRecipientPhone((String) list2.get(25));
//todo 地址格式
personPostEntity.setRecipientAddress((String)list2.get(29));
// personPostEntity.setOrderBlankNumber("");
personPostEntity.setGetToProvince((String) list2.get(26));
personPostEntity.setGetToCity((String) list2.get(27));
personPostEntity.setGetToCounty((String) list2.get(28));
personPostEntity.setBusinessType((String) list2.get(1));
//todo 格口信息
// personPostEntity.setLatticeMouthInformation((String) list2.get(21));
//内件性质
// personPostEntity.setNatureOfTheInternal((String) list2.get(22));
//内件信息
// personPostEntity.setNatureOfTheInformation((String) list2.get(23));
personPostEntity.setFirstWhite(list2.get(46).toString().substring(5, 27));
personPostEntity.setFileId(fileNameDicEntity.getFileId());
personPostEntity.setGk(gkMap);
} else {
personPostEntity.setWaybillNumber((String) list2.get(0)); personPostEntity.setWaybillNumber((String) list2.get(0));
personPostEntity.setBackWaybillNumber((String) list2.get(1)); personPostEntity.setBackWaybillNumber((String) list2.get(1));
personPostEntity.setOrderNumber((String) list2.get(2)); personPostEntity.setOrderNumber((String) list2.get(2));
...@@ -171,12 +212,14 @@ public class ReadExcelApi { ...@@ -171,12 +212,14 @@ public class ReadExcelApi {
personPostEntity.setFirstWhite(list2.get(24).toString().substring(5, 27)); personPostEntity.setFirstWhite(list2.get(24).toString().substring(5, 27));
personPostEntity.setFileId(fileNameDicEntity.getFileId()); personPostEntity.setFileId(fileNameDicEntity.getFileId());
personPostEntity.setGk(gkMap); personPostEntity.setGk(gkMap);
}
entityList.add(personPostEntity); entityList.add(personPostEntity);
} }
personPostService.savePersonPost(entityList); personPostService.savePersonPost(entityList);
//查询导入新格口文件邮件号是否使用过 //查询导入新格口文件邮件号是否使用过
post= personPostService.findWaybillNumber(fileNameDicEntity.getFileId()+""); post = personPostService.findWaybillNumber(fileNameDicEntity.getFileId()+"");
backPost= personPostService.findBackWaybillNumber(fileNameDicEntity.getFileId()+""); if (!isGAT) backPost = personPostService.findBackWaybillNumber(fileNameDicEntity.getFileId()+"");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.error("上传文件名：" + filename + "起始时间" + startDate + "截止时间" + endDate); logger.error("上传文件名：" + filename + "起始时间" + startDate + "截止时间" + endDate);
......
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