user5 пре 1 година
родитељ
комит
75b9f01e40

+ 30 - 1
src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -316,7 +316,8 @@
 		,a.engineering_type as "engineeringType"
         FROM rural_project_records a
         <include refid="projectRecordsJoins"/>
-		WHERE a.report_internal_audit_signature_document_id = #{documentId}
+		WHERE a.report_internal_audit_signature_document_id like concat ('%',#{documentId},'%')
+		limit 1
 	</select>
 
 
@@ -4311,6 +4312,7 @@
 				and rprr.accomplish_date &lt;= #{endDate}
 			</if>
 			<if test="statementCompanyComprehensiveInfo.field13 == '5'.toString() ">
+				and a.submit_money = 2
 				and a.paper_filing_status != 7
 				AND a.paper_filing_status != '10'
 				AND a.paper_filing_status != '11'
@@ -4541,6 +4543,25 @@
 				and rprr.accomplish_date >= #{beginDate}
 				and rprr.accomplish_date &lt;= #{endDate}
 			</if>
+			<if test="statementCompanyComprehensiveInfo.field13 == '5'.toString() ">
+				and a.submit_money = 2
+				and a.paper_filing_status != 7
+				AND a.paper_filing_status != '10'
+				AND a.paper_filing_status != '11'
+				and a.over_paper_filing_status = 1
+				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
+				and pmdr.id is null
+			</if>
+			<if test="statementCompanyComprehensiveInfo.field14 == '5'.toString() ">
+				and a.submit_money = 2
+				and a.paper_filing_status = 7
+				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
+				and ppf.status = 7
+				and ppf.del_flag = 0
+				and ppf.audit_pass_date >= #{beginDate}
+				and ppf.audit_pass_date &lt;= #{endDate}
+				and pmdr.id is null
+			</if>
 
 			<if test="ruralProjectRecords.projectId != null and ruralProjectRecords.projectId != ''">
 				AND a.project_id like concat('%',#{ruralProjectRecords.projectId},'%')
@@ -6089,6 +6110,12 @@ GROUP BY
 		where id = #{id}
 	</update>
 
+	<update id="updateProjectPaperFiling">
+		update rural_project_records
+			set paper_filing_status = ${status}
+		where id = #{id}
+	</update>
+
 	<update id="updateProjectBatchArchiveOnOverDue">
 		update rural_project_records
 		set over_paper_filing_status = 1
@@ -6258,6 +6285,7 @@ GROUP BY
 				and rprr.accomplish_date &lt;= #{endDate}
 			</if>
 			<if test="statementCompanyComprehensiveInfo.field13 == '5'.toString() ">
+				and a.submit_money = 2
 				and a.paper_filing_status != 7
 				AND a.paper_filing_status != '10'
 				AND a.paper_filing_status != '11'
@@ -6461,6 +6489,7 @@ GROUP BY
 				and rprr.accomplish_date &lt;= #{endDate}
 			</if>
 			<if test="statementCompanyComprehensiveInfo.field13 == '5'.toString() ">
+				and a.submit_money = 2
 				and a.paper_filing_status != 7
 				AND a.paper_filing_status != '10'
 				AND a.paper_filing_status != '11'