diff --git a/src/main/java/com/zhgd/xmgl/modules/material/controller/MaterialApproachRecordController.java b/src/main/java/com/zhgd/xmgl/modules/material/controller/MaterialApproachRecordController.java index 8f957c3cd..0a071a63d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/material/controller/MaterialApproachRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/material/controller/MaterialApproachRecordController.java @@ -213,6 +213,7 @@ public class MaterialApproachRecordController { @ApiOperation(value = "通过excel导入材料进场记录 信息", notes = "通过excel导入材料进场记录 信息", httpMethod = "POST") @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + String projectSn = request.getParameter("projectSn"); MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; Map fileMap = multipartRequest.getFileMap(); for (Map.Entry entity : fileMap.entrySet()) { @@ -224,6 +225,7 @@ public class MaterialApproachRecordController { try { List listMaterialApproachRecords = ExcelImportUtil.importExcel(file.getInputStream(), MaterialApproachRecord.class, params); for (MaterialApproachRecord materialApproachRecordExcel : listMaterialApproachRecords) { + materialApproachRecordExcel.setProjectSn(projectSn); materialApproachRecordService.save(materialApproachRecordExcel); } return Result.ok("文件导入成功!数据行数:" + listMaterialApproachRecords.size()); diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java index 2e4c25299..2cc99ab06 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java @@ -267,6 +267,12 @@ public class Project implements Serializable { private String jzgProjectCode; @ApiModelProperty(value = "金筑工访问host") private String jzgHost; + /** + * 弃用,使用xiwonUrl + */ + @Deprecated + @ApiModelProperty(value = "携稳扬尘url") + private String xiwonDustUrl; @ApiModelProperty(value = "'携稳的appId'") private String xiwonAppId; @ApiModelProperty(value = "'携稳的appSecret'") diff --git a/src/main/resources/template/材料进场记录导入模板.xlsx b/src/main/resources/template/材料进场记录导入模板.xlsx index 723e93a19..e806973a6 100644 Binary files a/src/main/resources/template/材料进场记录导入模板.xlsx and b/src/main/resources/template/材料进场记录导入模板.xlsx differ