线下归档筛选

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

@@ -354,12 +354,12 @@ END) as projectScale
 				AND (a.create_by = #{createBy.id} or sua.name like concat('%',#{createBy.name},'%'))
 			</if>
 			<choose>
-				<when test="filingProjectStatus == 0">
-					AND pfp.status is null
+				<when test="downProjectReportRecordStatus == 0">
+					AND( pfp.status is null or ppf.status is null )
 				</when>
 				<otherwise>
-					<if test="filingProjectStatus!=null and filingProjectStatus !=''">
-						AND pfp.status = #{filingProjectStatus}
+					<if test="downProjectReportRecordStatus!=null and downProjectReportRecordStatus !=''">
+						AND (pfp.status = #{downProjectReportRecordStatus} or ppf.status = #{downProjectReportRecordStatus})
 					</if>
 				</otherwise>
 			</choose>
@@ -476,6 +476,7 @@ END) as projectScale
 		left join rural_project_report_record_down prrd on prrd.report_id = prd.id
 		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id= a.id
 		LEFT JOIN sys_user sua on a.create_by = sua.id
+		left join project_paper_filing ppf on ppf.project_id = a.id
 		<where>
 			a.status = 5
 			<if test="bzshbUserId!=null and bzshbUserId!=''">
@@ -556,12 +557,12 @@ END) as projectScale
 			</if>
 
 			<choose>
-				<when test="filingProjectStatus == 0">
-					AND pfp.status is null
+				<when test="downProjectReportRecordStatus == 0">
+					AND( pfp.status is null or ppf.status is null )
 				</when>
 				<otherwise>
-					<if test="filingProjectStatus!=null and filingProjectStatus !=''">
-						AND pfp.status = #{filingProjectStatus}
+					<if test="downProjectReportRecordStatus!=null and downProjectReportRecordStatus !=''">
+						AND (pfp.status = #{downProjectReportRecordStatus} or ppf.status = #{downProjectReportRecordStatus})
 					</if>
 				</otherwise>
 			</choose>

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

@@ -455,12 +455,12 @@
 				AND (a.create_by = #{createBy.id} or sua.name like concat('%',#{createBy.name},'%'))
 			</if>
 			<choose>
-				<when test="filingProjectStatus == 0">
-					AND pfp.status is null
+				<when test="downProjectReportRecordStatus == 0">
+					AND( pfp.status is null or ppf.status is null )
 				</when>
 				<otherwise>
-					<if test="filingProjectStatus!=null and filingProjectStatus !=''">
-						AND pfp.status = #{filingProjectStatus}
+					<if test="downProjectReportRecordStatus!=null and downProjectReportRecordStatus !=''">
+						AND (pfp.status = #{downProjectReportRecordStatus} or ppf.status = #{downProjectReportRecordStatus})
 					</if>
 				</otherwise>
 			</choose>
@@ -652,16 +652,16 @@
 				AND (a.create_by = #{createBy.id} or sua.name like concat('%',#{createBy.name},'%'))
 			</if>
 
-				<choose>
-					<when test="filingProjectStatus == 0">
-						AND pfp.status is null
-					</when>
-					<otherwise>
-						<if test="filingProjectStatus!=null and filingProjectStatus !=''">
-							AND pfp.status = #{filingProjectStatus}
-						</if>
-					</otherwise>
-				</choose>
+			<choose>
+				<when test="downProjectReportRecordStatus == 0">
+					AND( pfp.status is null or ppf.status is null )
+				</when>
+				<otherwise>
+					<if test="downProjectReportRecordStatus!=null and downProjectReportRecordStatus !=''">
+						AND (pfp.status = #{downProjectReportRecordStatus} or ppf.status = #{downProjectReportRecordStatus})
+					</if>
+				</otherwise>
+			</choose>
 			<if test="reportData!=null and reportData.number !=null and reportData.number !=''">
 				and prd.number like concat('%',#{reportData.number},'%')
 			</if>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -569,9 +569,9 @@
 							</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">
-								<form:select path="filingProjectStatus" class=" form-control  simple-select">
+								<form:select path="downProjectReportRecordStatus" class=" form-control  simple-select">
 									<form:option value="" label=""/>
 									<form:option value="0" label="未归档"/>
 									<form:option value="2" label="归档中"/>

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

@@ -659,9 +659,9 @@
 							</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">
-								<form:select path="filingProjectStatus" class=" form-control  simple-select">
+								<form:select path="downProjectReportRecordStatus" class=" form-control  simple-select">
 									<form:option value="" label=""/>
 									<form:option value="0" label="未归档"/>
 									<form:option value="2" label="归档中"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -567,9 +567,9 @@
 							</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">
-								<form:select path="filingProjectStatus" class=" form-control  simple-select">
+								<form:select path="downProjectReportRecordStatus" class=" form-control  simple-select">
 									<form:option value="" label=""/>
 									<form:option value="0" label="未归档"/>
 									<form:option value="2" label="归档中"/>