Pārlūkot izejas kodu

项目到处添加未复核筛选项

user5 3 gadi atpakaļ
vecāks
revīzija
f49377fb37

+ 61 - 12
src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml

@@ -593,9 +593,22 @@ END) as projectScale*/
 			<if test="attachmentProjectSort !=null and attachmentProjectSort !=''">
 				and a.attachment_project_sort= #{attachmentProjectSort}
 			</if>
-			<if test="projectReportStatus != null and projectReportStatus != ''">
-				AND prd.status = #{projectReportStatus}
-			</if>
+			<choose>
+				<when test="projectReportStatus == null">
+
+				</when>
+				<otherwise>
+					<choose>
+						<when test="projectReportStatus != 0">
+							AND prd.status = #{projectReportStatus}
+						</when>
+						<otherwise>
+							AND prd.status is null
+						</otherwise>
+					</choose>
+				</otherwise>
+			</choose>
+
 			<if test="submitMoney != null and submitMoney != ''">
 				AND a.submit_money = #{submitMoney}
 			</if>
@@ -937,9 +950,21 @@ END) as projectScale*/
 			<if test="attachmentProjectSort !=null and attachmentProjectSort !=''">
 				and a.attachment_project_sort= #{attachmentProjectSort}
 			</if>
-			<if test="projectReportStatus != null and projectReportStatus != ''">
-				AND prd.status = #{projectReportStatus}
-			</if>
+			<choose>
+				<when test="projectReportStatus == null">
+
+				</when>
+				<otherwise>
+					<choose>
+						<when test="projectReportStatus != 0">
+							AND prd.status = #{projectReportStatus}
+						</when>
+						<otherwise>
+							AND prd.status is null
+						</otherwise>
+					</choose>
+				</otherwise>
+			</choose>
 			<if test="submitMoney != null and submitMoney != ''">
 				AND a.submit_money = #{submitMoney}
 			</if>
@@ -1177,9 +1202,21 @@ END) as projectScale*/
 					#{officeId}
 				</foreach>
 			</if>
-			<if test="projectReportStatus != null and projectReportStatus != ''">
-				AND prd.status = #{projectReportStatus}
-			</if>
+			<choose>
+				<when test="projectReportStatus == null">
+
+				</when>
+				<otherwise>
+					<choose>
+						<when test="projectReportStatus != 0">
+							AND prd.status = #{projectReportStatus}
+						</when>
+						<otherwise>
+							AND prd.status is null
+						</otherwise>
+					</choose>
+				</otherwise>
+			</choose>
 			<if test="reportedState !=null and reportedState !=''">
 				<choose>
 					<when test="reportedState == 0">
@@ -1766,9 +1803,21 @@ END) as projectScale*/
 					#{officeId}
 				</foreach>
 			</if>
-			<if test="projectReportStatus != null and projectReportStatus != ''">
-				AND prd.status = #{projectReportStatus}
-			</if>
+			<choose>
+				<when test="projectReportStatus == null">
+
+				</when>
+				<otherwise>
+					<choose>
+						<when test="projectReportStatus != 0">
+							AND prd.status = #{projectReportStatus}
+						</when>
+						<otherwise>
+							AND prd.status is null
+						</otherwise>
+					</choose>
+				</otherwise>
+			</choose>
 			<if test="reportedState !=null and reportedState !=''">
 				<choose>
 					<when test="reportedState == 0">

+ 2 - 0
src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageElectronicSealDao.xml

@@ -61,6 +61,8 @@
 		<include refid="projectReportRecordColumns"/>
 		FROM project_report_signature_info a
 		WHERE a.project_report_id = #{projectReportId}
+		order by a.id
+		limit 1
 	</select>
 
 	<insert id="insertByList" parameterType="java.util.List">