From b7ef4bb09e69ba27c29ea06a7f348f753c530a44 Mon Sep 17 00:00:00 2001
From: xinyb <574600396@qq.com>
Date: 星期二, 24 九月 2024 17:54:27 +0800
Subject: [PATCH] CRM邮箱配置调整
---
src/com/yc/crm/mail/service/MailImpl.java | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/src/com/yc/crm/mail/service/MailImpl.java b/src/com/yc/crm/mail/service/MailImpl.java
index 2002cfd..d72ccf3 100644
--- a/src/com/yc/crm/mail/service/MailImpl.java
+++ b/src/com/yc/crm/mail/service/MailImpl.java
@@ -1,7 +1,9 @@
package com.yc.crm.mail.service;
import com.yc.action.grid.GridUtils;
+import com.yc.crm.base.entity.T482115Entity;
import com.yc.crm.mail.action.MailFolder;
+import com.yc.crm.mail.action.MailTag;
import com.yc.crm.mail.entity.*;
import com.yc.entity.AttachmentConfig;
import com.yc.sdk.shopping.service.imagedata.ShoppingImageDataIfc;
@@ -75,14 +77,15 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public void saveReceivingMailList(List<t482101HEntity> mail) {
+ public String saveReceivingMailList(List<t482101HEntity> mail) {
String sql = "set nocount on\n";
try {
- sql += "declare @docCode varchar(50) ,@unid varchar(50),@fieldId varchar(100),@originalFileName varchar(100)," +
+ sql += "declare @docCode varchar(50) ,@unid varchar(50),@fieldId varchar(100),@originalFileName varchar(100),@docCodeList varchar(3000)=''," +
"@physicalFile varchar(50),@OriginalPicture varbinary(max) \n";
for (t482101HEntity m : mail) {//閬嶅巻鍐呭
sql += "exec sp_newdoccode 482101," + GridUtils.prossSqlParm(m.getUserCode()) + ",@docCode output \n";
- sql += "insert into t482101H(companyId,companyName,formId,docCode,docdate,PeriodID,postCode,postname,mailType,senderName,sender,sender_time,receiver,receiving_time," +
+ sql += " select @docCodeList=@docCodeList+@docCode+';'\n" +//杩斿洖鍗曞彿
+ "insert into t482101H(companyId,companyName,formId,docCode,docdate,PeriodID,postCode,postname,mailType,senderName,sender,sender_time,receiver,receiving_time," +
"cc,bcc,subject,userCode,userName,content,plain_text,messageId,read_flag,delete_flag,create_time,update_time," +
"attach_flag,attachment_list) values ";
sql += "(" + GridUtils.prossSqlParm(m.getCompanyId()) + "," + GridUtils.prossSqlParm(m.getCompanyName()) + ",482101," +
@@ -96,7 +99,7 @@
m.getReadFlag() + "," + m.getDeleteFlag() + ",getdate(),getdate()," + m.getAttachFlag() + "," + GridUtils.prossSqlParm(m.getAttachmentList()) + ") \n" +
mailFileSql(m.getMailFile());
}
- jdbcTemplate.update(sql);
+ return jdbcTemplate.queryForObject(sql + "\n select @docCodeList", String.class);
} catch (Exception e) {
throw e;
}
@@ -171,7 +174,7 @@
String sql = "set nocount on\n";
try {
sql += "declare @docCode varchar(200) ='" + docCode + "' \n";
- sql += "delete t482101H where userCode =" + GridUtils.prossSqlParm(userCode) +
+ sql += "update t482101H deleteFlag=1 where userCode =" + GridUtils.prossSqlParm(userCode) +
" and docCode in (select list from GetInStr(@docCode))\n";//鏍囪鍒犻櫎
sql += " select @@ROWCOUNT";
return jdbcTemplate.queryForObject(sql, Integer.class);
@@ -185,7 +188,7 @@
String sql = "set nocount on\n";
try {
sql += "declare @messageId varchar(200) ='" + messageId + "' \n";
- sql += "update t482101H where messageId in (select list from GetInStr(@messageId))\n";//鍒犻櫎
+ sql += " delete t482101H where messageId in (select list from GetInStr(@messageId))\n";//鍒犻櫎
sql += " select @@ROWCOUNT";
return jdbcTemplate.queryForObject(sql, Integer.class);
} catch (Exception e) {
@@ -403,17 +406,28 @@
for (MailModuleBelowEntity b : below) {
String key = b.getKey();
if (key.equals("moduleBelowA")) {//鏂囦欢澶�
- List<T482107Entity> t482107 = mailFolderIfc.getMailFolder(userCode, "");
- b.setList(MailFolder.getFolderList(t482107, ""));
+ List<T482107Entity> t482107 = mailFolderIfc.getMailFolder(userCode);
+ b.setList(MailFolder.getFolderModule(t482107, ""));
}
if (key.equals("moduleBelowB")) {//鏍囩閭欢
- b.setList(mailTagIfc.getTagList(userCode, "", -1));
+ List<T482115Entity> tag = mailTagIfc.getTagList(userCode, "", -1);
+ b.setList(MailTag.getTagModule(tag));
}
if (key.equals("moduleBelowC")) {//鏄剧ず鏇村
List<MailModuleBelowEntity> CList = new ArrayList<>();
- MailModuleBelowEntity belowC = new MailModuleBelowEntity();
-
-
+ MailModuleBelowEntity delete = new MailModuleBelowEntity();
+ delete.setKey("deleteMail");
+ delete.setName("宸插垹闄ら偖浠�");
+ CList.add(delete);
+ MailModuleBelowEntity waste = new MailModuleBelowEntity();
+ waste.setKey("wasteMail");
+ waste.setName("鍨冨溇閭欢");
+ CList.add(waste);
+ MailModuleBelowEntity track = new MailModuleBelowEntity();
+ track.setKey("trackMail");
+ track.setName("杩借釜淇℃伅");
+ CList.add(track);
+ b.setList(CList);
}
}
return below;
--
Gitblit v1.8.0