From 73c8452a479ea83d4e9d28a7c66c019d9955d194 Mon Sep 17 00:00:00 2001
From: xinyb <574600396@qq.com>
Date: 星期日, 29 九月 2024 15:28:51 +0800
Subject: [PATCH] CRM邮箱删除和待处理功能
---
src/com/yc/crm/mail/action/MailController.java | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/src/com/yc/crm/mail/action/MailController.java b/src/com/yc/crm/mail/action/MailController.java
index 5c912cc..8171eeb 100644
--- a/src/com/yc/crm/mail/action/MailController.java
+++ b/src/com/yc/crm/mail/action/MailController.java
@@ -216,14 +216,17 @@
if (StringUtils.isNotBlank(t482101HEntity.getAttachmentList())) {//闄勪欢鐨勫鐞�
//鑾峰彇鍒伴檮浠跺唴瀹�
List<AttachmentEntity> attachmentEntities = mailFileIfc.getAttachmentEntityList(t482101HEntity.getAttachmentList());
- List<Map<String,Object>> list = new ArrayList<>();
+ List<Map<String, Object>> list = new ArrayList<>();
if (attachmentEntities.size() > 0) {
for (AttachmentEntity a : attachmentEntities) {
- Map<String,Object> map=new HashMap<>();
- map.put("url",shoppingImageServer + "/uploads/email/" + dataSourceEntity.getDbId() + "/482101/" + a.getUnid() + "@p@" + a.getPhysicalFile());
- map.put("name",a.getOriginalFileName());
- map.put("size",a.getFileSize());
- map.put("fileType",a.getFileType());
+ Map<String, Object> map = new HashMap<>();
+ map.put("url", "http://yingchen.onbus.cn:9010" + "/uploads/email/" + dataSourceEntity.getDbId() + "/482101/" + a.getUnid() + "@p@" + a.getPhysicalFile());
+ if (!t482101HEntity.getMailType().equals(1)) {//涓嶆槸鏀朵欢绫诲瀷锛�1锛�
+ map.put("url", shoppingImageServer + "/uploads/attachment/" + dataSourceEntity.getDbId() + "/482101/" + a.getUnid() + "@p@" + a.getSeq() + "." + a.getFileType());
+ }
+ map.put("name", a.getOriginalFileName());
+ map.put("size", a.getFileSize());
+ map.put("fileType", a.getFileType());
list.add(map);
}
t482101HEntity.setAttachmentPath(list);
@@ -652,24 +655,29 @@
msg.setFail("閭欢鍞竴鏍囪瘑docCode涓嶈兘绌�");
return msg;
}
- if (param.get("handleTime") == null) {
- msg.setFail("寰呭鐞嗘椂闂翠笉鑳界┖");
- return msg;
+ List<String> docCode = (List<String>) param.get("docCode");//寰呭鐞嗙殑鍗曞彿
+ String handleTime = "";//寰呭鐞嗘椂闂�
+ if (param.get("handleTime") != null && !param.get("handleTime").equals("")) {
+ handleTime = (String) param.get("handleTime");
}
- List<String> docCode = (List<String>) param.get("docCode");
- String handleTime = (String) param.get("handleTime");
- // 姝ｅ垯琛ㄨ揪寮忥紝鐢ㄤ簬鍖归厤鏃ユ湡鏍煎紡
- String regex = "\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}";
- Pattern pattern = Pattern.compile(regex);
- Matcher matcher = pattern.matcher(handleTime);
- if (!matcher.matches()) {
- msg.setFail("寰呭鐞嗘棩鏈熸牸寮忎负锛歽yyy-MM-dd HH:mm锛堝锛�1900-08-01 08:00锛夈�傝妫�鏌�");
- return msg;
+ if (StringUtils.isNotBlank(handleTime)) {
+ // 姝ｅ垯琛ㄨ揪寮忥紝鐢ㄤ簬鍖归厤鏃ユ湡鏍煎紡
+ String regex = "\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}";
+ Pattern pattern = Pattern.compile(regex);
+ Matcher matcher = pattern.matcher(handleTime);
+ if (!matcher.matches()) {
+ msg.setFail("寰呭鐞嗘棩鏈熸牸寮忎负锛歽yyy-MM-dd HH:mm锛堝锛�1900-08-01 08:00锛夈�傝妫�鏌�");
+ return msg;
+ }
}
DataSourceEntity dataSourceEntity = MultiDataSource.getDataSourceMap(request);//鑾峰彇鏁版嵁婧愪俊鎭�
SpObserver.setDBtoInstance("_" + dataSourceEntity.getDbId());//鍒囨崲鏁版嵁婧�
emailIfc.updateMailHandle(handleTime, StringUtils.join(docCode, ","));
- msg.setOk("鎴愬姛鏍囪涓哄緟澶勭悊閭欢");
+ if(StringUtils.isBlank(handleTime)){//娌″�煎氨鏄畬鎴�
+ msg.setOk("寰呭鐞嗛偖浠跺凡瀹屾垚");
+ }else{
+ msg.setOk("鏍囪涓哄緟澶勭悊閭欢");
+ }
} catch (Exception e) {
msg.setFail(e.getCause() != null ? e.getCause().getMessage() : e.getMessage());
} finally {
--
Gitblit v1.8.0