Merge remote-tracking branch 'origin/master'

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}
@@ -2349,6 +2373,13 @@ END) as projectScale*/
 			<if test="engineeringType !=null and engineeringType !=''">
 				and a.engineering_type= #{engineeringType}
 			</if>
+			<!-- 咨询营业收入 -->
+			<if test="beginMoney !=null">
+				AND prd.ZiXunShouRu >= #{beginMoney}
+			</if>
+			<if test="endMoney !=null">
+				AND prd.ZiXunShouRu &lt; #{endMoney}
+			</if>
 
 			<!-- 送审规模 -->
 			<if test="beginSubmitScale !=null and beginSubmitScale != ''">

src/main/resources/mappings/modules/workinvoice/WorkInvoiceDao.xml

@@ -1163,10 +1163,34 @@
 		a.new_drawer_id as "newDrawerId",
 		a.new_drawer as "newDrawer",
 		a.is_sz_cloud as "isSzCloud",
-		a.actual_drawer_id as "actualDrawerId"
-		,wid.number as "widNumber"
-		,wid.total_money as "widTotalMoney",
-		wid.total_money as "widTotalMoneyD",
+		a.actual_drawer_id as "actualDrawerId",
+		(
+		SELECT
+			wid.number
+		FROM
+			work_invoice_detail wid
+		WHERE
+			a.id = wid.invoice_id
+		LIMIT 1
+		) AS widNumber,
+		(
+		SELECT
+			wid.total_money
+		FROM
+			work_invoice_detail wid
+		WHERE
+			a.id = wid.invoice_id
+		LIMIT 1
+		) AS widTotalMoney,
+		(
+		SELECT
+		wid.total_money
+		FROM
+		work_invoice_detail wid
+		WHERE
+		a.id = wid.invoice_id
+		LIMIT 1
+		) AS widTotalMoneyD,
 		(select
 		CASE
 		WHEN RIGHT( GROUP_CONCAT(is_project),1) =2 THEN GROUP_CONCAT(concat('其他：',wipr1.details))
@@ -1196,17 +1220,24 @@
 		left join rural_project_records rpr on rpr.id = wipr.project_id
 		left join project_report_data prds on rpr.id = prds.project_id
 		LEFT JOIN sys_user sua ON sua.id = a.account_checking_user_id
-		left join work_invoice_detail wid on a.id = wid.invoice_id
 		LEFT join sys_office so on so.id = a.office_id
 		LEFT join sys_area sa on sa.id = a.area_id
 		left join work_invoice_receipt wir on wir.invoice_id = a.id
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			<if test="widNumber != null and widNumber != ''">
-				AND wid.number LIKE
-				<if test="dbName == 'oracle'">'%'||#{widNumber}||'%'</if>
-				<if test="dbName == 'mssql'">'%'+#{widNumber}+'%'</if>
-				<if test="dbName == 'mysql'">concat('%',#{widNumber},'%')</if>
+				AND EXISTS (
+				SELECT 1
+				FROM work_invoice_detail wid
+				<where>
+					a.id = wid.invoice_id
+
+					AND wid.number LIKE
+					<if test="dbName == 'oracle'">'%'||#{widNumber}||'%'</if>
+					<if test="dbName == 'mssql'">'%'+#{widNumber}+'%'</if>
+					<if test="dbName == 'mysql'">concat('%',#{widNumber},'%')</if>
+				</where>
+				)
 			</if>
 			<if test="moneyStr != null and moneyStr != ''">
 				AND a.money LIKE
@@ -1291,7 +1322,7 @@
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
-				ORDER BY a.create_date DESC,a.number desc, wid.total_money+0 desc
+				ORDER BY a.create_date DESC,a.number desc
 			</otherwise>
 		</choose>
 	</select>

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>
@@ -1181,7 +1193,7 @@
 				,{field: 'client', align:'center', title: '委托方',width:285,templet: function(d){
 						return "<font style = 'font-size:14px;font-weight:500;'>"+d.client+"</font>";
 					}}
-                ,{field:'money',align:'center', title: '咨询营业收入(万元)',  width:140}
+                ,{field:'money',align:'center', title: '咨询营业收入(万元)',  width:160 , sort : true}
                 ,{field:'submitScale',align:'center', title: '送审规模(万元)',  width:140}
                 ,{field:'createName',align:'center', title: '登记人',  width:75}
                 ,{field: 'createDate', align:'center', title: '创建日期',width:110,templet: function(d){