Przeglądaj źródła

归档、上报导出,发起时间

user5 3 lat temu
rodzic
commit
3a5b10c5ee

+ 6 - 0
src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageAllService.java

@@ -678,6 +678,12 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
                     }
                 }
             }
+            for (DownloadProjectRecords info : recordsListOnType) {
+                if(null != info.getProjectReportRecordStatus() && 1 == info.getProjectReportRecordStatus()){
+                    info.setRecordStartAuditDate(null);
+                }
+
+            }
             recordsList.addAll(recordsListOnType);
         }
         //查询未超期的筛选项项目信息

+ 4 - 0
src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml

@@ -677,6 +677,7 @@ END) as projectScale
 		SELECT
 		<include refid="recordDownloadSql"/>
 		,ifnull(prr.status,0) as "projectReportRecordStatus"
+		,prr.record_date as  "recordStartAuditDate"
 		FROM rural_project_records a
 		<include refid="recordDownloadLeftSql"/>
 		<where>
@@ -839,6 +840,9 @@ END) as projectScale
 		SELECT
 		<include refid="recordDownloadSql"/>
 		,ifnull(rprr.report_status,0) as "projectReportRecordStatus"
+		,(select create_date from work_activity_process wap where wap.process_instance_id = rprr.process_instance_id
+		order by create_date
+		limit 1) as "recordStartAuditDate"
 		FROM rural_project_records a
 		<include refid="recordDownloadLeftSql"/>
 		<where>