diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java index 31f7534..6a293d2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java @@ -30,7 +30,5 @@ List getPropertyManager(); - List selectApplyList(@Param("request") VisitorApplyListRequest request); - List> getMessageList(@Param("openid") String openid); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java index 31f7534..6a293d2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java @@ -30,7 +30,5 @@ List getPropertyManager(); - List selectApplyList(@Param("request") VisitorApplyListRequest request); - List> getMessageList(@Param("openid") String openid); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java index 0f66d88..197e81c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -18,4 +18,8 @@ public interface VisitorApplyMapper extends BaseMapper { + List selectApplyList(@Param("request") VisitorApplyListRequest request); + + List> getMessageList(@Param("openid") String openid); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java index 31f7534..6a293d2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java @@ -30,7 +30,5 @@ List getPropertyManager(); - List selectApplyList(@Param("request") VisitorApplyListRequest request); - List> getMessageList(@Param("openid") String openid); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java index 0f66d88..197e81c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -18,4 +18,8 @@ public interface VisitorApplyMapper extends BaseMapper { + List selectApplyList(@Param("request") VisitorApplyListRequest request); + + List> getMessageList(@Param("openid") String openid); + } 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 ec16d89..2e18abf 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 @@ -93,7 +93,7 @@ if(null == jsonObject){ return ResponseData.error(2401,Status.TOKEN_EXPIRES); } - List list = userActionMapper.selectApplyList(visitorApplyListRequest); + List list = visitorApplyMapper.selectApplyList(visitorApplyListRequest); if(CollectionUtils.isEmpty(list)){ return ResponseData.success(new ArrayList<>()); } @@ -145,7 +145,7 @@ return ResponseData.error(2401,Status.TOKEN_EXPIRES); } String openid = jsonObject.get("openid").toString(); - List> resMap = userActionMapper.getMessageList(openid); + 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()); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java index 31f7534..6a293d2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java @@ -30,7 +30,5 @@ List getPropertyManager(); - List selectApplyList(@Param("request") VisitorApplyListRequest request); - List> getMessageList(@Param("openid") String openid); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java index 0f66d88..197e81c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -18,4 +18,8 @@ public interface VisitorApplyMapper extends BaseMapper { + List selectApplyList(@Param("request") VisitorApplyListRequest request); + + List> getMessageList(@Param("openid") String openid); + } 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 ec16d89..2e18abf 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 @@ -93,7 +93,7 @@ if(null == jsonObject){ return ResponseData.error(2401,Status.TOKEN_EXPIRES); } - List list = userActionMapper.selectApplyList(visitorApplyListRequest); + List list = visitorApplyMapper.selectApplyList(visitorApplyListRequest); if(CollectionUtils.isEmpty(list)){ return ResponseData.success(new ArrayList<>()); } @@ -145,7 +145,7 @@ return ResponseData.error(2401,Status.TOKEN_EXPIRES); } String openid = jsonObject.get("openid").toString(); - List> resMap = userActionMapper.getMessageList(openid); + 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()); diff --git a/casic-web/src/main/resources/mapper/UserActionMapper.xml b/casic-web/src/main/resources/mapper/UserActionMapper.xml index 9b5a965..b5b1bc7 100644 --- a/casic-web/src/main/resources/mapper/UserActionMapper.xml +++ b/casic-web/src/main/resources/mapper/UserActionMapper.xml @@ -78,42 +78,5 @@ WHERE ru.ROLEID = '1319814546311985641') - - + \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java index 31f7534..6a293d2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java @@ -30,7 +30,5 @@ List getPropertyManager(); - List selectApplyList(@Param("request") VisitorApplyListRequest request); - List> getMessageList(@Param("openid") String openid); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java index 0f66d88..197e81c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -18,4 +18,8 @@ public interface VisitorApplyMapper extends BaseMapper { + List selectApplyList(@Param("request") VisitorApplyListRequest request); + + List> getMessageList(@Param("openid") String openid); + } 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 ec16d89..2e18abf 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 @@ -93,7 +93,7 @@ if(null == jsonObject){ return ResponseData.error(2401,Status.TOKEN_EXPIRES); } - List list = userActionMapper.selectApplyList(visitorApplyListRequest); + List list = visitorApplyMapper.selectApplyList(visitorApplyListRequest); if(CollectionUtils.isEmpty(list)){ return ResponseData.success(new ArrayList<>()); } @@ -145,7 +145,7 @@ return ResponseData.error(2401,Status.TOKEN_EXPIRES); } String openid = jsonObject.get("openid").toString(); - List> resMap = userActionMapper.getMessageList(openid); + 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()); diff --git a/casic-web/src/main/resources/mapper/UserActionMapper.xml b/casic-web/src/main/resources/mapper/UserActionMapper.xml index 9b5a965..b5b1bc7 100644 --- a/casic-web/src/main/resources/mapper/UserActionMapper.xml +++ b/casic-web/src/main/resources/mapper/UserActionMapper.xml @@ -78,42 +78,5 @@ WHERE ru.ROLEID = '1319814546311985641') - - + \ No newline at end of file diff --git a/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml b/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml index af11619..e81414d 100644 --- a/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml +++ b/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml @@ -1,6 +1,43 @@ - + + \ No newline at end of file