Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/information/entity/Information.java

@@ -78,10 +78,35 @@ public class Information extends DataEntity<Information>  {
 	private String noFinishDate;
 	//归口部门
 	private String underCentralized;
+	//记录查询项目定义号数组
+	private String[] attrs;
+	//记录导入文件查询条件
+	private  List<Information> fileList;
+	//记录超期查询状态（>=,>,=,<,<=）
+	private String extendedStatus;
+	//记录查询超期时间
+	private String extendedTime;
+
+
+	public String getExtendedStatus() {
+		return extendedStatus;
+	}
+
+	public void setExtendedStatus(String extendedStatus) {
+		this.extendedStatus = extendedStatus;
+	}
+
+	public String getExtendedTime() {
+		return extendedTime;
+	}
+
+	public void setExtendedTime(String extendedTime) {
+		this.extendedTime = extendedTime;
+	}
+
+
 
-	String[] attrs;
 
-	List<Information> fileList;
 
 	public String getHiddenSign() {
 		return hiddenSign;

src/main/java/com/jeeplus/modules/sg/record/web/RecordController.java

@@ -12,6 +12,7 @@ import com.jeeplus.modules.sg.material.entity.Material;
 import com.jeeplus.modules.sg.material.service.MaterialService;
 import com.jeeplus.modules.sg.record.entity.Record;
 import com.jeeplus.modules.sg.record.service.RecordService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -53,7 +54,7 @@ public class RecordController extends BaseController {
 	/**
 	 * 项目管理列表页
 	 */
-//	@RequiresPermissions("modules:sg:information:information:list")
+	@RequiresPermissions("modules:sg:record:record:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(Record record, Model model) {
 		model.addAttribute("recordList", record);
@@ -64,7 +65,7 @@ public class RecordController extends BaseController {
 	 * 项目管理列表数据
 	 */
 	@ResponseBody
-//	@RequiresPermissions("modules:sg:information:information:list")
+	@RequiresPermissions("modules:sg:record:record:list")
 	@RequestMapping(value = "data")
 	public Map<String, Object> data(Record record, HttpServletRequest request, HttpServletResponse response, Model model) {
 		Page<Record> page = recordService.findPage(new Page<Record>(request, response), record);

src/main/webapp/webpage/modules/sg/information/informationList.jsp

@@ -23,7 +23,7 @@
 			<form:form id="searchForm" modelAttribute="information" class="form form-horizontal well clearfix">
 			 <div class="col-xs-12 col-sm-6 col-md-4">
 				<label class="label-item single-overflow pull-left" title="项目定义号：">项目定义号：</label>
-				 <form:input path="projectId" htmlEscape="false" maxlength="100"  class=" form-control"/>
+				 <form:input path="projectId" htmlEscape="false" class=" form-control"/>
 			</div>
 			 <div class="col-xs-12 col-sm-6 col-md-4">
 				<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
@@ -63,6 +63,26 @@
 						</form:select>
 					</div>
 				</div>
+				<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="form-group">
+						<label class="label-item single-overflow pull-left" title="选择查询的情况：">&nbsp;选择查询的情况：</label>
+						<form:select path="extendedStatus" htmlEscape="false" maxlength="100"  class=" form-control">
+							<form:option value="">请选择</form:option>
+							<form:option value="大于等于"> 大于等于</form:option>
+							<form:option value="大于"> 大于</form:option>
+							<form:option value="等于"> 等于</form:option>
+							<form:option value="小于等于"> <= </form:option>
+							<form:option value="小于"> 小于</form:option>
+						</form:select>
+					</div>
+				</div>
+				<div class="col-xs-12 col-sm-6 col-md-4">
+					<div class="form-group">
+						<label class="label-item single-overflow pull-left" title="输入天数：">&nbsp;输入天数：</label>
+						<form:input path="extendedTime" htmlEscape="false" maxlength="100"  class=" form-control"/>
+					</div>
+				</div>
+
 				<form:hidden path="hiddenSign"/>
 <%--				<form:input type="hidden" id="hiddenSign"/>--%>
 		 <div class="col-xs-12 col-sm-6 col-md-4">