1
0
mirror of https://github.com/chatopera/cosin.git synced 2025-08-01 16:38:02 +08:00

Closed #107 支持填写服务小结

This commit is contained in:
Hai Liang Wang 2018-10-19 13:40:21 +08:00
parent 9114bf95e8
commit 846e5bd600
3 changed files with 25 additions and 6 deletions

View File

@ -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")

View File

@ -8,7 +8,7 @@
<h1 class="site-h1">
<#if curagentuser??>${curagentuser.username!''}${curagentuser.region!''}
<div style="float:right;" class="ukefu-service-btn">
<a href="/agent/summary.html?userid=${curagentuser.userid!''}&agentserviceid=${curagentuser.agentserviceid!''}&agentuserid=${curagentuser.id}" data-toggle="ajax" data-width="950" data-height="450" title="记录服务小结"><button class="layui-btn layui-btn-small"><i class="kfont">&#xe65c;</i> 服务小结</button></a>
<a href="/agent/summary.html?userid=${curagentuser.userid!''}&agentserviceid=${curagentuser.agentserviceid!''}&agentuserid=${curagentuser.id}&channel=${curagentuser.channel}" data-toggle="ajax" data-width="950" data-height="450" title="记录服务小结"><button class="layui-btn layui-btn-small"><i class="kfont">&#xe65c;</i> 服务小结</button></a>
<a href="/agent/transfer.html?userid=${curagentuser.userid!''}&agentserviceid=${curagentuser.agentserviceid!''}&agentuserid=${curagentuser.id}" data-toggle="ajax" data-width="950" data-height="550" title="选择转接对象"><button class="layui-btn layui-btn-small"><i class="kfont">&#xe7be;</i> 转接坐席</button></a>
<a href="/agent/end.html?userid=${curagentuser.id!''}" data-toggle="tip" data-title="请确认是否关闭和用户“${curagentuser.username!''}”的对话?"><button class="layui-btn layui-btn-small layui-btn-danger"><i class="kfont">&#xe621;</i> 结束对话</button></a>
</div>

View File

@ -5,6 +5,7 @@
<input type="hidden" name="userid" value="${userid!''}">
<input type="hidden" name="agentserviceid" value="${agentserviceid!''}">
<input type="hidden" name="agentuserid" value="${agentuserid!''}">
<input type="hidden" name="channel" value="${channel!''}">
<div class="layui-form-item">
<div class="layui-inline">