فهرست منبع

月度报表、季度报表展示功能修改

user5 3 سال پیش
والد
کامیت
62e7f9375d
1فایلهای تغییر یافته به همراه3 افزوده شده و 4 حذف شده
  1. 3 4
      src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

+ 3 - 4
src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -2667,7 +2667,6 @@
 				and prr.accomplish_date <= #{endDate}
 			</if>
 			<if test="statementCompanyComprehensiveInfo.field7 == '5'.toString() ">
-				and a.reported_state = 6
 				and a.over_due_status = 1
 				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
 			</if>
@@ -3243,8 +3242,6 @@
 		,ifnull(ppf.status,0) as "paperFilingStatus"
 		,ppf.process_instance_id as "ppfProcessInstanceId"
 		,ppf.id as "ppfId"
-		,pfb.process_instance_id AS "filingProcessinstanceId"
-		,ifnull(pfp.status,0) as "filingProjectStatus"
 		,ifnull(prd.approval_fee ,"") as "approvalFee"
 		,ifnull(prd.review_fee ,"") as "reviewFee"
 		,ifnull(prd.verify_fee ,"") as "verifyFee"
@@ -3306,6 +3303,9 @@
 			and sodi.small_date_type = #{statementCompanyComprehensiveInfo.smallDateType}
 			and sodi.office_id = #{statementCompanyComprehensiveInfo.officeId}
 			and a.create_by = #{statementCompanyComprehensiveInfo.userId}
+			<if test="ruralProjectRecords.userId != null and ruralProjectRecords.userId != '' ">
+				and sodi.user_id = #{ruralProjectRecords.userId}
+			</if>
 			<if test="statementCompanyComprehensiveInfo.field5 == '5'.toString() ">
 				and a.record_state = 6
 				and a.over_record_status = 1
@@ -3321,7 +3321,6 @@
 				and rprr.accomplish_date &lt;= #{endDate}
 			</if>
 			<if test="statementCompanyComprehensiveInfo.field7 == '5'.toString() ">
-				and a.reported_state = 6
 				and a.over_due_status = 1
 				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
 			</if>