项目列表管理线下归档数据展示获取修改

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

@@ -340,7 +340,14 @@ END) as projectScale*/
 		,ifnull(prd.status,0) as "projectReportStatus"
 		,ifnull(prd.name,"") as "projectReportName"
 		,ifnull(prr.status,0) as "projectReportRecordStatus"
-		,ifnull(prrd.status,0) as "downProjectReportRecordStatus",
+		,(case
+		when a.submit_money = '1' then
+		ifnull(pfp.status,0)
+		when a.submit_money = '2' then
+		ifnull(prrd.status,0) else 0
+		end) as downProjectReportRecordStatus,
+
+		/*,ifnull(prrd.status,0) as "downProjectReportRecordStatus"*/
 		prrd.file_num as recodeNum,
 		prr.process_instance_id as prrProcessInstanceId,
 		prrd.process_instance_id as prrdProcessInstanceId
@@ -495,11 +502,36 @@ END) as projectScale*/
 			</if>
 			<choose>
 				<when test="downProjectReportRecordStatus == 0">
-					AND( /*pfp.status is null or*/ ppf.status is null )
+					<choose>
+						<when test="submitMoney !=null and submitMoney !=''">
+							<if test="submitMoney == 1">
+								AND( pfp.status is null)
+							</if>
+							<if test="submitMoney == 2">
+								AND( /*pfp.status is null or*/ ppf.status is null )
+							</if>
+						</when>
+						<otherwise>
+							AND( /*pfp.status is null or*/ ppf.status is null )
+						</otherwise>
+					</choose>
 				</when>
 				<otherwise>
 					<if test="downProjectReportRecordStatus!=null and downProjectReportRecordStatus !=''">
-						and ppf.status = #{downProjectReportRecordStatus}
+						<choose>
+							<when test="submitMoney !=null and submitMoney !=''">
+								<if test="submitMoney == 1">
+									and pfp.status = #{downProjectReportRecordStatus}
+								</if>
+								<if test="submitMoney == 2">
+									and ppf.status = #{downProjectReportRecordStatus}
+								</if>
+							</when>
+							<otherwise>
+								and ppf.status = #{downProjectReportRecordStatus}
+							</otherwise>
+						</choose>
+
 					</if>
 				</otherwise>
 			</choose>
@@ -715,11 +747,36 @@ END) as projectScale*/
 
 			<choose>
 				<when test="downProjectReportRecordStatus == 0">
-					AND( /*pfp.status is null or*/ ppf.status is null )
+					<choose>
+						<when test="submitMoney !=null and submitMoney !=''">
+							<if test="submitMoney == 1">
+								AND( pfp.status is null)
+							</if>
+							<if test="submitMoney == 2">
+								AND( /*pfp.status is null or*/ ppf.status is null )
+							</if>
+						</when>
+						<otherwise>
+							AND( /*pfp.status is null or*/ ppf.status is null )
+						</otherwise>
+					</choose>
 				</when>
 				<otherwise>
 					<if test="downProjectReportRecordStatus!=null and downProjectReportRecordStatus !=''">
-						AND ppf.status = #{downProjectReportRecordStatus}
+						<choose>
+							<when test="submitMoney !=null and submitMoney !=''">
+								<if test="submitMoney == 1">
+									and pfp.status = #{downProjectReportRecordStatus}
+								</if>
+								<if test="submitMoney == 2">
+									and ppf.status = #{downProjectReportRecordStatus}
+								</if>
+							</when>
+							<otherwise>
+								and ppf.status = #{downProjectReportRecordStatus}
+							</otherwise>
+						</choose>
+
 					</if>
 				</otherwise>
 			</choose>