Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java

@@ -1610,9 +1610,9 @@ public class WorkFullManageController extends BaseController {
 		//poi参数值准备
 		List<ProjectFilingBatchExcel> list=new LinkedList<>();
 		for (RuralProjectRecords ruralProjectRecords:ruralProjectRecordsList){
-			ProjectFilingBatchExcel filingBatchExcel=new ProjectFilingBatchExcel();
 			if (ruralProjectRecords.getProInfos().size()>0){
 				for(ProjectFilingBatchProInfo proInfo:ruralProjectRecords.getProInfos()){
+					ProjectFilingBatchExcel filingBatchExcel=new ProjectFilingBatchExcel();
 					filingBatchExcel.setProjectId(ruralProjectRecords.getProjectId());
 					if (StringUtils.isNotBlank(ruralProjectRecords.getProjectReportNumber())){
 						filingBatchExcel.setReportNumber(ruralProjectRecords.getProjectReportNumber());
@@ -1630,6 +1630,7 @@ public class WorkFullManageController extends BaseController {
 				}
 			}else{
 				Map<String,String> map=new HashMap<>();
+				ProjectFilingBatchExcel filingBatchExcel=new ProjectFilingBatchExcel();
 				filingBatchExcel.setProjectId(ruralProjectRecords.getProjectId());
 				if (StringUtils.isNotBlank(ruralProjectRecords.getProjectReportNumber())){
 					filingBatchExcel.setReportNumber(ruralProjectRecords.getProjectReportNumber());