Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/wexintheorder/entity/TheOrder.java

@@ -89,6 +89,7 @@ public class TheOrder extends DataEntity<TheOrder> {
         this.name = name;
     }
 
+    @ExcelField(title="部门", align=2, sort=4)
     public String getDepartment() {
         return department;
     }
@@ -106,7 +107,6 @@ public class TheOrder extends DataEntity<TheOrder> {
         this.team = team;
     }
 
-    @ExcelField(title="部门", align=2, sort=4)
     public String getSpecific() {
         return specific;
     }

src/main/resources/mappings/modules/wexintheorder/TheOrderWebDao.xml

@@ -39,6 +39,9 @@
 		<include refid="orderLeftJoinColumns"/>
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
+			<if test="team != null and team != ''">
+				and a.team = #{team}
+			</if>
 			<if test="orderStatus != null and orderStatus == 0">
 				<if test="beginDate !=null">
 					and a.scheduled >= #{beginDate}
@@ -62,6 +65,9 @@
 		SELECT count(DISTINCT a.id)
 		from the_order a
 	  	<where>
+			<if test="team != null and team != ''">
+				and a.team = #{team}
+			</if>
 			<if test="orderStatus != null and orderStatus == 0">
 				<if test="beginDate !=null">
 					and a.scheduled >= #{beginDate}
@@ -77,6 +83,9 @@
 	<select id="getLeadershipList" resultType="com.jeeplus.modules.wexintheorder.entity.TheOrder">
 		select distinct(a.team) as department from the_order a
 		<where>
+			<if test="team != null and team != ''">
+				and a.team = #{team}
+			</if>
 			<if test="beginDate !=null">
 				and a.scheduled >= #{beginDate}
 			</if>
@@ -90,11 +99,14 @@
 	select (@rownum :=@rownum + 1) as "serialNumber",theOrder.* from (
 		select
 			<include refid="orderColumns"/>
-		,a.department
+		, concat_ws(" / ",a.department,a.specific) as department
 		from the_order a
 			<include refid="orderLeftJoinColumns"/>
 		<where>
 			a.team=#{department}
+			<if test="team != null and team != ''">
+				and a.team = #{team}
+			</if>
 			<if test="beginDate !=null">
 				and a.scheduled >= #{beginDate}
 			</if>
@@ -102,7 +114,7 @@
 				and a.scheduled &lt; #{endDate}
 			</if>
 		</where>
-		order by sc.id desc ,so.id desc,a.create_date asc) as theOrder ,(select @rownum := 0) temp
+		order by a.team asc,a.department asc,a.specific desc,sc.id desc ,so.id desc,a.create_date asc) as theOrder ,(select @rownum := 0) temp
 	</select>
 
 
@@ -114,6 +126,9 @@
 		from the_order a
 		<include refid="orderLeftJoinColumns"/>
 		<where>
+			<if test="team != null and team != ''">
+				and a.team = #{team}
+			</if>
 			<if test="beginDate !=null">
 				and a.scheduled >= #{beginDate}
 			</if>
@@ -121,8 +136,8 @@
 				and a.scheduled &lt; #{endDate}
 			</if>
 		</where>
-		group by a.specific
-		order by a.specific desc,a.team asc,a.department asc,sc.id desc ,so.id desc,a.create_date asc) as theOrder ,(select @rownum := 0) temp
+		group by a.team,a.specific
+		order by a.team asc,a.department asc,a.specific desc,sc.id desc ,so.id desc,a.create_date asc) as theOrder ,(select @rownum := 0) temp
 	</select>
 
 </mapper>

src/main/webapp/webpage/modules/theorder/theOrderInformationList.jsp

@@ -144,6 +144,7 @@
                 if (data.value == "财务") {
                     $('#specific').html('<option value="">请选择具体部门</option>')
                     $('#specific').append(new Option("审计部", "审计部"));
+                    $('#specific').append(new Option("审计一部", "审计一部"));
                     $('#specific').append(new Option("证券一部", "证券一部"));
                     $('#specific').append(new Option("证券二部", "证券二部"));
                     $('#specific').append(new Option("证券三部", "证券三部"));
@@ -153,6 +154,7 @@
                     $('#specific').append(new Option("工程一部", "工程一部"));
                     $('#specific').append(new Option("工程二部", "工程二部"));
                     $('#specific').append(new Option("工程三部", "工程三部"));
+                    $('#specific').append(new Option("招标代理", "招标代理"));
                     $('#specific').append(new Option("其他", "其他"));
                 } else if (data.value == "管理咨询") {
                     $('#specific').html('<option value="">请选择具体部门</option>')

src/main/webapp/webpage/modules/theorder/theOrderList.jsp

@@ -20,14 +20,12 @@
             laydate.render({
                 elem: '#beginDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                 event: 'focus', //响应事件。如果没有传入event，则按照默认的click
-                type : 'date',
-                value : getRecentDay(1)
+                type : 'date'
             });
             laydate.render({
                 elem: '#endDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                 event: 'focus', //响应事件。如果没有传入event，则按照默认的click
-                type : 'date',
-                value : getRecentDay(2)
+                type : 'date'
             });
         });
 
@@ -71,20 +69,32 @@
 	<div class="layui-row">
 		<div class="full-width fl">
 			<div class="layui-row contentShadow shadowLR" id="queryDiv">
-				<form:form id="searchForm" modelAttribute="theOrder" action="${ctx}/wexin/theorderweb/" method="post" class="form-inline">
+				<form:form id="searchForm" modelAttribute="theOrder" action="${ctx}/wexin/theorderweb/" method="post" class="form-inline layui-form">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/>
 					<div class="commonQuery lw6">
+						<div  class="layui-item query athird ">
+							<label class="layui-form-label">团队</label>
+							<div class="layui-input-block with-icon">
+								<select name="team" id="team" lay-verify="required" lay-filter="cityfilter">
+									<option value=""></option>
+									<option value="潘中" <c:if test="${theOrder.team=='潘中'}">selected</c:if>>潘中</option>
+									<option value="盛小兰" <c:if test="${theOrder.team=='盛小兰'}">selected</c:if>>盛小兰</option>
+									<option value="王春生" <c:if test="${theOrder.team=='王春生'}">selected</c:if>>王春生</option>
+									<option value="其他" <c:if test="${theOrder.team=='其他'}">selected</c:if>>其他</option>
+								</select>
+							</div>
+						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">创建时间：</label>
 							<div class="layui-input-block">
 								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
-									   value="<fmt:formatDate value="${projectRecords.beginDate}" pattern="yyyy-MM-dd HH:ss:mm"/>"/>
+									   value="<fmt:formatDate value="${theOrder.beginDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>
 								<span class="group-sep">-</span>
 								<input id="endDate" name="endDate" placeholder="结束时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
-									   value="<fmt:formatDate value="${projectRecords.endDate}" pattern="yyyy-MM-dd HH:ss:mm"/>"/>
+									   value="<fmt:formatDate value="${theOrder.endDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>
 							</div>
 						</div>
@@ -95,6 +105,7 @@
 								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
 							</div>
 						</div>
+
 						<div style="    clear:both;"></div>
 					</div>
 				</form:form>