From 658898d28cded745ca15ee0a89e3025358356259 Mon Sep 17 00:00:00 2001
From: xinyb <574600396@qq.com>
Date: 星期一, 23 九月 2024 17:53:56 +0800
Subject: [PATCH] CRM邮箱功能调整
---
src/com/yc/crm/mail/service/MailImpl.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/src/com/yc/crm/mail/service/MailImpl.java b/src/com/yc/crm/mail/service/MailImpl.java
index 9f55ada..2002cfd 100644
--- a/src/com/yc/crm/mail/service/MailImpl.java
+++ b/src/com/yc/crm/mail/service/MailImpl.java
@@ -1,6 +1,7 @@
package com.yc.crm.mail.service;
import com.yc.action.grid.GridUtils;
+import com.yc.crm.mail.action.MailFolder;
import com.yc.crm.mail.entity.*;
import com.yc.entity.AttachmentConfig;
import com.yc.sdk.shopping.service.imagedata.ShoppingImageDataIfc;
@@ -29,6 +30,10 @@
MailAccountIfc emailAccountIfc;
@Autowired
ShoppingImageDataIfc imgData;
+ @Autowired
+ MailTagIfc mailTagIfc;
+ @Autowired
+ MailFolderIfc mailFolderIfc;
final static String shoppingImageServer = AttachmentConfig.get("attachment.server");
@@ -180,7 +185,7 @@
String sql = "set nocount on\n";
try {
sql += "declare @messageId varchar(200) ='" + messageId + "' \n";
- sql += "delete t482101H where messageId in (select list from GetInStr(@messageId))\n";//鍒犻櫎
+ sql += "update t482101H where messageId in (select list from GetInStr(@messageId))\n";//鍒犻櫎
sql += " select @@ROWCOUNT";
return jdbcTemplate.queryForObject(sql, Integer.class);
} catch (Exception e) {
@@ -194,7 +199,7 @@
try {
sql += "select top 1 DocCode,companyId,companyName,senderName,senderName,sender,receiver,mailType,subject,content,plain_text,file_unid as fileUNID,messageId," +
"read_flag,delete_flag,attach_flag,urgent_flag,receipt_flag,track_flag,userCode,userName,create_time,update_time," +
- "send_status,receive_time,sign_id,attachment_list,remark,remark," +
+ "send_status,receive_time,sign_id,attachment_list,remark,remark,sender_time,receiving_time," +
"(case when (isnull(handle_time,'') <> '' and isnull(handle_time,'') < getdate()) then 1 else 0 end) as handle,handle_time," +
"DocVersion from t482101H " +
"where docCode=" + GridUtils.prossSqlParm(docCode);
@@ -209,9 +214,9 @@
String sql = "set nocount on\n";
try {
sql += "select companyId,companyName,mailType,DocCode,senderName,sender,receiver,subject,plain_text," +
- "receive_time,update_time,create_time,senderName,sender,userCode,userName,folder_id,delete_Flag, " +
+ "receive_time,update_time,create_time,senderName,sender,userCode,userName,folder_id,delete_Flag,attachment_list," +
"read_Flag,(case when (isnull(handle_time,'') <> '' and isnull(handle_time,'') < getdate()) then 1 else 0 end) as handle," +
- "handle_time from t482101H ";
+ "handle_time,sender_time,receiving_time from t482101H ";
sql += " where userCode=" + GridUtils.prossSqlParm(userCode);
sql += " and mailType=" + mailType;//0锛氳崏绋跨 1锛氭敹浠剁 2锛氬彂浠剁
if (StringUtils.isNotBlank(email)) {
@@ -239,7 +244,7 @@
sql += "select companyId,companyName,mailType,DocCode,senderName,sender,receiver,subject,plain_text," +
"receive_time,update_time,create_time,senderName,sender,userCode,userName,folder_id,delete_Flag, " +
"read_Flag,(case when (isnull(handle_time,'') <> '' and isnull(handle_time,'') < getdate()) then 1 else 0 end) as handle," +
- "handle_time from t482101H ";
+ "handle_time,sender_time,receiving_time from t482101H ";
sql += " where isnull(handle_time,'') <> '' and isnull(handle_time,'') < getdate()";
sql += " and userCode=" + GridUtils.prossSqlParm(userCode) + " and receiver like '%" + email + "%'";
sql += " order by docCode asc \n";
@@ -391,6 +396,32 @@
}
}
+ @Override
+ public List<MailModuleBelowEntity> getMailModuleBelowList(String userCode) {
+ List<MailModuleBelowEntity> below = MailModuleBelowEntity.setMailInitial();
+ try {
+ for (MailModuleBelowEntity b : below) {
+ String key = b.getKey();
+ if (key.equals("moduleBelowA")) {//鏂囦欢澶�
+ List<T482107Entity> t482107 = mailFolderIfc.getMailFolder(userCode, "");
+ b.setList(MailFolder.getFolderList(t482107, ""));
+ }
+ if (key.equals("moduleBelowB")) {//鏍囩閭欢
+ b.setList(mailTagIfc.getTagList(userCode, "", -1));
+ }
+ if (key.equals("moduleBelowC")) {//鏄剧ず鏇村
+ List<MailModuleBelowEntity> CList = new ArrayList<>();
+ MailModuleBelowEntity belowC = new MailModuleBelowEntity();
+
+
+ }
+ }
+ return below;
+ } catch (Exception e) {
+ throw e;
+ }
+ }
+
@Transactional(rollbackFor = Exception.class)
@Override
public void updateMailHandle(String handleTime, String docCode) {
--
Gitblit v1.8.0