Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/workcontractinfo/entity/WorkContractInfo.java

@@ -66,6 +66,8 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	private String contractCategory;	//变更原因
 	private String contractNum;			// 合同编号
 	private String contractPrice;		// 合同金额(元）
+	private String beginContractPrice;	//区间-开始  合同金额
+	private String endContractPrice;	//区间-结束  合同金额
 	private String contractOpposite;	// 对方合同编号
 	private String contractType;		// 合同类型
 	private String contractTypeDoc;		//合同类型说明
@@ -1054,4 +1056,20 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	public void setContractInformation(String contractInformation) {
 		this.contractInformation = contractInformation;
 	}
+
+	public String getBeginContractPrice() {
+		return beginContractPrice;
+	}
+
+	public void setBeginContractPrice(String beginContractPrice) {
+		this.beginContractPrice = beginContractPrice;
+	}
+
+	public String getEndContractPrice() {
+		return endContractPrice;
+	}
+
+	public void setEndContractPrice(String endContractPrice) {
+		this.endContractPrice = endContractPrice;
+	}
 }

src/main/webapp/webpage/modules/sys/gridselect1.jsp

@@ -69,7 +69,19 @@
 						<div class="layui-item query athird">
 							<span class="layui-form-label">联系人：</span>
 							<div class="layui-input-block">
-								<form:input path="${searchKey}" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
+								<form:input path="${searchKey}" htmlEscape="false" maxlength="50" class="form-control layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird">
+							<span class="layui-form-label">委托单位：</span>
+							<div class="layui-input-block">
+								<form:input path="clientId.name" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird">
+							<span class="layui-form-label">创建者：</span>
+							<div class="layui-input-block">
+								<form:input path="createName" htmlEscape="false" maxlength="50" class=" form-control layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item athird fr">