diff --git a/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiWlContactsController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiWlContactsController.java index 3361b18d..3ed70c9d 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiWlContactsController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/ApiWlContactsController.java @@ -136,7 +136,7 @@ public class ApiWlContactsController extends Handler { final String uid = j.get("uid").getAsString(); final String sid = j.get("sid").getAsString(); final String cid = j.get("cid").getAsString(); - Contacts record = contactsRes.findOneByWluidAndWlsidAndWlcid(uid, sid, cid); + Contacts record = contactsRes.findOneByWluidAndWlsidAndWlcidAndDatastatus(uid, sid, cid, false); boolean isNew = false; if (record == null) { // create new obj diff --git a/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/IMController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/IMController.java index 13cafd1e..cd51d2b6 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/IMController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/IMController.java @@ -307,7 +307,7 @@ public class IMController extends Handler { final String company_name, final String system_name) { if (StringUtils.isNotBlank(uid) && StringUtils.isNotBlank(sid) && StringUtils.isNotBlank(cid)) { - Contacts data = contactsRes.findOneByWluidAndWlsidAndWlcid(uid, sid, cid); + Contacts data = contactsRes.findOneByWluidAndWlsidAndWlcidAndDatastatus(uid, sid, cid, false); if (data == null) { data = new Contacts(); data.setCreater(gid); @@ -367,7 +367,7 @@ public class IMController extends Handler { onlineUserRes.save(onlineUser); } - Contacts usc = contactsRes.findOneByWluidAndWlsidAndWlcid(uid, sid, cid); + Contacts usc = contactsRes.findOneByWluidAndWlsidAndWlcidAndDatastatus(uid, sid, cid, false); if (usc != null) { return "usc"; } else { @@ -766,7 +766,7 @@ public class IMController extends Handler { String cid = (String) request.getSession().getAttribute("Sessioncid"); if (StringUtils.isNotBlank(uid) && StringUtils.isNotBlank(sid) && StringUtils.isNotBlank(cid)) { - Contacts contacts1 = contactsRes.findOneByWluidAndWlsidAndWlcid(uid, sid, cid); + Contacts contacts1 = contactsRes.findOneByWluidAndWlsidAndWlcidAndDatastatus(uid, sid, cid, false); if (contacts1 != null) { agentUserRepository.findOneByUseridAndOrgi(userid, orgi).ifPresent(p -> { // 关联AgentService的联系人 diff --git a/contact-center/app/src/main/java/com/chatopera/cc/persistence/es/ContactsRepository.java b/contact-center/app/src/main/java/com/chatopera/cc/persistence/es/ContactsRepository.java index 2adb4cd2..28b008aa 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/persistence/es/ContactsRepository.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/persistence/es/ContactsRepository.java @@ -29,7 +29,7 @@ public interface ContactsRepository extends ElasticsearchRepository findOneByDatastatusIsFalseAndPhoneAndOrgi(String phone, String orgi); - Contacts findOneByWluidAndWlsidAndWlcid(String wluid, String wlsid, String wlcid); + Contacts findOneByWluidAndWlsidAndWlcidAndDatastatus(String wluid, String wlsid, String wlcid, Boolean datastatus); List findByskypeidAndDatastatus(String skypeid, Boolean datastatus); diff --git a/contact-center/app/src/main/resources/WEB-INF/data/mdx/coment.xml b/contact-center/app/src/main/resources/WEB-INF/data/mdx/coment.xml index 38a05dbb..f0d1305d 100644 --- a/contact-center/app/src/main/resources/WEB-INF/data/mdx/coment.xml +++ b/contact-center/app/src/main/resources/WEB-INF/data/mdx/coment.xml @@ -4,7 +4,7 @@ AND agentskill = '${skill!''}' <#if agent?? && agent!=""> AND agentno = '${agent!''}' <#if orgi?? && orgi!=""> AND orgi = '${orgi!''}' <#if begin?? && begin!=""> AND satistime >= str_to_date('${begin!''}', '%Y-%m-%d %H:%i:%s') <#if end?? && end!=""> AND satistime <= str_to_date('${end!''} 23:59:59', '%Y-%m-%d %H:%i:%s') + select * from uk_agentservice where 1 = 1 <#if skill?? && skill!=""> AND agentskill = '${skill!''}' <#if agent?? && agent!=""> AND agentno = '${agent!''}' <#if orgi?? && orgi!=""> AND orgi = '${orgi!''}' <#if begin?? && begin!=""> AND satistime >= str_to_date('${begin!''}', '%Y-%m-%d %H:%i:%s') <#if end?? && end!=""> AND satistime <= str_to_date('${end!''} 23:59:59', '%Y-%m-%d %H:%i:%s') ]]> @@ -25,9 +25,9 @@ - date_format(agentservice.createtime,'%Y-%m-%d') - date_format(agentservice.createtime,'%Y-%m-%d') - TO_DATE(agentservice.createtime,'YYYY-MM-DD') + date_format(agentservice.satistime,'%Y-%m-%d') + date_format(agentservice.satistime,'%Y-%m-%d') + TO_DATE(agentservice.satistime,'YYYY-MM-DD') diff --git a/contact-center/app/src/main/resources/WEB-INF/data/templates/contacts_template.xls b/contact-center/app/src/main/resources/WEB-INF/data/templates/contacts_template.xls deleted file mode 100644 index 3201ed19..00000000 Binary files a/contact-center/app/src/main/resources/WEB-INF/data/templates/contacts_template.xls and /dev/null differ diff --git a/contact-center/app/src/main/resources/WEB-INF/data/templates/contacts_template.xlsx b/contact-center/app/src/main/resources/WEB-INF/data/templates/contacts_template.xlsx new file mode 100644 index 00000000..5a63071c Binary files /dev/null and b/contact-center/app/src/main/resources/WEB-INF/data/templates/contacts_template.xlsx differ diff --git a/contact-center/app/src/main/resources/templates/apps/business/contacts/detail.html b/contact-center/app/src/main/resources/templates/apps/business/contacts/detail.html index 94716653..ce54ccc4 100644 --- a/contact-center/app/src/main/resources/templates/apps/business/contacts/detail.html +++ b/contact-center/app/src/main/resources/templates/apps/business/contacts/detail.html @@ -84,7 +84,7 @@
-
+

基本信息

@@ -192,11 +192,44 @@
+ <#if contacts.wlusername?? || contacts.wluid??> +
+
+ +
+ ${contacts.wlusername!''} + (${contacts.wluid!''}) +
+
+
+ + <#if contacts.wlcompany_name?? || contacts.wlcid??> +
+
+ +
+ ${contacts.wlcompany_name!''} + (${contacts.wlcid!''}) +
+
+
+ + <#if contacts.wlsystem_name?? || contacts.wlsid??> +
+
+ +
+ ${contacts.wlsystem_name!''} + (${contacts.wlsid!''}) +
+
+
+
- +
@@ -204,7 +237,7 @@
- +
@@ -255,6 +288,13 @@ width: 100%; word-break: break-all; } + + #basic .layui-form-label{ + width: 115px; + } + #basic .layui-input-inline{ + width: 270px; + }