重构

src/main/java/com/ssj/dao/sys/fx/dao/impl/FinanceQueryDaoImpl.java

@@ -526,10 +526,10 @@ public class FinanceQueryDaoImpl implements FinanceQueryDao {
          queryParams.add(params.get("startMonth"));
     
          selSql.append(" from fx_merchant t ");
-         selSql.append(" WHERE t.`status`!=4 and t.sign_type>=1 and t.type in (1,2,5)  ");
-         if(!StringUtil.isEmpty(params.get("unitName"))){
-             selSql.append(" AND t.unit_name LIKE concat('%',?,'%') ");
-             queryParams.add(params.get("unitName"));
+         selSql.append(" WHERE t.`status`!=4 and t.sign_type>=1 and t.type in (1,2,5)   ");
+         if(!StringUtil.isEmpty(params.get("merchantId"))){
+             selSql.append(" AND t.id=? ");
+             queryParams.add(params.get("merchantId"));
          }
          selSql.append(" ORDER BY FIELD(t.`type`,1,2),t.create_time asc  ");
          selSql.append(" ) as tmp ");

src/main/java/com/ssj/sys/controller/FinanceReportController.java

@@ -497,7 +497,7 @@ public class FinanceReportController extends BaseController {
         Map<String, Object> params = new HashMap<String, Object>();
             
         params.put("startMonth", request.getParameter("startMonth")==null? new SimpleDateFormat("yyyy-MM").format(new Date()):request.getParameter("startMonth"));
-        params.put("unitName", request.getParameter("unitName")==null?"":request.getParameter("unitName"));
+        params.put("merchantId", request.getParameter("merchantId")==null?"":request.getParameter("merchantId"));
         addPostcodes(params);
         
         SplitPage sp = new SplitPage();
@@ -553,6 +553,8 @@ public class FinanceReportController extends BaseController {
         model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
         model.addAttribute("page", sp);
         model.addAttribute("search", params);
+        List<Merchant> poslist=merchantService.findMerchantByPage();
+		model.addAttribute("poslist", poslist);
         return "sys/finance/allList6";
     }
     

src/main/resources/templates/sys/finance/allList6.html

@@ -4,6 +4,8 @@
 <script th:include="sys/common/metaCSS" th:remove="tag"></script> 
 <script th:include="sys/common/metaJS" th:remove="tag"></script> 
 <script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/sys/js/My97DatePicker/WdatePicker.js}"></script>
+<link href="sys/css/jquery.searchableSelect.css" th:href="@{/static/sys/css/jquery.searchableSelect.css}" rel="stylesheet"/>
+<script src="js/layer/layer.js" th:src="@{/static/sys/js/jquery.searchableSelect.js}"></script>
 </head>
 <style>
 	.tablelink{margin-right:10px;}
@@ -39,21 +41,25 @@
 <div class="rightinfo">
 	<form id="seachform" th:action="@{/sys/finance/balanceConsumeDetailList_New2.html}" method="post">
 	<ul class="seachform">
+		
+		<li>
+			<label>所有商户：</label>
+			<select class="scinput select_width"  name="merchantId"   id="merchantId" style="width: 150px;" >
+				<option value="">全部</option>
+				<option th:each="item:${poslist}"  th:selected="${search.get('merchantId') eq item.id ? true : false}" th:value="${item.id}">[[${item.unitName}]]</option>
+			</select>
+		</li>
+	
 		<li>
 			<label>日期</label>
 			<input type="text" id="startMonth" name="startMonth" autocomplete="off"   onclick="WdatePicker({dateFmt:'yyyy-MM'})" th:value="${search.startMonth }" class="scinput date_width " placeholder="选择日期">
 		</li>
 		
 		<li>
-			<label>商户名称</label>
-			<input type="text" id="unitName" name="unitName"   th:value="${search.unitName }" class="scinput " placeholder="输入商户关键字">
+			<input type="button" class="scbtn" value="查询" />
+			<input type="button" id="button" class="scbtn" value="导出" />
 		</li>
 		
-			<li>
-				<input type="button" class="scbtn" value="查询" />
-				<input type="button" id="button" class="scbtn" value="导出" />
-			</li>
-		
 	</ul>
 	</form>
 	<table class="tablelist">
@@ -178,6 +184,10 @@
 </div>
 </body>
 <script type="text/javascript">
+	$(function(){
+		$('#merchantId').searchableSelect();
+	});
+	
 	$("#button").on('click',function(){
 		document.getElementById("seachform").action = "[[${sysUrl}]]/sys/finance/export6";
 		$("#seachform").submit();