소스 검색

地区负责人申请查询调整

sangwenwei 1 년 전
부모
커밋
24d520bcc1

+ 2 - 2
src/main/resources/mappings/modules/signatureManagement/electronicSignature/DistrictDirectorApplicationDao.xml

@@ -58,7 +58,7 @@
 				AND a.create_date >= #{beginDate}
 			</if>
 			<if test="endDate !=null">
-				AND a.create_date &lt;= #{endDate}
+				AND Date(a.create_date) &lt;= Date(#{endDate})
 			</if>
 
 			<if test="status != null and status != ''">
@@ -109,7 +109,7 @@
 				AND a.create_date >= #{beginDate}
 			</if>
 			<if test="endDate !=null">
-				AND a.create_date &lt;= #{endDate}
+				AND Date(a.create_date) &lt;= Date(#{endDate})
 			</if>
 
 			<if test="status != null and status != ''">

+ 1 - 1
src/main/webapp/webpage/modules/signatureManagement/electronicSignature/directorApplicationLookForm.jsp

@@ -113,7 +113,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>区域负责人:</label>
+					<label class="layui-form-label double-line"><span class="require-item">*</span>区域负责人名称:</label>
 					<div class="layui-input-block">
 						<form:input path="areaDirector" htmlEscape="false" readonly="true" maxlength="64" class="form-control  layui-input"/>
 					</div>

+ 2 - 2
src/main/webapp/webpage/modules/signatureManagement/electronicSignature/districtDirectorApplicationList.jsp

@@ -329,7 +329,7 @@
                         <div class="layui-item query athird">
                             <label class="layui-form-label">负责地区:</label>
                             <div class="layui-input-block with-icon">
-                                <form:input path="territory" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+                                <form:input path="territory" placeholder="请输入负责地区" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
                             </div>
                         </div>
                         <div class="layui-item athird">
@@ -430,7 +430,7 @@
                         return "<span title=\"" + d.createName + "\">" + d.createName + "</span>";
                     }}
                 ,{field:'officeName',align:'center', title: '申请部门',  minwidth:200}
-                ,{field:'areaDirector',align:'center', title: '区负责人',  minwidth:100}
+                ,{field:'areaDirector',align:'center', title: '区负责人名称',  minwidth:100}
                 ,{field:'areaName',align:'center', title: '关联区域',  minwidth:200}
                 ,{field:'createDate',align:'center', title: '申请日期',  minwidth:200}
                 ,{align:'center', title: '状态',  minwidth:150,templet:function(d){

+ 2 - 3
src/main/webapp/webpage/modules/signatureManagement/electronicSignature/districtDirectorApplicationListForm.jsp

@@ -329,7 +329,7 @@
 						<div class="layui-item query athird">
 							<label class="layui-form-label">负责地区:</label>
 							<div class="layui-input-block with-icon">
-								<form:input path="territory" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+								<form:input path="territory" placeholder="请输入负责地区" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item query athird ">
@@ -347,7 +347,6 @@
 					</div>
 					<div class="layui-item athird">
 						<div class="input-group">
-							<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
 							<div class="layui-btn-group search-spacing">
 								<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
 								<button id="searchReset" class="layui-btn layui-btn-sm" onclick="resetSearch()">重置</button>
@@ -389,7 +388,7 @@
 						return "<span title=\"" + d.createName + "\">" + d.createName + "</span>";
 					}}
 				,{field:'officeName',align:'center', title: '申请部门',  minwidth:200}
-				,{field:'areaDirector',align:'center', title: '区负责人',  minwidth:100}
+				,{field:'areaDirector',align:'center', title: '区负责人名称',  minwidth:100}
 				,{field:'areaName',align:'center', title: '关联区域',  minwidth:200}
 				,{field:'createDate',align:'center', title: '申请日期',  minwidth:200}
 				,{align:'center', title: '状态',  minwidth:150,templet:function(d){