diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java index 8ff8493..0e493c7 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java @@ -147,7 +147,11 @@ String openid = jsonObject.get("openid").toString(); List> resMap = visitorApplyMapper.getMessageList(openid); for (HashMap map : resMap){ - + map.put("apply_time",map.get("in_time").toString()+"-"+map.get("out_time").toString()); + map.put("send_time",DateUtils.parseDate(map.get("create_time").toString()).getTime()); + map.remove("in_time"); + map.remove("out_time"); + map.remove("create_time"); } return ResponseData.success(resMap); }catch (Exception e){ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java index 8ff8493..0e493c7 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java @@ -147,7 +147,11 @@ String openid = jsonObject.get("openid").toString(); List> resMap = visitorApplyMapper.getMessageList(openid); for (HashMap map : resMap){ - + map.put("apply_time",map.get("in_time").toString()+"-"+map.get("out_time").toString()); + map.put("send_time",DateUtils.parseDate(map.get("create_time").toString()).getTime()); + map.remove("in_time"); + map.remove("out_time"); + map.remove("create_time"); } return ResponseData.success(resMap); }catch (Exception e){ diff --git a/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml b/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml index f374062..d7efc9b 100644 --- a/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml +++ b/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml @@ -28,9 +28,9 @@ t1.message_id, t2.staff_code, t2.visitor_name, - DATE_FORMAT(t2.in_time,'%Y/%m/%d %H:%i:%s'), - DATE_FORMAT(t2.out_time,'%Y/%m/%d %H:%i:%s'), - DATE_FORMAT(t1.creat_time,'%Y/%m/%d %H:%i:%s') + DATE_FORMAT(t2.in_time,'%Y/%m/%d %H:%i:%s') as in_time, + DATE_FORMAT(t2.out_time,'%Y/%m/%d %H:%i:%s') as out_time, + DATE_FORMAT(t1.create_time,'%Y/%m/%d %H:%i:%s') as create_time FROM bus_message t1 LEFT JOIN bus_visit_apply t2 ON t1.message_id = t2.apply_no