From a4ff744a4ffecf935e1560178f22f7d7511c27cd Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Tue, 11 Dec 2018 18:39:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=87=E4=BB=B6=E6=91=98=E8=A6=81=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9=20=202.mail?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=A2=9E=E5=8A=A0=E5=8A=A0=E5=8F=91=E4=BB=B6?=
 =?UTF-8?q?=E4=BA=BA=E3=80=81=E6=94=B6=E4=BB=B6=E4=BA=BA=E3=80=81=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=BB=E9=A2=98=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/log/ntc/MailLogController.java | 11 +++++++
 .../views/cfg/fileTransfer/fileDigestList.jsp |  9 ++++--
 .../webapp/WEB-INF/views/log/ntc/mailList.jsp | 29 ++++++++++++++++++-
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java
index e3fd62ddf..b13e98b8d 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java
@@ -41,6 +41,17 @@ public class MailLogController extends BaseController {
 			params.put("pageNo", page.getPageNo());
 			initLogSearchValue(log, params);
 			
+			// 增加收/发件人、邮件主题查询
+			if (StringUtils.isNotBlank(log.getMailTo())) {
+				params.put("searchMailTo", log.getMailTo());
+			}
+			if (StringUtils.isNotBlank(log.getMailFrom())) {
+				params.put("searchMailFrom", log.getMailFrom());
+			}
+			if (StringUtils.isNotBlank(log.getSubject())) {
+				params.put("searchSubject", log.getSubject());
+			}
+			
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
 			model.addAttribute("serviceList", serviceList);
 			
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
index 548f18069..a067d295e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
@@ -418,12 +418,17 @@
 								    </td>
 								    <td>${indexCfg.rawLen }（B）</td>
 								    <td>
-								    	<c:if test="${indexCfg.cfdsLevel > 1 && indexCfg.cfdsLevel <= 10}">
+								    	<%-- <c:if test="${indexCfg.cfdsLevel > 1 && indexCfg.cfdsLevel <= 10}">
 								    		${(indexCfg.cfdsLevel*10)}
 								    	</c:if>
 								    	<c:if test="${indexCfg.cfdsLevel eq 1 || indexCfg.cfdsLevel > 10}">
 								    		${indexCfg.cfdsLevel }
-								    	</c:if>
+								    	</c:if> --%>
+								    	<c:forEach items="${fns:getDictList('CONFIDENCE_INTERVAL')}" var="configdenceC">
+											<c:if test="${configdenceC.itemCode eq indexCfg.cfdsLevel}">
+												${configdenceC.itemValue}
+											</c:if>
+										</c:forEach>
 								    </td>
 								    <td>
 								    	<a href="${indexCfg.fileUrl }" target="_blank" data-original-title="${indexCfg.fileUrl }"
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
index fc7bc62bc..a808052c2 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
@@ -197,9 +197,36 @@
 							</div>
 							<div class="row">
 								<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="mail_from"></spring:message>：</label>
+										<input name="mailFrom" type="text" class="form-control" value="${log.mailFrom }"/>
+									</div>
+								</div>
+								
+								<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="mail_to"></spring:message>：</label>
+										<input name="mailTo" type="text" class="form-control" value="${log.mailTo }"/>
+									</div>
+								</div>
+								
+								<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="subject"></spring:message>：</label>
+										<input name="subject" type="text" class="form-control" value="${log.subject }"/>
+									</div>
+								</div>
+								
+								<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+									</div>
+								</div>
+								<%-- <div class="col-md-2">
 									<label><spring:message code="cfg_id"></spring:message>：</label>
 									<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
-								</div>
+								</div> --%>
 							</div>
 						</div>
 						<!-- /筛选搜索内容栏    结束-->