Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java

@@ -7,17 +7,21 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
-import com.jeeplus.modules.projectcontentinfo.service.*;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectReportChangeService;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
 import com.jeeplus.modules.projectreportnum.service.ProjectReportNumService;
-import com.jeeplus.modules.ruralprojectrecords.entity.*;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectcontentinfo;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
+import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -110,25 +114,6 @@ public class RuralProjectMessageController extends BaseController {
         String dictType = projectcontentinfo.getDictType();
         RuralProjectRecords records = projectRecordsService.getQueryProjectUsers(projectcontentinfo1.getProject().getId());
         model.addAttribute("projectRecords", records);
-
-        /*RuralProjectcontentinfo select = new RuralProjectcontentinfo();
-        select.setProject(records);
-        select.setParentIds("0,");
-        RuralProjectcontentinfo p = projectcontentinfoService.findListByProjectOnRural(select).get(0);
-        model.addAttribute("id",p.getId());
-        RuralProjectBasedData projectBasedData = new RuralProjectBasedData();
-        projectBasedData.setProject(records);
-        List<RuralProjectBasedData> projectBasedDatas = projectBasedDataService.findListOnRural(projectBasedData);
-        model.addAttribute("projectBasedDatas", projectBasedDatas);
-        RuralProjectContentData projectContentData = new RuralProjectContentData();
-        projectContentData.setProject(records);
-        List<RuralProjectContentData> projectContentDatas = projectContentDataService.findListOnRural(projectContentData);
-        model.addAttribute("projectContentDatas", projectContentDatas);
-        RuralProjectReportData projectReportInfo = new RuralProjectReportData();
-        projectReportInfo.setProject(records);
-        List<RuralProjectReportData> projectReportDatas = projectReportDataService.findListOnRural(projectReportInfo);
-        model.addAttribute("projectReportDatas", projectReportDatas);*/
-
         projectcontentinfo.setProject(records);
         ProjectReportData projectReportData = new ProjectReportData();
         projectReportData.setType(dictType);
@@ -157,6 +142,23 @@ public class RuralProjectMessageController extends BaseController {
     }
 
     /**
+     * 编辑项目表单页面
+     */
+    @RequiresPermissions(value={"ruralProject:ruralProjectMessage:edit"},logical= Logical.OR)
+    @RequestMapping(value = "modify")
+    public String modify(RuralProjectcontentinfo projectcontentinfo, Model model, RedirectAttributes redirectAttributes) {
+        Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
+        ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
+        Projectcontentinfo projectcontent = projectcontentinfoService.getByInfoId(projectReportData.getId());
+        projectcontent.setProjectReportData(projectReportData);
+        model.addAttribute("processInstanceId",projectReportData.getProcessInstanceId());
+        model.addAttribute("projectId", projectcontentinfo1.getProject().getId());
+        model.addAttribute("id", projectcontentinfo.getId());
+        model.addAttribute("projectcontentinfo", projectcontent);
+        return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportForm";
+    }
+
+    /**
      * 新增报告信息
      * @param projectcontentinfo
      * @param model

src/main/java/com/jeeplus/modules/wexintheorder/dao/TheOrderInformationDao.java

@@ -0,0 +1,11 @@
+package com.jeeplus.modules.wexintheorder.dao;
+
+import com.jeeplus.common.persistence.CrudDao;
+import com.jeeplus.common.persistence.annotation.MyBatisDao;
+import com.jeeplus.modules.wexintheorder.entity.TheOrderInformation;
+
+@MyBatisDao
+public interface TheOrderInformationDao extends CrudDao<TheOrderInformation> {
+    int queryCount(TheOrderInformation theOrderInformation);
+
+}

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

@@ -0,0 +1,64 @@
+package com.jeeplus.modules.wexintheorder.entity;
+
+import com.jeeplus.common.persistence.DataEntity;
+import com.jeeplus.common.utils.excel.annotation.ExcelField;
+
+public class TheOrderInformation extends DataEntity<TheOrderInformation> {
+    private String name;//姓名
+    private String department;//部门
+    private String team; //团队
+    private String specific; //具体部门
+    private String correlationId;//关联id
+    private String status;//有无回显 1-回显 2-本来就有
+
+    @ExcelField(title="姓名", align=2, sort=1)
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @ExcelField(title="部门", align=2, sort=3)
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+    }
+
+    @ExcelField(title="团队", align=2, sort=2)
+    public String getTeam() {
+        return team;
+    }
+
+    public void setTeam(String team) {
+        this.team = team;
+    }
+
+    public String getSpecific() {
+        return specific;
+    }
+
+    public void setSpecific(String specific) {
+        this.specific = specific;
+    }
+
+    public String getCorrelationId() {
+        return correlationId;
+    }
+
+    public void setCorrelationId(String correlationId) {
+        this.correlationId = correlationId;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+}

src/main/java/com/jeeplus/modules/wexintheorder/service/TheOrderInformationService.java

@@ -0,0 +1,35 @@
+package com.jeeplus.modules.wexintheorder.service;
+
+import com.jeeplus.common.persistence.Page;
+import com.jeeplus.common.service.CrudService;
+import com.jeeplus.common.utils.MenuStatusEnum;
+import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.wexintheorder.dao.TheOrderInformationDao;
+import com.jeeplus.modules.wexintheorder.entity.TheOrderInformation;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class TheOrderInformationService extends CrudService<TheOrderInformationDao,TheOrderInformation>{
+
+    public Page<TheOrderInformation> findPage(Page<TheOrderInformation> page, TheOrderInformation theOrder) {
+        //设置数据权限
+        if(!UserUtils.getUser().isAdmin()) {
+            String dataScopeSql = dataScopeFilterOR(theOrder.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_STOCK.getValue());
+            theOrder.getSqlMap().put("dsf", dataScopeSql);
+        }
+        int count = dao.queryCount(theOrder);
+        page.setCount(count);
+        page.setCountFlag(false);
+        theOrder.setPage(page);
+        List<TheOrderInformation> recordsList = findList(theOrder);
+        page.setList(recordsList);
+        return page;
+    }
+
+    public List<TheOrderInformation> findList(TheOrderInformation theOrder) {
+        return super.findList(theOrder);
+    }
+
+}

src/main/java/com/jeeplus/modules/wexintheorder/web/TheOrderInformationController.java

@@ -0,0 +1,76 @@
+package com.jeeplus.modules.wexintheorder.web;
+
+import com.jeeplus.common.config.Global;
+import com.jeeplus.common.persistence.Page;
+import com.jeeplus.common.utils.DateUtils;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.excel.ExportExcel;
+import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.wexintheorder.entity.TheOrderInformation;
+import com.jeeplus.modules.wexintheorder.service.TheOrderInformationService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Controller
+@RequestMapping(value = "${adminPath}/wexin/theOrderInformation")
+public class TheOrderInformationController extends BaseController {
+    @Autowired
+    private TheOrderInformationService theOrderInformationService;
+
+    @ModelAttribute
+    public TheOrderInformation get(@RequestParam(required=false) String id) {
+        TheOrderInformation theOrder = null;
+        if (StringUtils.isNotBlank(id)){
+            theOrder = theOrderInformationService.get(id);
+        }
+        if (theOrder == null){
+            theOrder = new TheOrderInformation();
+        }
+        return theOrder;
+    }
+
+    /**
+     * 项目列表页面
+     */
+    @RequiresPermissions("wexin:theOrderInformation:list")
+    @RequestMapping(value = {"list", ""})
+    public String list(TheOrderInformation theOrder, HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<TheOrderInformation> page = theOrderInformationService.findPage(new Page<TheOrderInformation>(request, response), theOrder);
+        model.addAttribute("page", page);
+        model.addAttribute("team",theOrder.getTeam());
+        model.addAttribute("department",theOrder.getDepartment());
+        model.addAttribute("specific",theOrder.getSpecific());
+        return "modules/theorder/theOrderInformationList";
+    }
+
+    /**
+     * 导出excel文件
+     */
+    @RequiresPermissions("wexin:theOrderInformation:export")
+    @RequestMapping(value = "export", method = RequestMethod.POST)
+    public String exportFile(TheOrderInformation theOrder, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
+        try {
+            String fileName = "订餐人员管理" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
+            User user = UserUtils.getUser();
+            theOrder.setCurrentUser(user);
+            Page<TheOrderInformation> page = theOrderInformationService.findPage(new Page<TheOrderInformation>(request, response, -1), theOrder);
+            new ExportExcel(true,"订餐人员管理", TheOrderInformation.class,1).setDataList(page.getList()).write(response, fileName,request.getHeader("USER-AGENT")).dispose();
+            return null;
+        } catch (Exception e) {
+            addMessage(redirectAttributes, "导出订餐人员管理记录失败！失败信息：" + e.getMessage());
+        }
+        return "redirect:" + Global.getAdminPath() + "/wexin/theorderweb/?repage";
+    }
+}

src/main/java/com/jeeplus/modules/wexintheorder/web/TheOrderWebController.java

@@ -91,7 +91,7 @@ public class TheOrderWebController extends BaseController {
         /*} catch (Exception e) {
             addMessage(redirectAttributes, "导出项目记录失败！失败信息："+e.getMessage());
         }*/
-        return "redirect:"+ Global.getAdminPath()+"/project/projectRecords/?repage";
+        return "redirect:"+ Global.getAdminPath()+"/wexin/theorderweb/?repage";
     }
 
     private static String dateTimeStr(Date dateTime){

src/main/resources/jeeplus.properties

@@ -6,11 +6,11 @@
 jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
 db.name=ruihuaoa-activity-data
-#jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
-jdbc.url=jdbc:mysql://127.0.0.1:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
+#jdbc.url=jdbc:mysql://127.0.0.1:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
 jdbc.username=root
-jdbc.password=123456
-#jdbc.password=root
+#jdbc.password=123456
+jdbc.password=root
 
 #pool settings
 jdbc.pool.init=20

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

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.modules.wexintheorder.dao.TheOrderInformationDao">
+	<sql id="orderColumns">
+	  a.id,
+	  a.create_by AS "createBy.id",
+	  a.create_date AS "createDate",
+	  a.update_by AS "updateBy.id",
+	  a.update_date AS "updateDate",
+	  a.del_flag as "delFlag",
+	  a.remarks,
+	  a.team,
+	  a.financial,
+	  a.specific,
+	  a.correlationId
+	</sql>
+
+	<sql id="orderLeftJoinColumns">
+		left join sys_user su on su.id =a.correlationId
+		left join sys_office so on su.office_id = so.id
+		left join sys_company sc on su.company_id=sc.id
+	</sql>
+
+	<select id="get" resultType="com.jeeplus.modules.wexintheorder.entity.TheOrderInformation">
+		SELECT
+		<include refid="orderColumns"/>
+		,a.department
+		FROM the_order_information a
+		WHERE a.id = #{id}
+	</select>
+
+	<select id="findList" resultType="com.jeeplus.modules.wexintheorder.entity.TheOrderInformation" >
+		SELECT
+		<include refid="orderColumns"/>
+		,su.name as "name"
+		, concat_ws(" / ",a.department,a.specific) as department
+		FROM the_order_information a
+		<include refid="orderLeftJoinColumns"/>
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			<if test="team != null and team != ''">
+				and a.team=#{team}
+			</if>
+			<if test="department != null and department != ''">
+				and a.department=#{department}
+			</if>
+			<if test="specific != null and specific != ''">
+				and a.specific=#{specific}
+			</if>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY a.team asc,a.department asc,a.specific asc ,sc.id desc , so.id desc, a.create_date asc , ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.team asc,a.department asc,a.specific asc ,sc.id desc , so.id desc, a.create_date asc
+			</otherwise>
+		</choose>
+	</select>
+
+	<select id="queryCount" resultType="int">
+		SELECT count(DISTINCT a.id)
+		from the_order_information a
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			<if test="team != null and team != ''">
+				and a.team=#{team}
+			</if>
+			<if test="department != null and department != ''">
+				and a.department=#{department}
+			</if>
+			<if test="specific != null and specific != ''">
+				and a.specific=#{specific}
+			</if>
+		</where>
+	</select>
+
+
+</mapper>

src/main/resources/spring-context-jedis.xml

@@ -15,7 +15,7 @@
 		<property name="maxTotal" value="60000" /> <!-- 最大分配的对象数 -->
 		<property name="testOnBorrow" value="true" /> <!-- 当调用borrow Object方法时，是否进行有效性检查 -->
 	</bean>
-	
+
 	<bean id="jedisPool" class="redis.clients.jedis.JedisPool">
 		<constructor-arg index="0" ref="jedisPoolConfig" />
 		<constructor-arg index="1" value="${redis.host}" />

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportForm.jsp

@@ -433,6 +433,7 @@
 						</thead>
 						<tbody id="file_attachment">
 						<c:forEach items="${projectcontentinfo.projectReportData.workAttachments}" var = "workClientAttachment" varStatus="status">
+							<c:if test="${workClientAttachment.divIdType eq '_attachment'}">
 							<tr>
 									<%-- <td>${status.index + 1}</td>--%>
 								<c:choose>
@@ -466,6 +467,7 @@
 									</div>
 								</td>
 							</tr>
+							</c:if>
 						</c:forEach>
 						</tbody>
 					</table>
@@ -501,6 +503,7 @@
 						</thead>
 						<tbody id="file_gistdata">
 						<c:forEach items="${projectcontentinfo.projectReportData.workAttachments}" var = "workClientAttachment" varStatus="status">
+							<c:if test="${workClientAttachment.divIdType eq '_gistdata'}">
 							<tr>
 									<%-- <td>${status.index + 1}</td>--%>
 								<c:choose>
@@ -534,6 +537,7 @@
 									</div>
 								</td>
 							</tr>
+							</c:if>
 						</c:forEach>
 						</tbody>
 					</table>
@@ -569,6 +573,7 @@
 						</thead>
 						<tbody id="file_other">
 						<c:forEach items="${projectcontentinfo.projectReportData.workAttachments}" var = "workClientAttachment" varStatus="status">
+							<c:if test="${workClientAttachment.divIdType eq '_other'}">
 							<tr>
 									<%-- <td>${status.index + 1}</td>--%>
 								<c:choose>
@@ -602,6 +607,7 @@
 									</div>
 								</td>
 							</tr>
+							</c:if>
 						</c:forEach>
 						</tbody>
 					</table>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -298,15 +298,15 @@
                         }
                         if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/form?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
                         }
                         if(d.canedit2 != undefined && d.canedit2 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralProjectRecords/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
                         }
                         if(d.canrecall != undefined && d.canrecall =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralProjectRecords/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralProjectMessage/form?projectId=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
                         }
                         if(d.cancancel != undefined && d.cancancel =="1")
                         {

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

@@ -0,0 +1,216 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>午餐预定人管理</title>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript">
+        $(document).ready(function() {
+            //搜索框收放
+            $('#moresee').click(function(){
+                if($('#moresees').is(':visible'))
+                {
+                    $('#moresees').slideUp(0,resizeListWindow2);
+                    $('#moresee i').removeClass("glyphicon glyphicon-menu-up").addClass("glyphicon glyphicon-menu-down");
+                }else{
+                    $('#moresees').slideDown(0,resizeListWindow2);
+                    $('#moresee i').removeClass("glyphicon glyphicon-menu-down").addClass("glyphicon glyphicon-menu-up");
+                }
+            });
+        });
+        function reset() {
+            $("#searchForm").resetForm();
+        }
+
+        window.onload=function(){
+            $('#department').html('<option value="${department}">${department}</option>')
+            $('#specific').html('<option value="${specific}">${specific}</option>')
+            layui.form.render("select");
+        }
+	</script>
+	<style>
+		body{
+			background-color:transparent;
+			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
+			color:#ffffff;
+			background-color:rgba(255,255,255,0);
+			height:100%;
+		}
+	</style>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<sys:message content="${message}"/>
+	<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/theOrderInformation/" 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="${team=='潘中'}">selected</c:if>>潘中</option>
+									<option value="盛小兰" <c:if test="${team=='盛小兰'}">selected</c:if>>盛小兰</option>
+									<option value="王春生" <c:if test="${team=='王春生'}">selected</c:if>>王春生</option>
+									<option value="其他" <c:if test="${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">
+								<select name="department" id="department" lay-verify="required" lay-filter="quyufilter"></select>
+							</div>
+						</div>
+						<div class="layui-item athird">
+							<div class="input-group">
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
+								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+							</div>
+						</div>
+						<div style="    clear:both;"></div>
+						<div id="moresees" class="lw7" style="clear:both;display:none;height: 70px;">
+							<div  class="layui-item query athird ">
+								<label class="layui-form-label">具体部门</label>
+								<div class="layui-input-block">
+									<select name="specific" id="specific" lay-verify="required" lay-filter="specificfilter"></select>
+								</div>
+							</div>
+						</div>
+					</div>
+				</form:form>
+			</div>
+		</div>
+		<div class="full-width fl">
+			<div class="layui-form contentDetails contentShadow shadowLBR">
+				<div class="nav-btns">
+					<shiro:hasPermission name="wexin:theorderinformation:export">
+						<table:exportExcel url="${ctx}/wexin/theOrderInformation/export"></table:exportExcel><!-- 导出按钮 -->
+					</shiro:hasPermission>
+					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+					<div style="clear: both;"></div>
+				</div>
+				<table class="oa-table layui-table" id="contentTable1"></table>
+
+				<!-- 分页代码 -->
+				<table:page page="${page}"></table:page>
+				<div style="clear: both;"></div>
+			</div>
+		</div>
+	</div>
+	<div id="changewidth"></div>
+</div>
+
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script>
+
+    layui.use(['table','form'], function(){
+
+        var form = layui.form;
+        layui.form.on('select(cityfilter)',function(data) {
+                if (data.value == "") {
+                    $('#department').html('<option value="">请选择部门</option>');
+                    layui.form.render("select");
+                } else {
+                    if (data.value == "潘中") {
+                        $('#department').html('<option value="">请选择部门</option>')
+						$('#department').append(new Option("财务", "财务"));
+                        $('#department').append(new Option("工程", "工程"));
+                        $('#department').append(new Option("管理咨询", "管理咨询"));
+                        $('#department').append(new Option("资产评估", "资产评估"));
+                        $('#department').append(new Option("其他", "其他"));
+                    } else if (data.value == "盛小兰") {
+                        $('#department').html('<option value="">请选择部门</option>')
+                    } else if (data.value == "王春生") {
+                        $('#department').html('<option value="">请选择部门</option>')
+                    } else if (data.value == "其他") {
+                        $('#department').html('<option value="">请选择部门</option>')
+                    }
+                    layui.form.render("select");
+                }
+            });
+
+        layui.form.on('select(quyufilter)',function(data) {
+            if (data.value == "") {
+                $('#specific').html('<option value="">请选择具体部门</option>');
+                layui.form.render("select");
+            } else {
+                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("其他", "其他"));
+                } else if (data.value == "工程") {
+                    $('#specific').html('<option value="">请选择具体部门</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>')
+                } else if (data.value == "资产评估") {
+                    $('#specific').html('<option value="">请选择具体部门</option>')
+                } else if (data.value == "其他") {
+                    $('#specific').html('<option value="">请选择具体部门</option>')
+                }
+                layui.form.render("select");
+            }
+        });
+
+
+
+
+        layui.table.render({
+            limit:${ page.pageSize }
+            ,elem: '#contentTable1'
+            ,page: false
+            ,cols: [[
+                {field:'index',align:'center', title: '序号',width:40}
+                ,{field:'name', align:'center',title: '姓名',minWidth:100,templet:function(d){
+                        return "<span title='"+ d.name +"'>" + d.name + "</span>";
+                    }}
+                ,{field:'team', align:'center',title: '团队',minWidth:100,templet:function(d){
+                        return "<span title='"+ d.team +"'>" + d.team + "</span>";
+                    }}
+                ,{field:'department', align:'center',title: '部门',minWidth:100,templet:function(d){
+                        return "<span title='"+ d.department +"'>" + d.department + "</span>";
+                    }}
+                ,{field:'createDate',align:'center', title: '创建时间',  width:180}
+            ]]
+            ,data: [
+                <c:if test="${ not empty page.list}">
+                <c:forEach items="${page.list}" var="theOrder" varStatus="index">
+                <c:if test="${index.index != 0}">,</c:if>
+                {
+                    "index":"${index.index+1}"
+                    ,"id":"${theOrder.id}"
+                    ,"name":"${theOrder.name}"
+                    ,"team":"${theOrder.team}"
+                    ,"department":"${theOrder.department}"
+                    ,"createDate":"<fmt:formatDate value="${theOrder.createDate}" pattern="yyyy-MM-dd HH:ss:mm"/>"
+                }
+                </c:forEach>
+                </c:if>
+            ]
+        });
+    })
+
+    resizeListTable();
+    $("a").on("click",addLinkVisied);
+</script>
+<script>
+    resizeListWindow2();
+    $(window).resize(function(){
+        resizeListWindow2();
+    });
+</script>
+</body>
+</html>