批量归档列表页面搜索框变更

src/main/java/com/jeeplus/modules/projectFilingBatch/entity/ProjectFilingBatch.java

@@ -8,6 +8,7 @@ import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
 
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -21,6 +22,7 @@ public class ProjectFilingBatch extends DataEntity<ProjectFilingBatch> {
     private static final long serialVersionUID = 1L;
     @NotNull(message = "归档编号不能为空")
     private String filingBatch ;//档次批号
+    private String filingName ;//批次归档名称
     private String processinstanceId;// 审批流程id
     private Integer filingStatus;//归档审批状态
     private String projectId; //项目id
@@ -38,6 +40,12 @@ public class ProjectFilingBatch extends DataEntity<ProjectFilingBatch> {
     private String relationId;
     private Integer relationdelFlag;
 
+    private Date beginDate;
+    private Date endDate;
+    private String createName;
+    private String createNameStr;   //创建人
+    private String createId;     //创建人id
+
     public String getProcessinstanceId() {
         return processinstanceId;
     }
@@ -173,4 +181,52 @@ public class ProjectFilingBatch extends DataEntity<ProjectFilingBatch> {
     public void setRelationdelFlag(Integer relationdelFlag) {
         this.relationdelFlag = relationdelFlag;
     }
+
+    public String getFilingName() {
+        return filingName;
+    }
+
+    public void setFilingName(String filingName) {
+        this.filingName = filingName;
+    }
+
+    public Date getBeginDate() {
+        return beginDate;
+    }
+
+    public void setBeginDate(Date beginDate) {
+        this.beginDate = beginDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public String getCreateNameStr() {
+        return createNameStr;
+    }
+
+    public void setCreateNameStr(String createNameStr) {
+        this.createNameStr = createNameStr;
+    }
+
+    public String getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(String createId) {
+        this.createId = createId;
+    }
 }

src/main/java/com/jeeplus/modules/projectFilingBatch/web/ProjectFilingBatchController.java

@@ -75,6 +75,14 @@ public class ProjectFilingBatchController extends BaseController {
         if (UserUtils.isManager()) {
             model.addAttribute("flag", "1");
         }
+        if(StringUtils.isNotBlank(projectGuidang.getCreateId())){
+            User selectUser = UserUtils.get(projectGuidang.getCreateId());
+            model.addAttribute("createName", selectUser.getName());
+        }else{
+            if(StringUtils.isNotBlank(projectGuidang.getCreateNameStr())){
+                model.addAttribute("createName", projectGuidang.getCreateNameStr());
+            }
+        }
         //获取列表数据
         Page<ProjectFilingBatch> page = projectFilingBatchService.findPage(new Page<ProjectFilingBatch>(request, response), projectGuidang);
         model.addAttribute("page", page);

src/main/resources/mappings/modules/projectGuidang/ProjectFilingBatchDao.xml

@@ -11,7 +11,8 @@
 		a.filing_batch AS "filingBatch",
 		a.process_instance_id AS "processinstanceId",
 		a.information AS "information",
-		a.filing_status AS "filingStatus"
+		a.filing_status AS "filingStatus",
+		a.filing_name as "filingName"
 	</sql>
 	<sql id="filingBatchRelationColumns">
 		distinct a.id AS "id",
@@ -23,6 +24,7 @@
 		a.filing_batch AS "filingBatch",
 		a.process_instance_id AS "processinstanceId",
 		a.filing_status AS "filingStatus",
+		a.filing_name as "filingName",
 		a.information AS "information",
 		g.project_id AS "projectId",
 		g.status AS "status",
@@ -40,7 +42,8 @@
 		a.filing_batch AS "filingBatch",
 		a.process_instance_id AS "processinstanceId",
 		a.filing_status AS "filingStatus",
-		a.information AS "information"
+		a.information AS "information",
+		a.filing_name as "filingName"
 	</sql>
 	<insert id="insert">
 		insert into project_filingbatch
@@ -55,7 +58,8 @@
 		information,
 		filing_status,
 		company_id,
-		office_id
+		office_id,
+		filing_name
 		)
 		VALUES
 		(
@@ -70,7 +74,8 @@
 		#{information},
 		#{filingStatus},
 		#{company.id},
-		#{office.id}
+		#{office.id},
+		#{filingName}
 		)
 	</insert>
 	<update id="update">
@@ -94,6 +99,9 @@
 			<if test="updateDate!=null">
 				filing_status=#{filingStatus}
 			</if>
+			<if test="filingName!=null and filingName != ''">
+				,filing_name=#{filingName}
+			</if>
 		</set>
 		where id =#{id}
 	</update>
@@ -105,6 +113,7 @@
 	</update>
 	<select id="queryCount" resultType="int">
 		SELECT count(DISTINCT a.id) FROM project_filingbatch a
+		left join sys_user su on su.id = a.create_by
 		<where>
 			<if test="filingBatch!=null and filingBatch!=''">
 				and a.filing_batch like concat('%',#{filingBatch},'%')
@@ -112,6 +121,15 @@
 			<if test="filingStatus!=null">
 				and a.filing_status = #{filingStatus}
 			</if>
+			<if test="(createId != null and createId != '') or (createNameStr != null and createNameStr != '')">
+				AND (a.create_by = #{createId} or su.name = #{createNameStr})
+			</if>
+			<if test="beginDate !=null">
+				AND a.create_date >= #{beginDate}
+			</if>
+			<if test="endDate !=null">
+				AND a.create_date &lt; #{endDate}
+			</if>
 			AND a.del_flag='0'
 			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
 				${sqlMap.dsf}
@@ -119,14 +137,27 @@
 		</where>
 	</select>
 	<select id="findList" resultType="projectFilingBatch" >
-		SELECT <include refid="projectFilingBatchColumns"/>  FROM project_filingbatch a
+		SELECT
+			<include refid="projectFilingBatchColumns"/>
+		FROM project_filingbatch a
+		left join sys_user su on su.id = a.create_by
 		<where>
-			<if test="filingBatch!=null and filingBatch!=''">
-				and a.filing_batch like concat('%',#{filingBatch},'%')
+			<if test="filingName!=null and filingName!=''">
+				and a.filing_name like concat('%',#{filingName},'%')
 			</if>
 			<if test="filingStatus!=null">
 				and a.filing_status = #{filingStatus}
 			</if>
+
+			<if test="(createId != null and createId != '') or (createNameStr != null and createNameStr != '')">
+				AND (a.create_by = #{createId} or su.name = #{createNameStr})
+			</if>
+			<if test="beginDate !=null">
+				AND a.create_date >= #{beginDate}
+			</if>
+			<if test="endDate !=null">
+				AND a.create_date &lt; #{endDate}
+			</if>
 			AND a.del_flag='0'
 			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
 				${sqlMap.dsf}

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchList.jsp

@@ -19,16 +19,16 @@
         $(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");
-            //     }
-            // });
+            $('#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");
+                }
+            });
             laydate.render({
                 elem: '#beginDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                 event: 'focus', //响应事件。如果没有传入event，则按照默认的click
@@ -182,9 +182,9 @@
                     <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>
+                            <label class="layui-form-label">归档名称：</label>
                             <div class="layui-input-block">
-                                <form:input path="filingBatch" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+                                <form:input path="filingName" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
                             </div>
                         </div>
                         <div class="layui-item query athird ">
@@ -198,13 +198,34 @@
                         </div>
                         <div class="layui-item athird">
                             <div class="input-group">
-<%--                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+                                <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>
+                    <div id="moresees" style="clear:both;display:none;" class="commonQuery lw6">
+                        <div class="layui-item query athird">
+                            <label class="layui-form-label">创建时间：</label>
+                            <div class="layui-input-block">
+                                <input id="beginDate" placeholder="开始时间" name="beginDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+                                       value="<fmt:formatDate value="${projectFilingBatch.beginDate}" pattern="yyyy-MM-dd"/>"/>
+                                </input>
+                                <span class="group-sep">-</span>
+                                <input id="endDate" placeholder="结束时间" name="endDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+                                       value="<fmt:formatDate value="${projectFilingBatch.endDate}" pattern="yyyy-MM-dd"/>"/>
+                                </input>
+                            </div>
+                        </div>
+                        <div class="layui-item query athird">
+                            <label class="layui-form-label">创建人：</label>
+                            <div class="layui-input-block  with-icon">
+                                <sys:inquireselectUserNotReadolny id="create" name="createId" value="${createId}" labelName="createNameStr" labelValue="${createName}"
+                                                                  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                            </div>
+                        </div>
+                    </div>
                 </form:form>
             </div>
         </div>