From 846e5bd600c2f430962fdb95bded10e5c6fef981 Mon Sep 17 00:00:00 2001 From: Hai Liang Wang Date: Fri, 19 Oct 2018 13:40:21 +0800 Subject: [PATCH] =?UTF-8?q?Closed=20#107=20=E6=94=AF=E6=8C=81=E5=A1=AB?= =?UTF-8?q?=E5=86=99=E6=9C=8D=E5=8A=A1=E5=B0=8F=E7=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/apps/agent/AgentController.java | 28 +++++++++++++++---- .../templates/apps/agent/mainagentuser.html | 2 +- .../templates/apps/agent/summary.html | 1 + 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/agent/AgentController.java b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/agent/AgentController.java index b895c670..eb1bc5bb 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/agent/AgentController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/agent/AgentController.java @@ -325,7 +325,10 @@ public class AgentController extends Handler { @RequestMapping("/agentuser") @Menu(type = "apps", subtype = "agent") - public ModelAndView agentuser(ModelMap map , HttpServletRequest request , String id, String channel) throws IOException, TemplateException { + public ModelAndView agentuser(ModelMap map, + HttpServletRequest request, + String id, + String channel) throws IOException, TemplateException { String mainagentuser = "/apps/agent/mainagentuser"; if(channel.equals("phone")) { mainagentuser = "/apps/agent/mainagentuser_callout"; @@ -917,7 +920,12 @@ public class AgentController extends Handler { @RequestMapping(value="/summary") @Menu(type = "apps", subtype = "summary") - public ModelAndView summary(ModelMap map , HttpServletRequest request , @Valid String userid , @Valid String agentserviceid, @Valid String agentuserid){ + public ModelAndView summary(ModelMap map , + HttpServletRequest request , + @Valid String userid , + @Valid String agentserviceid, + @Valid String agentuserid, + @Valid String channel){ if(!StringUtils.isBlank(userid) && !StringUtils.isBlank(agentuserid)){ AgentUser agentUser = this.agentUserRepository.findByIdAndOrgi(agentuserid, super.getOrgi(request)) ; if(agentUser!=null && !StringUtils.isBlank(agentUser.getAgentserviceid())){ @@ -926,10 +934,12 @@ public class AgentController extends Handler { map.addAttribute("summary", summaries.get(0)) ; } } + map.addAttribute("tags", tagRes.findByOrgiAndTagtype(super.getOrgi(request) , MainContext.ModelType.SUMMARY.toString())) ; map.addAttribute("userid", userid) ; map.addAttribute("agentserviceid", agentserviceid) ; map.addAttribute("agentuserid", agentuserid) ; + map.addAttribute("channel", channel); } @@ -938,8 +948,15 @@ public class AgentController extends Handler { @RequestMapping(value="/summary/save") @Menu(type = "apps", subtype = "summarysave") - public ModelAndView summarysave(ModelMap map , HttpServletRequest request , @Valid AgentServiceSummary summary , @Valid String contactsid , @Valid String userid , @Valid String agentserviceid, @Valid String agentuserid){ - if(!StringUtils.isBlank(userid) && !StringUtils.isBlank(agentuserid)){ + public ModelAndView summarysave(ModelMap map , + HttpServletRequest request , + @Valid AgentServiceSummary summary , + @Valid String contactsid , + @Valid String userid , + @Valid String agentserviceid, + @Valid String agentuserid, + @Valid String channel){ + if(!StringUtils.isBlank(userid) && !StringUtils.isBlank(agentuserid)){ summary.setOrgi(super.getOrgi(request)); summary.setCreater(super.getUser(request).getId()); @@ -951,6 +968,7 @@ public class AgentController extends Handler { summary.setUsername(service.getUsername()); summary.setAgentusername(service.getAgentusername()); summary.setChannel(service.getChannel()); + summary.setContactsid(contactsid); summary.setLogindate(service.getLogindate()); summary.setContactsid(service.getContactsid()); summary.setEmail(service.getEmail()); @@ -958,7 +976,7 @@ public class AgentController extends Handler { serviceSummaryRes.save(summary) ; } - return request(super.createRequestPageTempletResponse("redirect:/agent/agentuser.html?id="+agentuserid)) ; + return request(super.createRequestPageTempletResponse("redirect:/agent/agentuser.html?id="+agentuserid + "&channel=" + channel)) ; } @RequestMapping(value="/transfer") diff --git a/contact-center/app/src/main/resources/templates/apps/agent/mainagentuser.html b/contact-center/app/src/main/resources/templates/apps/agent/mainagentuser.html index 636a8566..59effe80 100644 --- a/contact-center/app/src/main/resources/templates/apps/agent/mainagentuser.html +++ b/contact-center/app/src/main/resources/templates/apps/agent/mainagentuser.html @@ -8,7 +8,7 @@

<#if curagentuser??>${curagentuser.username!''}（${curagentuser.region!''}）
- +
diff --git a/contact-center/app/src/main/resources/templates/apps/agent/summary.html b/contact-center/app/src/main/resources/templates/apps/agent/summary.html index 54533832..697b4985 100644 --- a/contact-center/app/src/main/resources/templates/apps/agent/summary.html +++ b/contact-center/app/src/main/resources/templates/apps/agent/summary.html @@ -5,6 +5,7 @@ +