销售发票提交重复处理

src/main/java/com/ctrip/fun/admin/controller/basic/InvoiceRequestController.java

@@ -165,6 +165,8 @@ public class InvoiceRequestController {
             currentPage = Integer.parseInt(request.getParameter("page"));
         }
         query.setPagerOffset(currentPage * query.getPagerPerPage());
+        String contactTel = (query.getContactTel() == null) ? ("") : (query.getContactTel());
+        
         String currentUserName = SpringSecurityUtil.getCurrentUserName();
         boolean isFinance = false;
         UserDetails userDetails = userDetailsService.loadUserByUsername(currentUserName);
@@ -179,6 +181,10 @@ public class InvoiceRequestController {
         	query.setRequestPerson(currentUserName);
         }
         
+        if(query.getContactTel() != null&&!"".equals(contactTel)){
+        	query.setRequestPerson("");
+        }
+        
         PagedResponseBean<InvoiceRequestBean> response = invoiceRequestService.queryList(currentUserName, query);
         List<InvoiceRequestBean> list = new ArrayList<InvoiceRequestBean>();
         list.add(null);
@@ -190,7 +196,7 @@ public class InvoiceRequestController {
 
         StringBuilder excel = new StringBuilder("/invoiceRequest/excel?");
         
-        String contactName = (query.getContactName() == null) ? ("") : (query.getContactName());
+        
         String requestPerson = (query.getRequestPerson() == null) ? ("") : (query.getRequestPerson());
         int status = (query.getStatus() == null) ? (0) : (query.getStatus());
         
@@ -201,7 +207,7 @@ public class InvoiceRequestController {
         	query.setCreateTimeEnd(DateUtil.addDateField(new Date(), Calendar.MONTH, 3));
         } 
         
-        excel.append("contactName=").append(contactName);
+        excel.append("contactTel=").append(contactTel);
         excel.append("&requestPerson=").append(requestPerson);
         excel.append("&status=").append(status);
         excel.append("&createTimeStart=").append(DateUtil.getDateStr(query.getCreateTimeStart()));

src/main/webapp/WEB-INF/templates/basic/invoiceRequest/invoiceRequestList.ftl

@@ -72,7 +72,7 @@ function financeUpdate(){
 <@com.layout title="开票申请列表" module="tools" current="invoiceInfo_list" pageCss=pageCssContent pageJs=pageJsContent>
 
 <form class="form-inline search-box" action="/invoiceRequest/list" method="get" autocomplete="off" style="float:left">
-    <@com.textInput "dto.contactName" "style=\"margin-left: 5px;\"" "寄送联系人"/>
+    <@com.textInput "dto.contactTel" "style=\"margin-left: 5px;\"" "寄送联系方式"/>
     <@com.textInput "dto.requestPerson" "style=\"margin-left: 5px;\"" "发票提交人"/>
     <@com.singleSelectQuery "dto.status" enums["com.ctrip.fun.common.vo.basic.InvoiceRequestStatusEnum"] "" "处理状态"/>
     <@com.textInputTwoDate "dto.createTimeStart" "dto.createTimeEnd" "style=\"margin-left: 5px;\"" "发票提交时间"/>