FIX新增成本模型存文件地址名称大小，导入的明细加上成本模型id，

module_kzks/src/main/java/org/jeecg/modules/costModelList/controller/CostModelListController.java

@@ -63,12 +63,16 @@ public class CostModelListController extends JeecgController<CostModelList, ICos
 		 CostModelList costModelList = CostModelListConvert.INSTANCE.toCostModelList(dto);
 		 costModelListService.save(costModelList);
 
-		 String xmId = dto.getId();
+		 String xmId = costModelList.getId();
 	 	 String xmName = dto.getXmName();
 		 String clfUrl1 = dto.getClfurl().get(0).getFilePath();
 		 String wxfUrl1 = dto.getWxfurl().get(0).getFilePath();
 		 costModelList.setClfUrl(clfUrl1);
+		 costModelList.setClfFilename(dto.getClfurl().get(0).getFileName());
+		 costModelList.setClfFilesize(dto.getClfurl().get(0).getFileSize());
 		 costModelList.setWxfUrl(wxfUrl1);
+		 costModelList.setWxfFilename(dto.getWxfurl().get(0).getFileName());
+		 costModelList.setWxfFilesize(dto.getWxfurl().get(0).getFileSize());
 		 String clfUrl = jeecgBaseConfig.getPath().getUpload() + "/"+  clfUrl1;
 		 String wxfUrl = jeecgBaseConfig.getPath().getUpload() + "/"+  wxfUrl1;
 		 log.info("导入的材料费详情地址为：{}",clfUrl);
@@ -130,7 +134,7 @@ public class CostModelListController extends JeecgController<CostModelList, ICos
 			wxService.removeByMap(columnMap);
 
 			//计算并导入数据
-			Result<CostModelList> result2 = clService.importExcel1(xmId, xmName, wxfUrl, CostModelXmxqCl.class);
+			Result<CostModelList> result2 = wxService.importExcel1(xmId, xmName, wxfUrl, CostModelXmxqWx.class);
 		}
 
 		costModelList.setXmName(xmName);

module_kzks/src/main/java/org/jeecg/modules/costModelList/dto/FileDTO.java

@@ -9,6 +9,6 @@ public class FileDTO {
 
     private java.lang.String filePath;
 
-    private java.lang.String filesize;
+    private java.lang.String fileSize;
 
 }

module_kzks/src/main/java/org/jeecg/modules/costModelList/entity/CostModelList.java

@@ -1,22 +1,18 @@
 package org.jeecg.modules.costModelList.entity;
 
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
 
 /**
  * @Description: 成本模型
@@ -97,5 +93,17 @@ public class CostModelList implements Serializable {
     /**外协费文件地址*/
     @ApiModelProperty(value = "外协费文件地址")
     private java.lang.String wxfUrl;
+    /**材料费文件名称*/
+    @ApiModelProperty(value = "材料费文件名称")
+    private java.lang.String clfFilename;
+    /**外协费文件名称*/
+    @ApiModelProperty(value = "外协费文件名称")
+    private java.lang.String wxfFilename;
+    /**材料费文件大小*/
+    @ApiModelProperty(value = "材料费文件大小")
+    private java.lang.String clfFilesize;
+    /**外协费文件大小*/
+    @ApiModelProperty(value = "外协费文件大小")
+    private java.lang.String wxfFilesize;
 
 }