fix:跨表导出dddd

assistMg/src/main/java/com/hotent/enterpriseDeclare/controller/material/CostProjectTaskSurveyGenericController.java

@@ -745,7 +745,7 @@ public class CostProjectTaskSurveyGenericController {
                 }
 
                 Workbook workbook = new XSSFWorkbook();
-                String sheetName = "成本调查表";
+                String sheetName = templateName;
                 Sheet sheet = workbook.createSheet(sheetName);
 
                 // 创建样式
@@ -934,7 +934,7 @@ public class CostProjectTaskSurveyGenericController {
 
                 // 5.返回excel
                 Workbook workbook = new XSSFWorkbook();
-                String sheetName = "财务数据表";
+                String sheetName = templateName;
                 Sheet sheet = workbook.createSheet(sheetName);
 
                 // 创建样式
@@ -1079,7 +1079,7 @@ public class CostProjectTaskSurveyGenericController {
                         costVerifyTemplateItemsDao.selectByVerifyTemplateId(surveyTemplateId, null);
 
                 Workbook workbook = new XSSFWorkbook();
-                String sheetName = "核定表";
+                String sheetName = template.getSurveyTemplateName();
                 Sheet sheet = workbook.createSheet(sheetName);
 
                 // 创建样式
@@ -1437,7 +1437,7 @@ public class CostProjectTaskSurveyGenericController {
                     costSurveyTemplateUploadDataManager.saveData(dataList);
 
                     // 更新上传状态
-                    CostSurveyTemplateUpload upload = costSurveyTemplateUploadManager.getById(materialId);
+                    CostSurveyTemplateUpload upload = costSurveyTemplateUploadManager.getById(refId);
                     if (upload != null) {
                         upload.setIsUpload("1");
                         costSurveyTemplateUploadManager.updateById(upload);
@@ -1673,8 +1673,10 @@ public class CostProjectTaskSurveyGenericController {
                     costSurveyTemplateUploadDataManager.saveData(dataList);
                     if (materialId != null) {
                         CostProjectTaskMaterial material = costProjectTaskMaterialManager.getById(materialId);
-                        material.setIsUpload("1");
-                        costProjectTaskMaterialManager.updateById(material);
+                        if (material != null) {
+                            material.setIsUpload("1");
+                            costProjectTaskMaterialManager.updateById(material);
+                        }
                     }
 
                     return CommonResult.<String>ok().message("导入成功，共导入 " + dataRowCount + " 行数据");

assistMg/src/main/java/com/hotent/project/controller/CostProjectTaskMaterialController.java

@@ -64,7 +64,6 @@ public class CostProjectTaskMaterialController extends BaseController<CostProjec
         // 如果有文件上传，设置上传状态和时间
         if (StringUtils.isNotBlank(costProjectTaskMaterial.getFileUrl()) && "0".equals(costProjectTaskMaterial.getAuditedStatus())) {
             costProjectTaskMaterial.setIsUpload("1");
-            costProjectTaskMaterial.setIsRequired("1");
             costProjectTaskMaterial.setUploadTime(LocalDateTime.now());
         }