添加咨询收入查询筛选项

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -431,6 +431,10 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private Integer caseBaseAuditNotifyFlag; //新增案例文件代办(审批)判定条件
 
 
+	private BigDecimal beginMoney;	//咨询营业收入(开始)
+	private BigDecimal endMoney;	//咨询营业收入（结束）
+
+
 	private ProjectReportDataVo projectReportDataVo;
 
 	public ProjectReportDataVo getProjectReportDataVo() {
@@ -2842,4 +2846,20 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setProjectMaterialStorageStatus(String projectMaterialStorageStatus) {
 		this.projectMaterialStorageStatus = projectMaterialStorageStatus;
 	}
+
+	public BigDecimal getBeginMoney() {
+		return beginMoney;
+	}
+
+	public void setBeginMoney(BigDecimal beginMoney) {
+		this.beginMoney = beginMoney;
+	}
+
+	public BigDecimal getEndMoney() {
+		return endMoney;
+	}
+
+	public void setEndMoney(BigDecimal endMoney) {
+		this.endMoney = endMoney;
+	}
 }

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml

@@ -588,6 +588,14 @@ END) as projectScale*/
 				AND a.submit_scale < #{endSubmitScale}
 			</if>
 
+			<!-- 咨询营业收入 -->
+			<if test="beginMoney !=null">
+				AND prd.ZiXunShouRu >= #{beginMoney}
+			</if>
+			<if test="endMoney !=null">
+				AND prd.ZiXunShouRu &lt; #{endMoney}
+			</if>
+
 			<!-- 质量复核审核时间 -->
 			<if test="reportBeginDate !=null">
 				AND prd.audit_pass_date >= #{reportBeginDate}
@@ -1091,6 +1099,14 @@ END) as projectScale*/
 			<if test="endSubmitScale !=null and endSubmitScale != ''">
 				AND a.submit_scale &lt; #{endSubmitScale}
 			</if>
+
+			<!-- 咨询营业收入 -->
+			<if test="beginMoney !=null">
+				AND prd.ZiXunShouRu >= #{beginMoney}
+			</if>
+			<if test="endMoney !=null">
+				AND prd.ZiXunShouRu &lt; #{endMoney}
+			</if>
 			<!-- 质量复核审核时间 -->
 			<if test="reportBeginDate !=null">
 				AND prd.audit_pass_date >= #{reportBeginDate}
@@ -1517,6 +1533,14 @@ END) as projectScale*/
 				AND a.submit_scale &lt; #{endSubmitScale}
 			</if>
 
+			<!-- 咨询营业收入 -->
+			<if test="beginMoney !=null">
+				AND prd.ZiXunShouRu >= #{beginMoney}
+			</if>
+			<if test="endMoney !=null">
+				AND prd.ZiXunShouRu &lt; #{endMoney}
+			</if>
+
 			<!-- 质量复核审核时间 -->
 			<if test="reportBeginDate !=null">
 				AND prd.audit_pass_date >= #{reportBeginDate}

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -898,6 +898,17 @@
 						</div>
 
 						<div class="layui-item query athird ">
+							<label class="layui-form-label">咨询收入(万元)：</label>
+							<div class="layui-input-block readOnlyFFF">
+								<input id="beginMoney" name="beginMoney" value="${ruralProjectRecords.beginMoney}" htmlEscape="false" maxlength="255"  class=" form-control layui-input query-group"/>
+								</input>
+								<span class="group-sep">-</span>
+								<input id="endMoney" name="endMoney" value="${ruralProjectRecords.endMoney}" htmlEscape="false" maxlength="255"  class=" form-control layui-input query-group"/>
+								</input>
+							</div>
+						</div>
+
+						<div class="layui-item query athird ">
 							<label class="layui-form-label">创建时间：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<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"
@@ -1052,30 +1063,31 @@
 						</div>
 
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">纸质归档时间：</label>
+							<label class="layui-form-label">上报审核时间：</label>
 							<div class="layui-input-block readOnlyFFF">
-								<input id="paperRecordBeginDate" name="paperRecordBeginDate" placeholder="审核开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
-									   value="<fmt:formatDate value="${ruralProjectRecords.paperRecordBeginDate}" pattern="yyyy-MM-dd"/>"/>
+								<input id="reportedBeginDate" name="reportedBeginDate" placeholder="审核开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+									   value="<fmt:formatDate value="${ruralProjectRecords.reportedBeginDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>
 								<span class="group-sep">-</span>
-								<input id="paperRecordEndDate" name="paperRecordEndDate" placeholder="审核结束时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
-									   value="<fmt:formatDate value="${ruralProjectRecords.paperRecordEndDate}" pattern="yyyy-MM-dd"/>"/>
+								<input id="reportedEndDate" name="reportedEndDate" placeholder="审核结束时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+									   value="<fmt:formatDate value="${ruralProjectRecords.reportedEndDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>
 							</div>
 						</div>
 
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">上报审核时间：</label>
+							<label class="layui-form-label">纸质归档时间：</label>
 							<div class="layui-input-block readOnlyFFF">
-								<input id="reportedBeginDate" name="reportedBeginDate" placeholder="审核开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
-									   value="<fmt:formatDate value="${ruralProjectRecords.reportedBeginDate}" pattern="yyyy-MM-dd"/>"/>
+								<input id="paperRecordBeginDate" name="paperRecordBeginDate" placeholder="审核开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+									   value="<fmt:formatDate value="${ruralProjectRecords.paperRecordBeginDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>
 								<span class="group-sep">-</span>
-								<input id="reportedEndDate" name="reportedEndDate" placeholder="审核结束时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
-									   value="<fmt:formatDate value="${ruralProjectRecords.reportedEndDate}" pattern="yyyy-MM-dd"/>"/>
+								<input id="paperRecordEndDate" name="paperRecordEndDate" placeholder="审核结束时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+									   value="<fmt:formatDate value="${ruralProjectRecords.paperRecordEndDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>
 							</div>
 						</div>
+
 						<div style="clear:both;"></div>
 					</div>
 				</form:form>